aps-调度排程修改时间相关逻辑

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

@@ -802,13 +802,13 @@ public class ApsServiceImpl implements ApsService {
                 apsBlankOrderss.add(bo);*/
                 //排程结束后，查询修改时间在排程开始-？的明细，不更新修改信息，并最后重新判断其冲突
                 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());
-                    productionScheduleRetVo.setProcesses(productionProcesses);
-                }
 
                 if ("dd".equals(apsType.getScheduleType())) {
+                    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());
+                        productionScheduleRetVo.setProcesses(productionProcesses);
+                    }
                     apsBlankOrderService.ddApsAfter(productionScheduleRetVo, apsBlankOrders, currentUser, apsType);
                 } else {
                     apsBlankOrderService.apsAfter(productionScheduleRetVo, apsBlankOrders, currentUser, apsType);