Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -401,6 +401,7 @@ public class IoOrderController extends BaseController {
         BaseResponse tempResponse = checkSubmitEnable(orderEntity);
         if (tempResponse != null)
             return tempResponse;
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
 
         //校验单据是否已完成
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo());
@@ -412,7 +413,6 @@ public class IoOrderController extends BaseController {
         }
 
         //单据提交后再次校验库存是否足够
-        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
         BaseResponse baseResponse = ioAddInoutService.checkInv(bussinessTypeEntity, orderDetailBizEntities, orderEntity, codeTempEntities);
         if (baseResponse != null)
             return baseResponse;
@@ -464,11 +464,18 @@ public class IoOrderController extends BaseController {
                     orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
                     orderService.update(orderEntity);
                     checkInoutService.check(addOrderRequest.getBillNo());
+                } else {
+                    if (IntUtil.value(bussinessTypeEntity.getCheckWebNewType()) == 3) {
+                        String errMsg = checkInoutService.bizOrderCheckPass(orderDetailBizEntities, orderDetailCodeEntities);
+                        if (StrUtil.isNotEmpty(errMsg)) {
+                            return ResultVOUtils.error(500, errMsg);
+                        }
                     } else {
                         String errMsg = checkInoutService.bizNoPiCheck(orderDetailBizEntities, orderEntity);
                         if (StrUtil.isNotEmpty(errMsg)) {
                             return ResultVOUtils.error(500, errMsg);
                         }
+                    }
                     orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo());
                     for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) {
                         IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity();

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -449,7 +449,7 @@ public class BasicBussinessTypeEntity {
     private int spaceOut;
 
     /**
-     * 有三期业务单校验    0:按扫码结果提交，1：按比对结果提交
+     * 有三期业务单校验    0:按扫码结果提交，1：按比对结果提交;3,按业务单提交
      */
     @TableField(value = "checkWebNewType")
     private int checkWebNewType;

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -177,7 +177,7 @@ public class BasicBussinessTypeResponse {
     private boolean thrCheckReview;
 
     /**
-     * 有三期业务单校验    0:按扫码结果提交，1：按比对结果提交
+     * 有三期业务单校验    0:按扫码结果提交，1：按比对结果提交;3,按业务单提交
      */
     private int checkWebNewType;
 

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -628,7 +628,11 @@ public class IoCheckInoutService {
             return;
         }
 
+
         String errMsg = "";
+
+        BasicBussinessTypeEntity businessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+        if (IntUtil.value(businessTypeEntity.getCheckWebNew()) != 3 || IntUtil.value(businessTypeEntity.getCheckWebNewType()) != 3) {
             //正向校验
             for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
                 String msg = "";
@@ -672,7 +676,6 @@ public class IoCheckInoutService {
                             && checkProductDate(bizEntity, codeEntity) == null
                             && checkExpireDate(bizEntity, codeEntity) == null
                     ) {
-
                         if (checkCount(bizEntity, codeEntity) == null) {
                             bizEntity.setCheckSuccess(true);
                             codeEntity.setCheckSuccess(true);
@@ -681,12 +684,13 @@ public class IoCheckInoutService {
                     }
                 }
             }
-
             for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
                 if (!codeEntity.isCheckSuccess()) {
                     errMsg = errMsg + codeEntity.getCoName() + ";";
                 }
             }
+        }
+
 
         if (StrUtil.isNotEmpty(errMsg)) {
             orderEntity.setErrMsg(errMsg + "校验失败");
@@ -735,6 +739,49 @@ public class IoCheckInoutService {
         }
     }
 
+    public String bizOrderCheckPass(List<IoOrderDetailBizEntity> orderDetailBizEntities, List<IoOrderDetailCodeEntity> orderDetailCodeEntities) {
+        String errMsg = "";
+        //初始化默认值
+        for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
+            codeEntity.setCheckSuccess(false);
+        }
+        for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+            bizEntity.setCheckSuccess(false);
+        }
+        for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+            String msg = "";
+            for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
+                if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null
+                        && checkBatchNo(bizEntity, codeEntity) == null
+                        && checkProductDate(bizEntity, codeEntity) == null
+                        && checkExpireDate(bizEntity, codeEntity) == null
+
+                ) {
+
+                    if (checkBizCount(bizEntity, codeEntity) == null) {
+                        bizEntity.setCheckSuccess(true);
+                        codeEntity.setCheckSuccess(true);
+                        bizEntity.setScanCount(codeEntity.getReCount());
+                    } else {
+                        msg = "扫码数量超出";
+                        bizEntity.setCheckSuccess(false);
+                    }
+                    break;
+                }
+            }
+            if (StrUtil.isEmpty(msg) && !bizEntity.isCheckSuccess()) {
+                msg = "三期不匹配";
+            }
+            bizEntity.setErrMsg(msg);
+        }
+        for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+            if (!bizEntity.isCheckSuccess()) {
+                errMsg = errMsg + bizEntity.getCoName() + bizEntity.getErrMsg() + ";";
+            }
+        }
+        return errMsg;
+    }
+
 
     //业务单正向校验
     public String bizNoPiCheck(List<IoOrderDetailBizEntity> orderDetailBizEntities, IoOrderEntity orderEntity) {
@@ -1409,4 +1456,12 @@ public class IoCheckInoutService {
         }
     }
 
