楚江ERP：订货单生成逻辑调整

杨鸣坤
1 parent 00c94625
Showing 1 changed file with 15 additions and 5 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 @4408c9e
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
View file @4408c9e
@@ -559,21 +559,21 @@ public class ContractDistributorStandardServiceImpl extends
         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("已经生成过发货单了，不允许继续生成！");
+            log.info("已经生成过订货单了，不允许继续生成！");
             return;
         }
         if (Arrays.asList("DIST_STOCK_CONTRACT", "INTL_INVENTORY_AGMT").contains(contractDistributorStandard.getType())
                 && "formal".equals(uploadFrom)
                 && CollectionUtils.isNotEmpty(purchaseOrderInfoList)) {
-            log.info("已经生成过发货单了，不允许继续生成！");
+            log.info("已经生成过订货单了，不允许继续生成！");
             return;
         }
         if (Arrays.asList("DIST_STOCK_CONTRACT", "INTL_INVENTORY_AGMT").contains(contractDistributorStandard.getType())
                 && "standard".equals(uploadFrom)
                 && CollectionUtils.isNotEmpty(purchaseOrderInfoList) && purchaseOrderInfoList.size() >= 2) {
-            log.info("已经生成过发货单了，不允许继续生成！");
+            log.info("已经生成过订货单了，不允许继续生成！");
             return;
         }
@@ -732,8 +732,12 @@ public class ContractDistributorStandardServiceImpl extends
         // 开启审核
         flowInstanceWrapperService.startInstance(STANDARD_FLAG, data.getId(), STANDARD_FLAG, data);
-        // 创建订货单
-        createPurchaseOrderInfo(data, "standard");
+        if ("DISTRIB_STD".equals(data.getType())
+                || "INTL_STD_CONTRACT".equals(data.getType())
+                || "PROCESS_STD_AGMT".equals(data.getType())) {
+            // 创建订货单
+            createPurchaseOrderInfo(data, "standard");
+        }
     }
     @OpLog(type = OtherOpLogType.class, name = "上传双方盖章合同附件，ID：{}", params = {"#id"})
@@ -971,6 +975,9 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setVariable("id", vo.getId());
         OpLogUtil.setExtra(vo);
+
+        // 创建订货单
+        createPurchaseOrderInfo(data, "standard");
     }
     @Override
@@ -1038,6 +1045,9 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setVariable("id", vo.getId());
         OpLogUtil.setExtra(vo);
+
+        // 创建订货单
+        createPurchaseOrderInfo(data, "standard");
     }
     public List<String> getNoContractSigned(List<String> buyerList) {