单据相关bug修改

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

@@ -512,8 +512,8 @@ public class IoCodeTempController extends BaseController {
                 }
 
                 if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
-                    if (bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.isCheckWebNew()) {
+                    if (bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.isCheckWebNew() && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
-                        String errMsg = ioCheckInoutService.checkCode(exitLocalEntity);
+                        String errMsg = ioCheckInoutService.checkCode(genDetaiEntity);
                         if (errMsg != null) {
                             return ResultVOUtils.error(500, errMsg);
                         } else
@@ -711,11 +711,11 @@ public class IoCodeTempController extends BaseController {
 
     //校验供应商唯一性
     public BaseResponse checkSupId(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeEnttity, String unitFk) {
-        String originSupId = null;
+        String originSupId = unitFk;
-        if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
+//        if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
-            if (unitFk != null)
+//            if (unitFk != null)
-                originSupId = unitFk;
+//                originSupId = unitFk;
-        }
+//        }
         if (originSupId != null) {
             codeEnttity.setSupId(originSupId);
         } else {
@@ -815,16 +815,20 @@ public class IoCodeTempController extends BaseController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/addCode/updateBindSup")
-    public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity codeTempEntity, BindingResult bindingResult) {
+    public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity codeSaveRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
+
+        IoCodeTempEntity codeTempEntity = codeTempService.selectById(codeSaveRequest.getId());
+        codeTempEntity.setSupId(codeSaveRequest.getSupId());
         if (StrUtil.isNotEmpty(codeTempEntity.getSupId())) {
             codeTempEntity.setSupId(codeTempEntity.getSupId());
             codeTempService.updateById(codeTempEntity);
-        } else if (codeTempEntity.getRelId() != null) {
+        }
+        if (codeTempEntity.getRelId() != null) {
             codeTempEntity = codeTempService.selectById(codeTempEntity.getId());
             int reCount = udiCalCountUtil.getActCount(codeTempEntity);
             codeTempEntity.setReCount(reCount);
@@ -852,7 +856,7 @@ public class IoCodeTempController extends BaseController {
 
         IoCodeTempEntity codeTempEntity = codeTempService.selectById(id);
         IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
-        if (codeTempEntity.getCount() != null && codeTempEntity.getCount() > 1) {
+        if (codeTempEntity.getCount() > 1) {
             codeTempEntity.setCount(codeTempEntity.getCount() - 1);
             codeTempService.updateById(codeTempEntity);
         } else {
@@ -905,7 +909,7 @@ public class IoCodeTempController extends BaseController {
                 }
             }
         }
-        if (codeTempEntity.getCount() != null && codeTempEntity.getCount() <= 0) {
+        if (codeTempEntity.getCount() <= 0) {
             return ResultVOUtils.error(500, "数量不能小于0");
         }
         int b = codeTempService.updateById(codeTempEntity);

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

@@ -191,6 +191,12 @@ public class IoOrderController extends BaseController {
         if (checkInoutService.checkManual(addOrderRequest.getBillNo())) {
             if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
                 String errMsg = checkInoutService.bizOrderCheck(orderDetailBizEntities, orderDetailCodeEntities);
+
+
+                if (StrUtil.isNotEmpty(errMsg)) {
+                    return ResultVOUtils.error(500, "单据未校验完成,请检查后重新提交！");
+                }
+                errMsg = checkInoutService.codeOrderCheck(orderDetailCodeEntities, orderDetailBizEntities);
                 if (StrUtil.isNotEmpty(errMsg)) {
                     return ResultVOUtils.error(500, "单据未校验完成,请检查后重新提交！");
                 }

src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java

@@ -97,13 +97,13 @@ public class IoCodeTempEntity {
      * 扫码数量
      */
     @TableField(value = "`count`")
-    private Integer count;
+    private int count;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 部门编码外键

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -181,6 +181,6 @@ public class IoOrderDetailBizEntity {
     private boolean checkSuccess;
 
     @TableField(exist = false)
-    private Integer scanCount;
+    private int scanCount;
 
 }

src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java

@@ -138,13 +138,13 @@ public class IoOrderDetailResultEntity {
      * 单据数量
      */
     @TableField(value = "`count`")
-    private Integer count;
+    private int count;
 
     /**
      * 扫码数量
      */
     @TableField(value = "reCount")
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 备注
@@ -182,4 +182,4 @@ public class IoOrderDetailResultEntity {
     @TableField(value = "remark5")
     private String remark5;
 
-}
+}

src/main/java/com/glxp/api/entity/inv/InvPreProductDetailEntity.java

@@ -87,13 +87,13 @@ public class InvPreProductDetailEntity {
      * 扫码数量
      */
     @TableField(value = "`count`")
-    private Integer count;
+    private int count;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 部门编码
@@ -162,4 +162,4 @@ public class InvPreProductDetailEntity {
     public static final String COL_PURCHASETYPE = "purchaseType";
 
     public static final String COL_UPDATETIME = "updateTime";
-}
+}

src/main/java/com/glxp/api/entity/inv/InvPreinDetailEntity.java

@@ -58,18 +58,18 @@ public class InvPreinDetailEntity {
      * 耗材字典主键
      */
     @TableField(value = "relId")
-    private Integer relId;
+    private Long relId;
 
     /**
      * 扫码数量
      */
     @TableField(value = "`count`")
-    private Integer count;
+    private int count;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private Integer reCount;
+    private int reCount;
 
-}
+}

src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java

@@ -72,13 +72,13 @@ public class InvProductDetailEntity {
      * 扫码数量
      */
     @TableField(value = "`count`")
-    private Integer count;
+    private int count;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 部门编码
@@ -115,4 +115,4 @@ public class InvProductDetailEntity {
     @TableField(value = "action")
     private String action;
 
-}
+}

src/main/java/com/glxp/api/entity/inv/InvProductEntity.java

@@ -54,13 +54,13 @@ public class InvProductEntity {
      * 出库数量
      */
     @TableField(value = "outCount")
-    private Integer outCount;
+    private int outCount;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 客户ID
@@ -99,4 +99,4 @@ public class InvProductEntity {
     @TableField(value = "updateTime")
     private Date updateTime;
 
-}
+}

src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java

@@ -43,10 +43,10 @@ public class ThrOrderDetailEntity {
     private String productDate;
 
     @TableField("count")
-    private Integer count;
+    private int count;
 
     @TableField("reCount")
-    private Integer reCount;
+    private int reCount;
 
     @TableField("orderIdFk")
     private String orderIdFk;

src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java

@@ -85,7 +85,7 @@ public class IoCodeTempResponse {
     /**
      * 实际数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 部门编码外键

src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java

@@ -116,12 +116,12 @@ public class IoOrderDetailCodeResponse {
     /**
      * 单据数量
      */
-    private Integer count;
+    private int count;
 
     /**
      * 扫码数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 备注

src/main/java/com/glxp/api/res/inv/InvPreProductDetailResponse.java

@@ -60,12 +60,12 @@ public class InvPreProductDetailResponse {
     /**
      * 扫码数量
      */
-    private Integer count;
+    private int count;
 
     /**
      * 实际数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 部门编码

src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java

@@ -58,17 +58,17 @@ public class InvPreProductResponse {
     /**
      * 入库数量
      */
-    private Integer inCount;
+    private int inCount;
 
     /**
      * 出库数量
      */
-    private Integer outCount;
+    private int outCount;
 
     /**
      * 实际数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 客户ID

src/main/java/com/glxp/api/res/inv/InvProductDetailResponse.java

@@ -60,12 +60,12 @@ public class InvProductDetailResponse {
     /**
      * 扫码数量
      */
-    private Integer count;
+    private int count;
 
     /**
      * 实际数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 部门编码

src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java

@@ -16,7 +16,7 @@ public class PurOrderDetailResponse {
     private String expireDate;
     private String productDate;
     private Integer count;
-    private Integer reCount;
+    private int reCount;
     private Integer sweepCount;
     private String ylqxzcrbarmc;
     private String zczbhhzbapzbh;

src/main/java/com/glxp/api/res/thrsys/ThrErpOrderResponse.java

@@ -25,7 +25,7 @@ public class ThrErpOrderResponse {
     private String expireDate;
     private Integer erpCount;
     private String originType;
-    private Integer reCount;
+    private int reCount;
     private String uuidFk;
     private String supId;
     private String supName;

src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java

@@ -46,8 +46,8 @@ public class ThrOrderResponse {
         private String batchNo;
         private String expireDate;
         private String productDate;
-        private Integer count;  //账面数量
+        private int count;  //账面数量
-        private Integer reCount;    //实际数量
+        private int reCount;    //实际数量
         private String orderIdFk;
         private String thirdSysFk;
         private String sweepCount;
@@ -161,11 +161,11 @@ public class ThrOrderResponse {
             this.count = count;
         }
 
-        public Integer getReCount() {
+        public int getReCount() {
             return reCount;
         }
 
-        public void setReCount(Integer reCount) {
+        public void setReCount(int reCount) {
             this.reCount = reCount;
         }
 

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -194,7 +194,7 @@ public class UdiContrastService {
             udiRelevanceEntity.setSupName(udiCombineRequest.getSupName());
         }
         Long relId = gennerOrderUtils.getRelId();
-        udiRelevanceEntity.setId(gennerOrderUtils.getRelId());
+        udiRelevanceEntity.setId(relId);
         udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
         insertUdiInfos(udiInfoEntities);
         return relId;

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

@@ -232,16 +232,21 @@ public class IoAddInoutService {
         if (CollUtil.isEmpty(ioOrderDetailCodeEntities)) {
             orderDetailCodeService.insert(buildEntity(orderEntity, codeTempEntity, udiRelevanceResponse));
         } else {
-            ioOrderDetailCodeEntities.forEach(orderDetailCodeEntity ->
+            boolean isUpdate = false;
-            {
+            for (IoOrderDetailCodeEntity orderDetailCodeEntity : ioOrderDetailCodeEntities) {
-                if (orderDetailCodeEntity.getBindRlFk().longValue() == udiRelevanceResponse.getId().longValue() && orderDetailCodeEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
+                if (orderDetailCodeEntity.getBindRlFk().longValue() == udiRelevanceResponse.getId().longValue()
+                        &&
+                        StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(codeTempEntity.getBatchNo()))) {
                     orderDetailCodeEntity.setCount(orderDetailCodeEntity.getCount() + codeTempEntity.getCount());
                     orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getReCount() + codeTempEntity.getReCount());
                     orderDetailCodeService.update(orderDetailCodeEntity);
-                } else {
+                    isUpdate = true;
-                    orderDetailCodeService.insert(buildEntity(orderEntity, codeTempEntity, udiRelevanceResponse));
+                    break;
                 }
-            });
+            }
+            if (!isUpdate) {
+                orderDetailCodeService.insert(buildEntity(orderEntity, codeTempEntity, udiRelevanceResponse));
+            }
         }
     }
 

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

@@ -333,8 +333,7 @@ public class IoCheckInoutService {
             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 (checkCount(bizEntity, codeEntity) == null) {
@@ -358,6 +357,12 @@ public class IoCheckInoutService {
         return errMsg;
     }
 
+
+    /**
+     *  && checkProductDate(bizEntity, codeEntity) == null
+     *                         && checkExpireDate(bizEntity, codeEntity) == null
+     */
+
     //扫码单反向校验
     public String codeOrderCheck(List<IoOrderDetailCodeEntity> orderDetailCodeEntities, List<IoOrderDetailBizEntity> orderDetailBizEntities) {
         for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 60

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: pro
   jmx:
     enabled: true