调度排程开发

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

@@ -1091,67 +1091,67 @@ public class ApsServiceImpl implements ApsService {
                         DateTime nextStartDate = DateUtil.offsetDay(apsPlanStartDate, 1);
                         if (blankids != null && blankids.size() > 0) {
                             if ("dd".equals(apsType.getScheduleType())) {
-//                                processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-//                                        .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
-//                                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
-//                                        .ge(ApsProcessOperationProcessEquDo::getPlanenddate, apsPlanStartDate)
-//                                        .le(ApsProcessOperationProcessEquDo::getPlanstartdate, nextStartDate)
-//                                        .orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate)
-//                                );
-                                Date finalApsPlanStartDate = apsPlanStartDate;
+                                processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                                        .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
+                                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
+                                        .ge(ApsProcessOperationProcessEquDo::getPlanenddate, apsPlanStartDate)
+                                        .le(ApsProcessOperationProcessEquDo::getPlanstartdate, nextStartDate)
+                                        .orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate)
+                                );
+                                /*Date finalApsPlanStartDate = apsPlanStartDate;
                                 processEqus = baseApsProcessOperationProcessEquList.stream().filter(item ->
                                                 equIds.equals(item.getProcessdeviceid())
                                                         && "y".equals(item.getLockmark())
                                                         && item.getPlanenddate().compareTo(finalApsPlanStartDate) >= 0
                                                         && item.getPlanstartdate().compareTo(nextStartDate) <= 0)
                                         .sorted(Comparator.comparing(ApsProcessOperationProcessEquDo::getPlanstartdate))
-                                        .collect(Collectors.toList());
+                                        .collect(Collectors.toList());*/
                             } else {
-//                                processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-//                                        .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
-//                                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
-//                                        .ge(ApsProcessOperationProcessEquDo::getPlanenddate, apsPlanStartDate)
-//                                        .orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate)
-//                                );
-                                Date finalApsPlanStartDate = apsPlanStartDate;
+                                processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                                        .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
+                                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
+                                        .ge(ApsProcessOperationProcessEquDo::getPlanenddate, apsPlanStartDate)
+                                        .orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate)
+                                );
+                                /*Date finalApsPlanStartDate = apsPlanStartDate;
                                 processEqus = baseApsProcessOperationProcessEquList.stream().filter(item ->
                                                 equIds.equals(item.getProcessdeviceid())
                                                         && "y".equals(item.getLockmark())
                                                         && item.getPlanenddate().compareTo(finalApsPlanStartDate) >= 0)
                                         .sorted(Comparator.comparing(ApsProcessOperationProcessEquDo::getPlanstartdate))
-                                        .collect(Collectors.toList());
+                                        .collect(Collectors.toList());*/
                             }
                         } else if (opId != null && opId.size() > 0) {
                             if ("dd".equals(apsType.getScheduleType())) {
-//                                processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-//                                        .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
-//                                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
-//                                        .ge(ApsProcessOperationProcessEquDo::getPlanenddate, apsPlanStartDate)
-//                                        .le(ApsProcessOperationProcessEquDo::getPlanstartdate, nextStartDate)
-//                                        .orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate)
-//                                );
-                                Date finalApsPlanStartDate = apsPlanStartDate;
+                                processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                                        .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
+                                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
+                                        .ge(ApsProcessOperationProcessEquDo::getPlanenddate, apsPlanStartDate)
+                                        .le(ApsProcessOperationProcessEquDo::getPlanstartdate, nextStartDate)
+                                        .orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate)
+                                );
+                                /*Date finalApsPlanStartDate = apsPlanStartDate;
                                 processEqus = baseApsProcessOperationProcessEquList.stream().filter(item ->
                                                 equIds.equals(item.getProcessdeviceid())
                                                         && "y".equals(item.getLockmark())
                                                         && item.getPlanenddate().compareTo(finalApsPlanStartDate) >= 0
                                                         && item.getPlanstartdate().compareTo(nextStartDate) <= 0)
                                         .sorted(Comparator.comparing(ApsProcessOperationProcessEquDo::getPlanstartdate))
-                                        .collect(Collectors.toList());
+                                        .collect(Collectors.toList());*/
                             } else {
-//                                processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-//                                        .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
-//                                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
-//                                        .ge(ApsProcessOperationProcessEquDo::getPlanenddate, apsPlanStartDate)
-//                                        .orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate)
-//                                );
-                                Date finalApsPlanStartDate = apsPlanStartDate;
+                                processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                                        .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
+                                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
+                                        .ge(ApsProcessOperationProcessEquDo::getPlanenddate, apsPlanStartDate)
+                                        .orderByAsc(ApsProcessOperationProcessEquDo::getPlanstartdate)
+                                );
+                                /*Date finalApsPlanStartDate = apsPlanStartDate;
                                 processEqus = baseApsProcessOperationProcessEquList.stream().filter(item ->
                                                 equIds.equals(item.getProcessdeviceid())
                                                         && "y".equals(item.getLockmark())
                                                         && item.getPlanenddate().compareTo(finalApsPlanStartDate) >= 0)
                                         .sorted(Comparator.comparing(ApsProcessOperationProcessEquDo::getPlanstartdate))
-                                        .collect(Collectors.toList());
+                                        .collect(Collectors.toList());*/
                             }
                         }
                         // 过滤设备为空的明细
