aps-甘特图更新计划开工时间校验优化

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

@@ -561,9 +561,16 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 log.error("无法通过ID:{}获取到坯料计划", processEquDo.getBlankid());
                 throw new CustomException("无法获取到坯料计划信息");
             }
-            if (Arrays.asList(COMPLETED, PROCESSING).contains(operationDo.getProcessstatus())) {
-                log.error("该作业已开工，不能调整开工时间");
-                throw new CustomException("该作业已开工，不能调整开工时间");
+            if ("合并加工".equals(operationDo.getProcessway())){
+                if (Arrays.asList(COMPLETED, PROCESSING).contains(operationDo.getProcessstatus())) {
+                    log.error("该作业已开工，不能调整开工时间");
+                    throw new CustomException("该作业已开工，不能调整开工时间");
+                }
+            }else {
+                if (Arrays.asList(JOBSTATUS_TO_BE_END, JOBSTATUS_TO_BE_STARTING).contains(processEquDo.getWorkstatus())) {
+                    log.error("该作业已开工，不能调整开工时间");
+                    throw new CustomException("该作业已开工，不能调整开工时间");
+                }
             }
             blankIdSet.add(operationDo.getBlankid());
             vo.setOldEquId(processEquDo.getProcessdeviceid());