Pārlūkot izejas kodu

aps-订单发布时,只发布待发布的坯料计划,如果坯料计划都是已发布以上,则跳过坯料计划的发布,直接发布订单

sucheng 1 gadu atpakaļ
vecāks
revīzija
5974830dda

+ 7 - 5
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -334,10 +334,12 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
 
         if (req.getIsNeedPublish()) {
             //=============发布排程================
-            List<String> blankIds = apsBlankOrderDoList.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
-            R publish = apsBlankOrderService.publish(blankIds);
-            if (!publish.getCode().equals("200")) {
-                throw new RuntimeException(publish.getMsg());
+            List<String> blankIds = apsBlankOrderDoList.stream().filter(item -> item.getProductstatus().equals(SaveConstans.ProductionStatus.TO_BE_PUBLISHED)).map(ApsBlankOrderDo::getId).collect(Collectors.toList());
+            if (ObjectUtil.isNotEmpty(blankIds)) {
+                R publish = apsBlankOrderService.publish(blankIds);
+                if (!publish.getCode().equals("200")) {
+                    throw new RuntimeException(publish.getMsg());
+                }
             }
         }
 
@@ -762,7 +764,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         ApsProductionOrderDo nowApsProductionOrderDo = this.getById(req.getOrderId());
 
         //如果 评审状态 不一致
-        if(!oldApsProductionOrderDo.getAuditstatus().equals(nowApsProductionOrderDo.getAuditstatus())){
+        if (!oldApsProductionOrderDo.getAuditstatus().equals(nowApsProductionOrderDo.getAuditstatus())) {
             return R.error("该订单已被其他人提交,不能保存或提交");
         }