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

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationProcessEquDao.java

@@ -133,7 +133,7 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
 
     void repairePlanStartDate(@Param("userId") String userId,@Param("userName")String userName);
 
-    List<ApsProcessOperationProcessEquCheckVo> getNeedCheckEquList(@Param("startTime") DateTime startTime,@Param("endTime") DateTime endTime, @Param("tenantId") String tenantId);
+    List<ApsProcessOperationProcessEquCheckVo> getNeedCheckEquList(@Param("startTime") DateTime startTime, @Param("tenantId") String tenantId);
 
     void repairePlanStartDate2(@Param("userId") String userId,@Param("userName")String userName);
 }

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

@@ -794,7 +794,7 @@ public class ApsServiceImpl implements ApsService {
                 /*List<ApsBlankOrderVo> apsBlankOrderss = new ArrayList<>();
                 apsBlankOrderss.add(bo);*/
                 //排程结束后，查询修改时间在排程开始-？的明细，不更新修改信息，并最后重新判断其冲突
-                List<ApsProcessOperationProcessEquCheckVo> list = apsProcessOperationProcessEquDao.getNeedCheckEquList(startTime, endTime, CXCommonUtils.getCurrentUserFactoryId(currentUser));
+                List<ApsProcessOperationProcessEquCheckVo> list = apsProcessOperationProcessEquDao.getNeedCheckEquList(startTime, CXCommonUtils.getCurrentUserFactoryId(currentUser));
                 if (!list.isEmpty()) {
                     List<String> updateIdList = list.stream().map(ApsProcessOperationProcessEquCheckVo::getId).distinct().collect(Collectors.toList());
                     List<ProductionProcesses> productionProcesses = productionScheduleRetVo.getProcesses().stream().filter(item -> !updateIdList.contains(item.getId())).collect(Collectors.toList());

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

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