楚江ERP：锁价锁规是否可以生产判断修改

杨鸣坤
1 parent 42855bab
Showing 1 changed file with 7 additions and 39 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
View file @0968ea9
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
View file @0968ea9
@@ -563,7 +563,7 @@ public class ContractDistributorStandardServiceImpl extends
         flowInstanceWrapperService.startInstance(FORMAL_FLAG, data.getId(), FORMAL_FLAG, data);
         // 创建订货单
-        createPurchaseOrderInfo(data, "formal");
+        createPurchaseOrderInfo(data, Arrays.asList("DIST_STOCK_CONTRACT", "INTL_INVENTORY_AGMT").contains(data.getType()) ? "PRODUCTION" : "NO_PRODUCTION");
     }
     /**
@@ -571,27 +571,12 @@ public class ContractDistributorStandardServiceImpl extends
      *
      * @param contractDistributorStandard
      */
-    private void createPurchaseOrderInfo(ContractDistributorStandard contractDistributorStandard, String uploadFrom) {
+    private void createPurchaseOrderInfo(ContractDistributorStandard contractDistributorStandard, String type) {
         Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
                 .eq(PurchaseOrderInfo::getContractId, contractDistributorStandard.getId());
         List<PurchaseOrderInfo> purchaseOrderInfoList = purchaseOrderInfoService.list(orderInfoWrapper);
         log.info("合同类型：{}，合同已生成订货单数量：{}", contractDistributorStandard.getType(), CollectionUtils.isEmpty(purchaseOrderInfoList) ? 0 : purchaseOrderInfoList.size());
-        if (Arrays.asList("DISTRIB_STD", "DRAFT_DIST_AGMT", "INTL_STD_CONTRACT", "INTL_OPEN_SPEC_AGMT", "PROCESS_STD_AGMT").contains(contractDistributorStandard.getType())
-                && CollectionUtils.isNotEmpty(purchaseOrderInfoList)) {
-            log.info("已经生成过订货单了，不允许继续生成！");
-            return;
-        }
-
-        if (Arrays.asList("DIST_STOCK_CONTRACT", "INTL_INVENTORY_AGMT").contains(contractDistributorStandard.getType())
-                && "formal".equals(uploadFrom)
-                && CollectionUtils.isNotEmpty(purchaseOrderInfoList)) {
-            log.info("已经生成过订货单了，不允许继续生成！");
-            return;
-        }
-
-        if (Arrays.asList("DIST_STOCK_CONTRACT", "INTL_INVENTORY_AGMT").contains(contractDistributorStandard.getType())
-                && "standard".equals(uploadFrom)
-                && CollectionUtils.isNotEmpty(purchaseOrderInfoList) && purchaseOrderInfoList.size() >= 2) {
+        if (CollectionUtils.isNotEmpty(purchaseOrderInfoList)) {
             log.info("已经生成过订货单了，不允许继续生成！");
             return;
         }
@@ -627,26 +612,9 @@ public class ContractDistributorStandardServiceImpl extends
         createPurchaseOrderInfoVo.setElement(contractDistributorStandard.getComponent());
         createPurchaseOrderInfoVo.setPackaging(contractDistributorStandard.getPackaging());
         createPurchaseOrderInfoVo.setRemarks(contractDistributorStandard.getRemarks());
-        createPurchaseOrderInfoVo.setType("NO_PRODUCTION");
+        createPurchaseOrderInfoVo.setType(type);
         createPurchaseOrderInfoVo.setExamineStatus("AUDIT");
-        // 经销标准合同/外贸标准合同/加工标准合同 需要生产
-        if (Arrays.asList("DISTRIB_STD", "INTL_STD_CONTRACT", "PROCESS_STD_AGMT").contains(contractDistributorStandard.getType())) {
-            createPurchaseOrderInfoVo.setType("PRODUCTION");
-        }
-
-        // 经销未锁规合同/外贸未锁规格合同 标准订单需要生产
-        if (Arrays.asList("DRAFT_DIST_AGMT", "INTL_OPEN_SPEC_AGMT").contains(contractDistributorStandard.getType())
-                && "STANDARD".equals(contractDistributorStandard.getStatus()) && StringUtils.isNotBlank(contractDistributorStandard.getParentId())) {
-            createPurchaseOrderInfoVo.setType("PRODUCTION");
-        }
-
-        // 经销库存合同/外贸库存合同 第一次下发订单需要生产
-        if (Arrays.asList("DIST_STOCK_CONTRACT", "INTL_INVENTORY_AGMT").contains(contractDistributorStandard.getType())
-                && CollectionUtils.isEmpty(purchaseOrderInfoList)) {
-            createPurchaseOrderInfoVo.setType("PRODUCTION");
-        }
-
         List<CreatePurchaseOrderLineVo> createPurchaseOrderLineVoList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(contractDistributorLineList)) {
             contractDistributorLineList.forEach(contractDistributorLine -> {
@@ -755,7 +723,7 @@ public class ContractDistributorStandardServiceImpl extends
                 || "INTL_STD_CONTRACT".equals(data.getType())
                 || "PROCESS_STD_AGMT".equals(data.getType())) {
             // 创建订货单
-            createPurchaseOrderInfo(data, "standard");
+            createPurchaseOrderInfo(data, "PRODUCTION");
         }
     }
@@ -996,7 +964,7 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
         // 创建订货单
-        createPurchaseOrderInfo(data, "standard");
+        createPurchaseOrderInfo(data, "NO_PRODUCTION");
     }
     @Override
@@ -1066,7 +1034,7 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
         // 创建订货单
-        createPurchaseOrderInfo(data, "standard");
+        createPurchaseOrderInfo(data, "PRODUCTION");
     }
     public List<String> getNoContractSigned(List<String> buyerList) {