库存无批次号系统繁忙问题

src/main/java/com/glxp/api/controller/inv/UdiTraceController.java

@@ -172,10 +172,7 @@ public class UdiTraceController {
                                     mInvProductDetailEntities.addAll(invProductDetailEntities);
                                 }
                             }
-
                         }
-
-
                     } else {
                         filterInvProductDetailRequest = new FilterInvProductDetailRequest();
                         filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + "");
@@ -184,14 +181,9 @@ public class UdiTraceController {
                         if (CollUtil.isNotEmpty(invProductDetailEntities)) {
                             mInvProductDetailEntities.addAll(invProductDetailEntities);
                         }
-
                     }
                 }
-
-
             }
-
-
         } else {
             //单级包装
             FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();

src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java

@@ -214,7 +214,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
         List<InvPreInProductDetailEntity> datas =
                 invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
                         .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
-                        .and(i-> i.isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq(StrUtil.isEmpty(batchNo), "batchNo", "")));
+                        .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", "")));
 
         int count = 0;
         if (CollUtil.isNotEmpty(datas)) {

src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java

@@ -190,7 +190,11 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
         }
         List<InvPreProductDetailEntity> datas =
                 invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
-                        .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode));
+                       .eq(StrUtil.isNotEmpty(supId), "supId", supId)
+                        .eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode)
+                        .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
+                        .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", "")))
+                ;
 
         int count = 0;
         if (CollUtil.isNotEmpty(datas)) {

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -183,7 +183,8 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         List<InvProductDetailEntity> datas =
                 invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
                         .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)
-                        .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) .isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq(StrUtil.isEmpty(batchNo),"batchNo","")
+                        .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
+                        .and(StrUtil.isEmpty(batchNo), i -> i.isNull("batchNo").or().eq("batchNo", ""))
                 );
 
         int count = 0;

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://127.0.0.1:3306/udi_wms_pt?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_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/schemas/schema_v2.1.sql

@@ -608,4 +608,3 @@ CALL Pro_Temp_ColumnWork('io_order', 'fromSpmsOrders', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);
-