调度排程开发

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

@@ -1215,8 +1215,8 @@ public class ApsServiceImpl implements ApsService {
                                 prosids.add(v.getProcessid());
                             });
                             // 查询所有作业详情信息
-//                            List<ApsProcessOperationDo> lastops = (List<ApsProcessOperationDo>) apsProcessOperationService.listByIds(prosids);
-                            List<ApsProcessOperationDo> lastops = baseApsProcessOperationList.stream().filter(item -> prosids.contains(item.getId())).collect(Collectors.toList());
+                            List<ApsProcessOperationDo> lastops = (List<ApsProcessOperationDo>) apsProcessOperationService.listByIds(prosids);
+//                            List<ApsProcessOperationDo> lastops = baseApsProcessOperationList.stream().filter(item -> prosids.contains(item.getId())).collect(Collectors.toList());
                             Map<String, ApsProcessOperationDo> lastopsMap = new HashMap<>();
                             for (ApsProcessOperationDo lastop : lastops) {
                                 lastopsMap.put(lastop.getId(), lastop);
@@ -1265,12 +1265,12 @@ public class ApsServiceImpl implements ApsService {
                             }
 
                             if (hasLast) {
-//                                ApsProcessOperationDo lastop = apsProcessOperationService.getById(lastpro.getProcessid());
-                                ApsProcessOperationDo lastop = baseApsProcessOperationList.stream().filter(item -> item.getId().equals(lastpro.getProcessid())).findFirst().orElse(null);
+                                ApsProcessOperationDo lastop = apsProcessOperationService.getById(lastpro.getProcessid());
+//                                ApsProcessOperationDo lastop = baseApsProcessOperationList.stream().filter(item -> item.getId().equals(lastpro.getProcessid())).findFirst().orElse(null);
                                 // 输出物料
-//                                List<ApsProcessOperationOutMaterDo> outMaterDos = apsProcessOperationOutMaterService.list(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
-//                                        .eq(ApsProcessOperationOutMaterDo::getMainid, lastpro.getProcessid()));
-                                List<ApsProcessOperationOutMaterDo> outMaterDos = baseApsProcessOperationOutMaterList.stream().filter(item -> item.getMainid().equals(lastpro.getProcessid())).collect(Collectors.toList());
+                                List<ApsProcessOperationOutMaterDo> outMaterDos = apsProcessOperationOutMaterService.list(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
+                                        .eq(ApsProcessOperationOutMaterDo::getMainid, lastpro.getProcessid()));
+//                                List<ApsProcessOperationOutMaterDo> outMaterDos = baseApsProcessOperationOutMaterList.stream().filter(item -> item.getMainid().equals(lastpro.getProcessid())).collect(Collectors.toList());
                                 equipment.setLastProcessType(lastop.getProcess());
                                 equipment.setLastProcessEndTime(lastpro.getPlanenddate());
                                 equipment.setOnceprocessmin(lastop.getOnceprocessmin().intValue());
@@ -1294,14 +1294,14 @@ public class ApsServiceImpl implements ApsService {
                             }
                             List<ApsProcessOperationDo> processOperationDos = null;
                             if (processIds.size() > 0) {
-//                                processOperationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
-//                                        .in(ApsProcessOperationDo::getId, processIds));
-                                processOperationDos = baseApsProcessOperationList.stream().filter(item -> processIds.contains(item.getId())).collect(Collectors.toList());
+                                processOperationDos = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
+                                        .in(ApsProcessOperationDo::getId, processIds));
+//                                processOperationDos = baseApsProcessOperationList.stream().filter(item -> processIds.contains(item.getId())).collect(Collectors.toList());
                             }
                             //
-//                            List<ApsProcessOperationOutMaterDo> outMaterDosAll = apsProcessOperationOutMaterService.list(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
-//                                    .in(ApsProcessOperationOutMaterDo::getMainid, processIds));
-                            List<ApsProcessOperationOutMaterDo> outMaterDosAll = baseApsProcessOperationOutMaterList.stream().filter(item -> processIds.contains(item.getMainid())).collect(Collectors.toList());
+                            List<ApsProcessOperationOutMaterDo> outMaterDosAll = apsProcessOperationOutMaterService.list(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
+                                    .in(ApsProcessOperationOutMaterDo::getMainid, processIds));
+//                            List<ApsProcessOperationOutMaterDo> outMaterDosAll = baseApsProcessOperationOutMaterList.stream().filter(item -> processIds.contains(item.getMainid())).collect(Collectors.toList());
 
                             for (ApsProcessOperationProcessEquDo equs : processEqus) {
                                 if (equs.getPlanstartdate() == null || equs.getPlanenddate() == null) {
@@ -1319,9 +1319,9 @@ public class ApsServiceImpl implements ApsService {
                                     if (pos != null && pos.size() > 0) {
                                         ApsProcessOperationDo processesDo = pos.get(0);
                                         // 输出物料
-//                                        List<ApsProcessOperationOutMaterDo> outMaterDos = apsProcessOperationOutMaterService.list(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
-//                                                .eq(ApsProcessOperationOutMaterDo::getMainid, processesDo.getId()));
-                                        List<ApsProcessOperationOutMaterDo> outMaterDos = outMaterDosAll.stream().filter(v -> v.getMainid().equals(processesDo.getId())).collect(Collectors.toList());
+                                        List<ApsProcessOperationOutMaterDo> outMaterDos = apsProcessOperationOutMaterService.list(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
+                                                .eq(ApsProcessOperationOutMaterDo::getMainid, processesDo.getId()));
+//                                        List<ApsProcessOperationOutMaterDo> outMaterDos = outMaterDosAll.stream().filter(v -> v.getMainid().equals(processesDo.getId())).collect(Collectors.toList());
                                         if (outMaterDos == null || outMaterDos.size() == 0) {
                                             throw new CustomException("坯料计划ID:" + processesDo.getBlankid() + ",作业：" + processesDo.getProcess() + ",作业名" + processesDo.getProcessname() + " 没有相关输出物料信息!");
                                         }