预验收bug修改

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDetailDao.java

@@ -36,6 +36,7 @@ public interface InvPreInProductDetailDao {
      */
     boolean deleteByOrderId(String orderIdFk);
 
-    boolean deleteByCode(String orderIdFk, String originCode);
+    boolean deleteByCode(@Param("orderIdFk") String orderIdFk, @Param("originCode") String originCode);
+
 
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java

@@ -35,4 +35,6 @@ public interface InvPreProductDetailDao {
      */
     boolean deleteByOrderId(String orderIdFk);
 
+
+
 }

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

@@ -183,7 +183,6 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         }
 
         IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
-
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
         UdiInfoEntity udiInfoEntity = getMinDi(code);
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
@@ -192,11 +191,13 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
             udiEntity.setExpireDate(codeLostEntity.getExpireDate());
             udiEntity.setProduceDate(codeLostEntity.getProduceDate());
         }
+
         if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY
                 || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) {
             udiEntity.setUdi(udiInfoEntity.getNameCode());
             code = FilterUdiUtils.transGlxpNoSerStr(udiEntity);
         }
+
         filterInvProductDetailRequest.setOriginCode(null);
         filterInvProductDetailRequest.setCode(code);
         if (StrUtil.isNotEmpty(udiEntity.getBatchNo()))

api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java

@@ -931,10 +931,10 @@ public class IoTransInoutService {
                                 InvProductDetailEntity invPreinDetailEntity = invPreInProductDetailService.findByCode(key, codeEntity.getCode());
                                 if (invPreinDetailEntity != null) {
                                     int count = 0;
-                                    if (invPreinDetailEntity.getCount() < codeEntity.getCount()) {
+                                    if (invPreinDetailEntity.getCount().intValue() < codeEntity.getCount()) {
                                         count = 0;
                                     } else {
-                                        count = invPreinDetailEntity.getCount() - codeEntity.getCount();
+                                        count = invPreinDetailEntity.getCount().intValue() - codeEntity.getCount();
                                     }
                                     if (count >= 0) {
                                         isBreak = true;
@@ -945,7 +945,6 @@ public class IoTransInoutService {
                                             invPreInProductDetailService.updateInvProduct(invPreinDetailEntity);
                                         }
                                     }
-
                                 }
 
                             } else {
@@ -953,7 +952,6 @@ public class IoTransInoutService {
                             }
                         }
                     }
-
                 }
                 orderEntity.setPreInBillNo(preInBillNo.substring(1));
                 orderService.updateOrder(orderEntity);