+    public String checkBizCount(IoOrderDetailBizEntity bizEntity, IoOrderDetailCodeEntity codeEntity) {
+        if (bizEntity.getCount() > codeEntity.getReCount()) {
+            return null;
+        }
+        return bizEntity.getCoName() + "数量不匹配！";
+    }
+
+
 }

src/main/java/com/glxp/api/service/inout/IoGenInvService.java

@@ -58,7 +58,7 @@ public class IoGenInvService {
     public void genNorInv(String orderId) {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         List<IoOrderDetailResultEntity> orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId);
-        List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId);
+
 
         //补齐单据信息
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
@@ -91,9 +91,9 @@ public class IoGenInvService {
             }
 
             if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                invProductEntity.setOutCount(invProductEntity.getOutCount() + orderDetailResultEntity.getReCount());
+                invProductEntity.setOutCount(invProductEntity.getOutCount() + orderDetailResultEntity.getCount());
             } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
-                invProductEntity.setInCount(invProductEntity.getInCount() + orderDetailResultEntity.getReCount());
+                invProductEntity.setInCount(invProductEntity.getInCount() + orderDetailResultEntity.getCount());
             }
             invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
             invProductEntity.setUpdateTime(new Date());
@@ -110,6 +110,7 @@ public class IoGenInvService {
                 && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT) //入库
                 && bussinessTypeEntity.getDevInType().equals(1)
         ) {
+            List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId);
             deviceChangeOrderService.generateDeviceInfo(orderEntity, codeEnttities);
         }
 

src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java

@@ -172,8 +172,16 @@ public class FilterUdiUtils {
 
     public static UdiEntity getDrugInfo(String data) {
         UdiEntity udiEntity = new UdiEntity();
-        String prefix = data.substring(0, 7);
+        String prefix;
-        String serialNo = data.substring(7, 16);
+        String serialNo;
+        if (data.startsWith("89")) {
+            prefix = data.substring(0, 8);
+            serialNo = data.substring(8, 16);
+        } else {
+            prefix = data.substring(0, 7);
+            serialNo = data.substring(7, 16);
+        }
+
         udiEntity.setBatchNo(null);
         udiEntity.setExpireDate(null);
         udiEntity.setProduceDate(null);

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -9,13 +9,13 @@
                ip.nameCode,
                bp.cpmctymc,
                bp.measname,
-               bp.bzgg,
+               COALESCE(bp.ggxh, bp.bzgg)                as ggxh,
                ip.relIdFk,
                bp.ggxh,
                ip.batchNo,
                ip.productionDate,
                ip.expireDate,
-               bp.ylqxzcrbarmc,
+               COALESCE(bp.ylqxzcrbarmc, bp.manufactory) as ylqxzcrbarmc,
                bp.zczbhhzbapzbh,
                ip.inCount,
                ip.outCount,
@@ -54,12 +54,11 @@
                bp.packUnit,
                ip.price
         from inv_product ip
-                     inner join basic_udirel on ip.relIdFk = basic_udirel.id
+                 INNER JOIN basic_products bp ON ip.relIdFk = (SELECT id FROM basic_udirel WHERE uuid = bp.uuid)
-                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                 LEFT JOIN basic_corp ON ip.supId = basic_corp.erpId
-                     left join basic_corp on ip.supId = basic_corp.erpId
+                 LEFT JOIN auth_dept ON auth_dept.CODE = ip.deptCode
-                     left join auth_dept on auth_dept.code = ip.deptCode
+                 LEFT JOIN auth_warehouse ON auth_warehouse.CODE = ip.invCode
-                     left join auth_warehouse on auth_warehouse.code = ip.invCode
+                 LEFT JOIN auth_space s ON ip.invSpaceCode = s.CODE
-                     left join auth_space `as` on ip.invSpaceCode = `as`.code
         <where>
             <if test="productsType != null">
                 AND bp.productsType = #{productsType}