aps-甘特图更新工序作业明细接口校验优化补充

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

@@ -644,10 +644,6 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             log.error("无法根据ID:{}获取到工序作业明细", id);
             return R.error("无法获取到工序作业信息");
         }
-        if (!JOBSTATUS_TO_BE_START.equals(apsProcessOperationProcessEquDo.getWorkstatus())) {
-            log.error("已开工的作业不可修改");
-            return R.error("已开工的作业不可修改");
-        }
         if (StringUtils.isBlank(apsProcessOperationProcessEquDo.getProcessid())) {
             log.error("工序作业明细对应工序作业ID为空");
             return R.error("无法获取作业明细对应的工序作业");
@@ -657,6 +653,17 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         if (apsProcessOperationDo == null) {
             log.error("根据ID：{} 获取工序作业失败", apsProcessOperationProcessEquDo.getProcessid());
         }
+        if (apsProcessOperationDo!= null&&"合并加工".equals(apsProcessOperationDo.getProcessway())){
+            if (Arrays.asList(COMPLETED, PROCESSING).contains(apsProcessOperationDo.getProcessstatus())) {
+                log.error("已开工的作业不可修改");
+                return R.error("已开工的作业不可修改");
+            }
+        }else {
+            if (!JOBSTATUS_TO_BE_START.equals(apsProcessOperationProcessEquDo.getWorkstatus())) {
+                log.error("已开工的作业不可修改");
+                return R.error("已开工的作业不可修改");
+            }
+        }
         // 更新开工时间 jobDetailsVo
         String equId = jobDetailsVo.getEquId();
         String equName = jobDetailsVo.getEquName();