退火调度排程优化

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

@@ -489,6 +489,22 @@ public class ApsServiceImpl implements ApsService {
             orderidlist.addAll(orderids);
             ordergrous.put(k,orderidlist);
 
+            for (ProductionProcesses process : v) {
+                List<ProductionProcesses> collect = apsSolution.getProcessesList().stream().filter(vp -> vp.getId().equals(process.getId())).collect(Collectors.toList());
+                if(collect != null && collect.size()>0){
+                    for (ProductionProcesses productionProcesses : collect) {
+                        // 前后道工序设置
+                        if(relPros.containsKey(productionProcesses.getId())){
+                            Map<String, List<ProductionProcesses>> stringListMap = relPros.get(productionProcesses.getId());
+                            productionProcesses.setPreviousProcesses(stringListMap.get("pres"));
+                            productionProcesses.setNextProcesses(stringListMap.get("nexts"));
+                        }
+                        // 递归推理前道工序
+//                            proMaxTimeSet(productionProcesses,productionProcesses,0);
+                    }
+                }
+            }
+
             if(orderids.size()>1){
                 /*List<EquipmentRunTime> equipmentRunTimes = new ArrayList<>();
                 for (ProductionProcesses process : v) {
@@ -537,21 +553,7 @@ public class ApsServiceImpl implements ApsService {
                     equipmentRunTimeMerge(v.get(0).getEquipment(),v.get(0).getApsOverallConfig().getFurnaceInstallations());
                 }*/
 
-                for (ProductionProcesses process : v) {
-                    List<ProductionProcesses> collect = apsSolution.getProcessesList().stream().filter(vp -> vp.getId().equals(process.getId())).collect(Collectors.toList());
-                    if(collect != null && collect.size()>0){
-                        for (ProductionProcesses productionProcesses : collect) {
-                            // 前后道工序设置
-                            if(relPros.containsKey(productionProcesses.getId())){
-                                Map<String, List<ProductionProcesses>> stringListMap = relPros.get(productionProcesses.getId());
-                                productionProcesses.setPreviousProcesses(stringListMap.get("pres"));
-                                productionProcesses.setNextProcesses(stringListMap.get("nexts"));
-                            }
-                            // 递归推理前道工序
-//                            proMaxTimeSet(productionProcesses,productionProcesses,0);
-                        }
-                    }
-                }
+
                 // 合并不同订单退火
                 List<String> hbThIds = v.stream().map(ProductionProcesses::getId).collect(Collectors.toList());
                 List<ProductionProcesses> hbThPros = apsSolution.getProcessesList().stream().filter(vp -> hbThIds.contains(vp.getId())).collect(Collectors.toList());