BUG修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java

@@ -160,7 +160,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
             if (!PurchasePlanStatusEnum.CLOSED.getCode().equals(purchasePlanMainDO.getStatus())) {
                 QueryWrapper queryWrapperDetail = new QueryWrapper();
                 queryWrapperDetail.eq("master_id", purchasePlanMainDO.getId());
-                queryWrapperDetail.eq("number", ppoNumber);
+                queryWrapperDetail.eq("po_number", ppoNumber);
                 queryWrapperDetail.eq("po_line", ppoLine);
                 queryWrapperDetail.eq("item_code", pitemCode);
                 PurchasePlanDetailDO purchasePlanDetailDO = purchasePlanDetailMapper.selectOne(queryWrapperDetail);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java

@@ -40,6 +40,7 @@ import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.enums.order.OrderStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.itembasic.ItembasicService;
+import com.win.module.wms.service.itempackaging.ItempackagingService;
 import com.win.module.wms.service.purchasePlan.PurchasePlanMainService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.service.rule.RuleService;
@@ -96,6 +97,9 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
     private TrendsApi trendsApi;
     @Resource
     private RuleService ruleService;
+    @Resource
+    private ItempackagingService itempackagingService;
+
 
     @Override
     public Long createSupplierdeliverRequestMain(SupplierdeliverRequestMainCreateReqVO createReqVO) {
@@ -229,7 +233,10 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
     private SupplieritemDO validatorSupplierItemExist(String supplierCode, String itemCode) {
         return supplieritemService.selectSupplierItemExist(supplierCode, itemCode);
     }
-
+    //子表校验 校验物品标包信息
+    private ItempackagingDO validatorItemPackagingExist(String itemCode) {
+        return itempackagingService.selectItemPackagingExist(itemCode);
+    }
     //子表校验 校验要货计划
     private PurchasePlanDetailDO validatorPurchasePlan(SupplierdeliverRequestMainDO supplierdeliverRequestMainDO, SupplierdeliverRequestDetailDO supplierdeliverRequestDetailDO) {
         PurchasePlanDetailDO purchasePlanDetailDO =
@@ -266,6 +273,11 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         if ((purchasePlanDetailDO.getPlanQty().subtract(purchasePlanDetailDO.getShippedQty())).compareTo(detailDo.getQty()) == -1) {
             throw exception(QTY_ERROR, detailDo.getQty(), null, detailDo.getPoLine(), null, purchasePlanDetailDO.getPlanQty().subtract(purchasePlanDetailDO.getShippedQty()));
         }
+        ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(detailDo.getItemCode());
+        if(itempackagingDO != null){
+            detailDo.setStdPackUnit(itempackagingDO.getStdPackUnit());
+            detailDo.setStdPackQty(itempackagingDO.getStdPackQty());
+        }
     }
 
     //新增校验
@@ -279,6 +291,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
             validatorDetailMethod(supplierdeliverRequestDetailDO, supplierdeliverRequestMainDO);
             supplierdeliverRequestDetailDO.setMasterId(supplierdeliverRequestMainDO.getId());
             supplierdeliverRequestDetailDO.setNumber(supplierdeliverRequestMainDO.getNumber());
+            supplierdeliverRequestDetailDO.setConvertRate(new BigDecimal(0));
         }
         supplierdeliverRequestDetailMapper.insertBatch(subDOList);
         return supplierdeliverRequestMainDO;
@@ -294,7 +307,9 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
             validatorDetailMethod(supplierdeliverRequestDetailDO, supplierdeliverRequestMainDO);
         }
         supplierdeliverRequestMainMapper.updateById(supplierdeliverRequestMainDO);
-        supplierdeliverRequestDetailMapper.updateBatch(subDOList);
+        if(subDOList!=null&&subDOList.size()>0){
+            supplierdeliverRequestDetailMapper.updateBatch(subDOList);
+        }
         return supplierdeliverRequestMainDO;
     }
 
@@ -344,6 +359,14 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         } catch (ServiceException ex) {
             messageDetail += ex.getMessage() + ",";
         }
+        // 校验物品标包信息
+        try {
+            ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(supplierdeliverRequestDetailDO.getItemCode());
+            supplierdeliverRequestDetailDO.setStdPackUnit(itempackagingDO.getStdPackUnit());
+            supplierdeliverRequestDetailDO.setStdPackQty(itempackagingDO.getStdPackQty());
+        } catch (ServiceException ex) {
+            messageDetail += ex.getMessage() + ",";
+        }
         // 校验供应商物品
         try {
             SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(supplierdeliverRequestMainDO.getSupplierCode(), supplierdeliverRequestDetailDO.getItemCode());