aps-预排程和调度过程过程中修改作业，调度排程不应该改变计划开工和完工时间

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

@@ -793,7 +793,7 @@ public class ApsServiceImpl implements ApsService {
                 // 获取坯料计划
                 /*List<ApsBlankOrderVo> apsBlankOrderss = new ArrayList<>();
                 apsBlankOrderss.add(bo);*/
-                //排程结束后，查询修改时间在排程开始-排程结束之间的待开工的明细，不更新修改信息，并最后重新判断其冲突
+                //排程结束后，查询修改时间在排程开始-？的明细，不更新修改信息，并最后重新判断其冲突
                 List<ApsProcessOperationProcessEquCheckVo> list = apsProcessOperationProcessEquDao.getNeedCheckEquList(startTime, endTime, CXCommonUtils.getCurrentUserFactoryId(currentUser));
                 if (!list.isEmpty()) {
                     List<String> updateIdList = list.stream().map(ApsProcessOperationProcessEquCheckVo::getId).distinct().collect(Collectors.toList());
@@ -828,7 +828,8 @@ public class ApsServiceImpl implements ApsService {
                     throw new CustomException(productionScheduleRetVo.getMsg() + " " + DateUtil.formatDateTime(new Date()));
                 }
                 if (!list.isEmpty()) {
-                    for (ApsProcessOperationProcessEquCheckVo equDo : list) {
+                    List<ApsProcessOperationProcessEquCheckVo> waitStartList = list.stream().filter(item -> item.getWorkstatus().equals("待开工")).collect(Collectors.toList());
+                    for (ApsProcessOperationProcessEquCheckVo equDo : waitStartList) {
                         try {
                             apsProcessOperationProcessEquService.checkProcessingTimeConflict(equDo,
                                     null, null, null, equDo.getProcessWay(), new LinkedList<>());

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -638,9 +638,9 @@
         AND apo.DELETED = 0
         AND apope.PROCESSDEVICEID != ''
         AND apope.PROCESSDEVICEID is not null
-        AND apope.WORKSTATUS = '待开工'
+#         AND apope.WORKSTATUS = '待开工'
         AND apope.TENANTID = #{tenantId}
         AND apope.MODIFYDATE > #{startTime}
-        AND apope.MODIFYDATE < #{endTime}
+#         AND apope.MODIFYDATE < #{endTime}
     </select>
 </mapper>