aps-校验订单、校验坯料计划

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -1445,7 +1445,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         //产品明细
         List<ApsProductDetailDo> apsProductDetailDoList = req.getApsProductDetailDoList();
         //输出成品
-        List<ApsProcessOutputProductDo> apsProcessOutputProductDoList = req.getApsProcessOutputProductDoList();
+        List<ApsProcessOutputProductDo> apsProcessOutputProductDoList = req.getApsProcessOutputProductDoList().stream().filter(item->item.getDeleted().equals("0")).collect(Collectors.toList());
 
         //如果坯料计划未开工(生产状态<=30)
         if (apsBlankOrderDo.getProductstatus().compareTo(TO_BE_STARTED) <= 0) {
@@ -1609,6 +1609,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             }
         }
 
+        //校验是否有工序作业
+        if (checkLevel == 2) {
+            List<ApsProcessOperationDo> processOperationDos = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getBlankid, apsBlankOrderDo.getId()));
+            if (processOperationDos.size() <= 0) {
+                return R.error("请选择工艺路线");
+            }
+        }
+
         if (checkLevel == 3) {
             //============校验工序作业=============
             Map<String, Object> params = new HashMap<>();
@@ -1865,6 +1873,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             }
         }
 
+        //校验是否有工序作业
+        if (checkLevel == 2) {
+            List<ApsProcessOperationDo> processOperationDos = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getBlankid, apsBlankOrderDo.getId()));
+            if (processOperationDos.size() <= 0) {
+                return R.error("第" + j + "个坯料计划 请选择工艺路线");
+            }
+        }
+
         if (checkLevel == 3) {
             //============校验工序作业=============
             Map<String, Object> params = new HashMap<>();