aps-校验工艺路线修改

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

@@ -2254,18 +2254,20 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 return R.error("第" + j + "个坯料计划 工艺路线输出成品" + apsBlankOrderDo.getOutputmaterial() + "与坯料输出成品" + apsBlankOrderDo.getOutputfinishproduct() + "不一致");
             }
         }
-        //如果坯料需求的坯料来源=备料，并且首道工序作业的是否坯料工序=是，错误提示：备料工艺路线首道工序作业不应该包含坯料工序：{首道工序作业的工序}
-        //是否备料
-        if (apsBlankOrderDo.getBlankcomefrom().equals("备料")) {
-            //查询坯料计划的工序作业
-            List<ApsProcessOperationDo> processOperationList = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getBlankid, apsBlankOrderDo.getId()));
-            for (ApsProcessOperationDo processOperationDo : processOperationList) {
-                //没有前道工序作业ID
-                if (ObjectUtil.isEmpty(processOperationDo.getPreviousprocessid())) {
-                    if (processOperationDo.getIfblankprocess().equals("是")) {
-                        return R.error("第" + j + "个坯料计划 备料工艺路线首道工序作业不应该包含坯料工序：" + processOperationDo.getProcess());
+        if (checkLevel == 2 || checkLevel == 3) {
+            //如果坯料需求的坯料来源=备料，并且首道工序作业的是否坯料工序=是，错误提示：备料工艺路线首道工序作业不应该包含坯料工序：{首道工序作业的工序}
+            //是否备料
+            if (apsBlankOrderDo.getBlankcomefrom().equals("备料")) {
+                //查询坯料计划的工序作业
+                List<ApsProcessOperationDo> processOperationList = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getBlankid, apsBlankOrderDo.getId()));
+                for (ApsProcessOperationDo processOperationDo : processOperationList) {
+                    //没有前道工序作业ID
+                    if (ObjectUtil.isEmpty(processOperationDo.getPreviousprocessid())) {
+                        if (processOperationDo.getIfblankprocess().equals("是")) {
+                            return R.error("第" + j + "个坯料计划 备料工艺路线首道工序作业不应该包含坯料工序：" + processOperationDo.getProcess());
+                        }
+                        break;
                     }
-                    break;
                 }
             }
         }