Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -562,14 +562,16 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 throw new CustomException("无法获取到坯料计划信息");
             }
             if ("合并加工".equals(operationDo.getProcessway())){
-                if (Arrays.asList(COMPLETED, PROCESSING).contains(operationDo.getProcessstatus())) {
-                    log.error("该作业已开工，不能调整开工时间");
-                    throw new CustomException("该作业已开工，不能调整开工时间");
+                if (Arrays.asList(COMPLETED, PROCESSING,TO_BE_STARTED).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("该作业已开工，不能调整开工时间");
+                if (!"20".equals(operationDo.getProcessstatus())){
+                    if (Arrays.asList(JOBSTATUS_TO_BE_END, JOBSTATUS_TO_BE_STARTING,JOBSTATUS_TO_BE_START).contains(processEquDo.getWorkstatus())) {
+                        log.error("该作业已发布，不能调整开工时间");
+                        throw new CustomException("该作业已发布，不能调整开工时间");
+                    }
                 }
             }
             blankIdSet.add(operationDo.getBlankid());