Bläddra i källkod

调度排程优化

fangpy 5 månader sedan
förälder
incheckning
09382b660a

+ 6 - 2
rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ProductionScheduleServiceImpl.java

@@ -1651,8 +1651,12 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                     productionProcesses.setOrderMark(sortMap.get("sortInt"));
                 }
             }*/
-
-            if(processesList1.get(0).getRooprocess() != null && processesList1.get(0).getRooprocess().getStartTime() != null){
+            List<ProductionProcesses> noTimes = processesList1.stream().filter(v -> v.getRooprocess() == null || v.getRooprocess().getStartTime() == null).collect(Collectors.toList());
+            if(noTimes == null && noTimes.size() == 0){
+                List<ProductionProcesses> noTimes1 = processesList1.stream().filter(v -> v.getRooprocess() == null || v.getRooprocess().getStartTime() == null).collect(Collectors.toList());
+                if(noTimes1 != null && noTimes1.size()>0){
+                    int n = 1;
+                }
                 // 按照铸轧开始时间排序
                 Collections.sort(processesList1,(p1,p2)->{
                     return p1.getRooprocess().getStartTime().compareTo(p2.getRooprocess().getStartTime());