aps-排程结束后，查询修改时间在排程开始-排程结束之间的待开工的明细，判断其冲突

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

@@ -820,15 +820,19 @@ public class ApsServiceImpl implements ApsService {
             List<ApsProcessOperationProcessEquCheckVo> list = apsProcessOperationProcessEquDao.getNeedCheckEquList(startTime, endTime, CXCommonUtils.getCurrentUserFactoryId(currentUser));
             if (!list.isEmpty()) {
                 for (ApsProcessOperationProcessEquCheckVo equDo : list) {
-                    apsProcessOperationProcessEquService.checkProcessingTimeConflict(equDo,
-                            null, null, null, equDo.getProcessWay(), new LinkedList<>());
-                    ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = apsProcessOperationProcessEquService.getById(equDo.getId());
-                    // 判断是否存在设备不可用
-                    apsProcessOperationProcessEquService.inspectionEquipmentIsAvailable(apsProcessOperationProcessEquDo,
-                            apsProcessOperationProcessEquDo.getProcessdeviceid(),
-                            apsProcessOperationProcessEquDo.getPlanstartdate(),
-                            apsProcessOperationProcessEquDo.getPlanenddate(),
-                            new LinkedList<>());
+                    try {
+                        apsProcessOperationProcessEquService.checkProcessingTimeConflict(equDo,
+                                null, null, null, equDo.getProcessWay(), new LinkedList<>());
+                        ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = apsProcessOperationProcessEquService.getById(equDo.getId());
+                        // 判断是否存在设备不可用
+                        apsProcessOperationProcessEquService.inspectionEquipmentIsAvailable(apsProcessOperationProcessEquDo,
+                                apsProcessOperationProcessEquDo.getProcessdeviceid(),
+                                apsProcessOperationProcessEquDo.getPlanstartdate(),
+                                apsProcessOperationProcessEquDo.getPlanenddate(),
+                                new LinkedList<>());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsBlankOrderController.java

@@ -247,6 +247,7 @@ public class ApsBlankOrderController {
      */
     @GetMapping("/chongPaiByEndDate")
     public R chongPaiByEndDate(@RequestParam("chongpaiEndDate") String chongpaiEndDate){
+        apsBlankOrderService.sortLenZha(DateUtil.parseDate(chongpaiEndDate));
         apsBlankOrderService.sortTuiHuo(DateUtil.parseDate(chongpaiEndDate));
         return R.ok();
     }