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

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java

@@ -320,6 +320,7 @@ public class UdiInfoController {
     public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) {
 
         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId());
+        productInfoFilterRequest.setRelId(productInfoFilterRequest.getRelId());
         List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest);
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
             for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
@@ -330,8 +331,6 @@ public class UdiInfoController {
                 }
             }
         }
-
-
         return ResultVOUtils.success(udiInfoEntities);
     }
 

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java

@@ -104,56 +104,29 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
         filterInvProductDetailRequest.setMainAction(ConstantType.TYPE_PUT);
         List<InvProductDetailEntity> datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
         if (CollUtil.isEmpty(datas)) {
-            filterInvProductDetailRequest.setOriginCode(null);
+//            filterInvProductDetailRequest.setOriginCode(null);
-            UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
+//            UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
-            if (StrUtil.isNotEmpty(udiEntity.getBatchNo()))
+//            if (StrUtil.isNotEmpty(udiEntity.getBatchNo()))
-                filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
+//                filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
-            else
+//            else
-                filterInvProductDetailRequest.setBatchNo("empty");
+//                filterInvProductDetailRequest.setBatchNo("empty");
-
+//
-            filterInvProductDetailRequest.setProductionDate(udiEntity.getProduceDate());
+//            filterInvProductDetailRequest.setProductionDate(udiEntity.getProduceDate());
-            filterInvProductDetailRequest.setExpireDate(udiEntity.getExpireDate());
+//            filterInvProductDetailRequest.setExpireDate(udiEntity.getExpireDate());
-            datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+//            datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+            return null;
         }
-
-
         if (CollUtil.isNotEmpty(datas)) {
             InvProductDetailEntity invProductDetailEntity = datas.get(0);
-            String bacthNo = null;
+            for (int i = 1; i < datas.size(); i++) {
-            if (StrUtil.isEmpty(invProductDetailEntity.getBatchNo())) {
+                invProductDetailEntity.setCount(invProductDetailEntity.getCount() + datas.get(i).getCount());
-                bacthNo = "empty";
+            }
-            } else {
-                bacthNo = invProductDetailEntity.getBatchNo();
-            }
-//            InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode());
-//            invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
             return invProductDetailEntity;
         }
         return null;
+    }
 
 
-//        Map<String, InvProductDetailEntity> invProductDetailEntityMap = new HashMap<>();
-//        for (InvProductDetailEntity invProductDetailEntity : datas) {
-//            InvProductDetailEntity temp = invProductDetailEntityMap.get(invProductDetailEntity.getOriginCode());
-//            if (temp == null) {
-//                invProductDetailEntityMap.put(invProductDetailEntity.getOriginCode(), invProductDetailEntity);
-//            } else {
-//                int count1 = 0;
-//                int count2 = 0;
-//                if (temp.getMainAction().equals(ConstantType.TYPE_PUT)) {
-//                    count1 = temp.getCount();
-//                } else {
-//                    count1 = 0 - temp.getCount();
-//                }
-//                if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
-//                    count2 = invProductDetailEntity.getCount();
-//                } else {
-//                    count2 = 0 - invProductDetailEntity.getCount();
-//                }
-//                temp.setCount(count1 + count2);
-//            }
-//        }
-    }
 
     @Override
     public boolean deleteByOrderIdFk(String orderIdFk) {

api-admin/src/main/resources/application-dev.properties

@@ -1,9 +1,9 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.62:3306/spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Glxp@6066
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -101,6 +101,10 @@
             <if test="sptm != '' and sptm != null">
                 AND basic_products.sptm = #{sptm}
             </if>
+            <if test="relId != '' and relId != null">
+                AND basic_udirel.id = #{relId}
+            </if>
+
         </where>
 
     </select>