@@ -1162,37 +1162,37 @@ public class ApsServiceImpl implements ApsService {
                         // 查询当前设备最后一个生产任务、连续生产需要考虑使用
                         List<ApsProcessOperationProcessEquDo> lastpros = null;
                         if (blankids != null && blankids.size() > 0) {
-//                            lastpros = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-//                                            .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
-//                                            .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
-////                                    .notIn(ApsProcessOperationProcessEquDo::getBlankid, blankids)
-//                                            .lt(ApsProcessOperationProcessEquDo::getPlanstartdate, apsPlanStartDate)
-//                                            .orderByDesc(ApsProcessOperationProcessEquDo::getPlanstartdate).last(" limit 100")
-//                            );
-                            Date finalApsPlanStartDate = apsPlanStartDate;
+                            lastpros = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                                            .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
+                                            .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
+//                                    .notIn(ApsProcessOperationProcessEquDo::getBlankid, blankids)
+                                            .lt(ApsProcessOperationProcessEquDo::getPlanstartdate, apsPlanStartDate)
+                                            .orderByDesc(ApsProcessOperationProcessEquDo::getPlanstartdate).last(" limit 100")
+                            );
+                            /*Date finalApsPlanStartDate = apsPlanStartDate;
                             lastpros = baseApsProcessOperationProcessEquList.stream().filter(item ->
                                             item.getProcessdeviceid().equals(equIds)
                                                     && "y".equals(item.getLockmark())
                                                     && item.getPlanstartdate().compareTo(finalApsPlanStartDate) < 0)
                                     .sorted((o1, o2) -> o2.getPlanstartdate().compareTo(o1.getPlanstartdate()))
                                     .limit(100)
-                                    .collect(Collectors.toList());
+                                    .collect(Collectors.toList());*/
                         } else if (opId != null && opId.size() > 0) {
-//                            lastpros = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-//                                            .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
-//                                            .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
-////                                    .notIn(ApsProcessOperationProcessEquDo::getProcessid, opId)
-//                                            .lt(ApsProcessOperationProcessEquDo::getPlanstartdate, apsPlanStartDate)
-//                                            .orderByDesc(ApsProcessOperationProcessEquDo::getPlanstartdate).last(" limit 100")
-//                            );
-                            Date finalApsPlanStartDate = apsPlanStartDate;
+                            lastpros = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                                            .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
+                                            .eq(ApsProcessOperationProcessEquDo::getLockmark, "y")
+//                                    .notIn(ApsProcessOperationProcessEquDo::getProcessid, opId)
+                                            .lt(ApsProcessOperationProcessEquDo::getPlanstartdate, apsPlanStartDate)
+                                            .orderByDesc(ApsProcessOperationProcessEquDo::getPlanstartdate).last(" limit 100")
+                            );
+                            /*Date finalApsPlanStartDate = apsPlanStartDate;
                             lastpros = baseApsProcessOperationProcessEquList.stream().filter(item ->
                                             item.getProcessdeviceid().equals(equIds)
                                                     && "y".equals(item.getLockmark())
                                                     && item.getPlanstartdate().compareTo(finalApsPlanStartDate) < 0)
                                     .sorted((o1, o2) -> o2.getPlanstartdate().compareTo(o1.getPlanstartdate()))
                                     .limit(100)
-                                    .collect(Collectors.toList());
+                                    .collect(Collectors.toList());*/
                         }
                         // 过滤设备为空的明细
                         if (lastpros != null && lastpros.size() > 0) {