按照首道工序开始时间倒序排序以及最大等待时间小于1天强制合并成一个作业

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/DdApsServiceImpl.java

@@ -84,7 +84,7 @@ public class DdApsServiceImpl implements DdApsService {
             for (String bsid:orderProcess.keySet()){
                 List<ProductionProcesses> rootProces = orderProcess.get(bsid);
                 if(rootProces != null && rootProces.size()>0){
-                    if((rootProces.get(0).getMaxWaitTime() != null && rootProces.get(0).getMaxWaitTime()>0)
+                    if((rootProces.get(0).getMaxWaitTime() != null && rootProces.get(0).getMaxWaitTime()>0 && rootProces.get(0).getMaxWaitTime()<1440)
                             || "成退,中退,小卷成退".contains(rootProces.get(0).getProcessType())){
                         lzmergeprocesses.addAll(rootProces);
                     }else{

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

@@ -1717,14 +1717,14 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                 }
             }*/
             List<ProductionProcesses> noTimes = processesList1.stream().filter(v -> v.getRooprocess() == null || v.getRooprocess().getStartTime() == null).collect(Collectors.toList());
-            if(noTimes == null && noTimes.size() == 0){
+            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 && processesList1.size()>noTimes1.size()){
                     int n = 1;
                 }
                 // 按照铸轧开始时间排序
                 Collections.sort(processesList1,(p1,p2)->{
-                    return p1.getRooprocess().getStartTime().compareTo(p2.getRooprocess().getStartTime());
+                    return p2.getRooprocess().getStartTime().compareTo(p1.getRooprocess().getStartTime());
                 });
                 for (int i = 0;i<processesList1.size();i++) {
                     ProductionProcesses productionProcesses = processesList1.get(i);