无序列号验收，扫码暂时去除缓存查询

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

@@ -385,21 +385,30 @@ public class IoCodeTempController extends BaseController {
 
             BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
             if (checkOriginCodeRes != null) {
-                IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
-                if (codeLostEntity == null) {
-                    if (StrUtil.isNotEmpty(orderId)) {
-                        List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
-                        IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
-                        if (ioCodeEnttity == null) {
-                            return checkOriginCodeRes;
-                        }
-                    } else
+//                IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
+//                if (codeLostEntity == null) {
+//                    if (StrUtil.isNotEmpty(orderId)) {
+//                        List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
+//                        IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
+//                        if (ioCodeEnttity == null) {
+//                            return checkOriginCodeRes;
+//                        }
+//                    } else
+//                        return checkOriginCodeRes;
+//                } else {
+//                    udiEntity.setBatchNo(codeLostEntity.getBatchNo());
+//                    udiEntity.setExpireDate(codeLostEntity.getExpireDate());
+//                    udiEntity.setProduceDate(codeLostEntity.getProduceDate());
+//                }
+
+                if (StrUtil.isNotEmpty(orderId)) {
+                    List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
+                    IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
+                    if (ioCodeEnttity == null) {
                         return checkOriginCodeRes;
-                } else {
-                    udiEntity.setBatchNo(codeLostEntity.getBatchNo());
-                    udiEntity.setExpireDate(codeLostEntity.getExpireDate());
-                    udiEntity.setProduceDate(codeLostEntity.getProduceDate());
-                }
+                    }
+                } else
+                    return checkOriginCodeRes;
             }
         }
 

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

@@ -284,7 +284,7 @@ public class IoOrderReviewController extends BaseController {
                         && checkOrderCodesBean.getMyCount() == checkOrderCodesBean.getScanCount()) {
                     return Constant.CHECK_REPEAT;
                 }
-                int curCount = checkOrderCodesBean.getScanCount() + checkOrderCodesBean.getMyCount();
+                int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getRelId());
                 if (curCount == checkOrderCodesBean.getMyCount()) {
                     checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);
                 }

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ 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://192.168.0.66:3364/udi_wms_glxp?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:

src/main/resources/application-pro.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_wms_glxp?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:

src/main/resources/application.yml

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