楚江erp：申请发货-合同是否规范校验逻辑调整

yeqianyong
1 parent 6e03acd3
Showing 1 changed file with 9 additions and 2 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
View file @c6ffecf
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
View file @c6ffecf
@@ -298,8 +298,15 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         if (contract == null) {
             throw new DefaultClientException("合同不存在！");
         }
-        Boolean standardStandardized = contract.getStandardStandardized();
-        if (!BooleanUtils.isTrue(standardStandardized)) {
+        String contractType = contract.getType();
+        if (("DISTRIB_STD".equals(contractType) || "INTL_STD_CONTRACT".equals(contractType) || "PROCESS_STD_AGMT".equals(contractType)
+                || "DRAFT_DIST_AGMT".equals(contractType) || "INTL_OPEN_SPEC_AGMT".equals(contractType))
+                && !"PASS".equals(contract.getStandardApproved())) {
+            // 标准、未锁规合同
+            throw new DefaultClientException("合同不规范，请补充！");
+        } else if (("DIST_STOCK_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType))
+                && !"PASS".equals(contract.getFormalApproved())) {
+            // 库存合同
             throw new DefaultClientException("合同不规范，请补充！");
         }
         return InvokeResultBuilder.success();