aps-甘特图更新作业明细接口/更新计划开工时间接口校验调整，甘特图校验加工时间是否重叠接口代码优化

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

@@ -561,9 +561,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 log.error("无法通过ID:{}获取到坯料计划", processEquDo.getBlankid());
                 throw new CustomException("无法获取到坯料计划信息");
             }
-            if (Arrays.asList(COMPLETED, PROCESSING, TO_BE_STARTED).contains(operationDo.getProcessstatus())) {
-                log.error("该作业已发布，不能调整开工时间");
-                throw new CustomException("该作业已发布，不能调整开工时间");
+            if (Arrays.asList(COMPLETED, PROCESSING).contains(operationDo.getProcessstatus())) {
+                log.error("该作业已开工，不能调整开工时间");
+                throw new CustomException("该作业已开工，不能调整开工时间");
             }
             blankIdSet.add(operationDo.getBlankid());
             vo.setOldEquId(processEquDo.getProcessdeviceid());
@@ -638,8 +638,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             return R.error("无法获取到工序作业信息");
         }
         if (!JOBSTATUS_TO_BE_START.equals(apsProcessOperationProcessEquDo.getWorkstatus())) {
-            log.error("当前工序作业已开工");
-            return R.error("当前工序作业已开工无法更新工序作业信息");
+            log.error("已开工的作业不可修改");
+            return R.error("已开工的作业不可修改");
         }
         if (StringUtils.isBlank(apsProcessOperationProcessEquDo.getProcessid())) {
             log.error("工序作业明细对应工序作业ID为空");
@@ -650,10 +650,6 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         if (apsProcessOperationDo == null) {
             log.error("根据ID：{} 获取工序作业失败", apsProcessOperationProcessEquDo.getProcessid());
         }
-        if (!TO_BE_PUBLISHED.equals(apsProcessOperationDo.getProcessstatus())) {
-            log.error("工序作业状态：{}异常", apsProcessOperationDo.getProcessstatus());
-            return R.error("只有待发布的工序作业才可以修改");
-        }
         // 更新开工时间 jobDetailsVo
         String equId = jobDetailsVo.getEquId();
         String equName = jobDetailsVo.getEquName();
@@ -677,7 +673,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     jobDetailsVo.getPlanStartTime().getTime() - oldPlanstartdate.getTime()));
             // 增加受影响的工序作业信息
             affectedIdList.addAll(checkProcessingTimeConflict(apsProcessOperationProcessEquDo, oldPlanstartdate,
-                    oldPlanenddate, oldEquId, apsProcessOperationDo.getProcessway(),null));
+                    oldPlanenddate, oldEquId, apsProcessOperationDo.getProcessway(),new ArrayList<>()));
         }
 
         // 判断是否存在设备不可用
@@ -820,7 +816,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 // 增加受影响的工序作业信息
                 affectedIdList.addAll(checkProcessingTimeConflict(newDo, currentProcessEquDo.getPlanstartdate(),
                         currentProcessEquDo.getPlanenddate(), currentProcessEquDo.getProcessdeviceid(),
-                        currentProcessOperationDo.getProcessway(),null));
+                        currentProcessOperationDo.getProcessway(),new ArrayList<>()));
             } else {
                 /**************************拆分逻辑处理***********************************/
                 newDo.setId(SecurityUtil.getUUID());
@@ -853,7 +849,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 // 增加受影响的工序作业信息
                 affectedIdList.addAll(checkProcessingTimeConflict(newDo, newDo.getPlanstartdate(),
                         newDo.getPlanenddate(), newDo.getProcessdeviceid(),
-                        currentProcessOperationDo.getProcessway(),null));
+                        currentProcessOperationDo.getProcessway(),new ArrayList<>()));
                 this.save(newDo);
                 newDataList.add(newDo);
                 /**************************原数据逻辑处理***********************************/
@@ -893,7 +889,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 // 增加受影响的工序作业信息
                 affectedIdList.addAll(checkProcessingTimeConflict(oldDo,
                         currentProcessEquDo.getPlanstartdate(), currentProcessEquDo.getPlanenddate(),
-                        oldDo.getProcessdeviceid(), currentProcessOperationDo.getProcessway(),null));
+                        oldDo.getProcessdeviceid(), currentProcessOperationDo.getProcessway(),new ArrayList<>()));
             }
         });
         this.saveOrUpdateBatch(newDataList);
@@ -1264,7 +1260,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         List<ApsProcessOperationProcessEquDo> beforeUpdatingConflictId = this.baseMapper.getTimeOverlapByEquId(oldEquId,
                 apsProcessOperationProcessEquDo.getId(), oldPlanstartdate, oldPlanenddate, currentProcessWay);
         List<ApsProcessOperationProcessEquDo> aboutProcessEquList = new ArrayList<>();
-        if (returnAboutIds!= null&&!returnAboutIds.isEmpty()){
+        if (!returnAboutIds.isEmpty()){
             aboutProcessEquList = (List<ApsProcessOperationProcessEquDo>) apsProcessOperationProcessEquService.listByIds(returnAboutIds);
         }
         if (!beforeUpdatingConflictId.isEmpty()) {