排程优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/score/ApsConstraintProvider.java

@@ -2040,9 +2040,6 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     // 退火合并工序
                     Map<String,List<ProductionProcesses>> ppMap = new HashMap<>();
                     if(ths.size()>0){
-                        if(ths.size() == 2){
-                            int a = 0;
-                        }
                         for(int i=0;i<ths.size();i++){
                             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                             String startTimeKey = ths.get(i).getStartTime().format(formatter)+ths.get(i).getEquipmentId();
@@ -2055,16 +2052,11 @@ public class ApsConstraintProvider implements ConstraintProvider {
                             }
                         }
                     }
-                    if(processes.get(0).getEquipment().getId().equals("7b2ffd8c722d4d5a85b55fc32de99366")){
-                        int a = 1;
-                        /*if(processes.get(0).getStartTime().){
 
-                        }*/
-                    }
                     List<String> hasMergeOldKeys = new ArrayList<>();
                     ppMap.forEach((k,v)->{
-                        if(v.size() == 1){
-                            if(v.get(0).getProducePcNum() == 1){
+//                        if(v.size() == 1){
+//                            if(v.get(0).getProducePcNum() == 1){
                                 if(equipmentRunTimes != null && equipmentRunTimes.size()>0){
                                     for (EquipmentRunTime equipmentRunTime : equipmentRunTimes) {
                                         if(equipmentRunTime.getStartRunTime().compareTo(v.get(0).getStartTime()) == 0){
@@ -2073,8 +2065,8 @@ public class ApsConstraintProvider implements ConstraintProvider {
                                         }
                                     }
                                 }
-                            }
-                        }
+//                            }
+//                        }
                     });
                     if(hasMergeOldKeys != null && hasMergeOldKeys.size()>0){
                         for (String hasMergeOldKey : hasMergeOldKeys) {

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

@@ -125,6 +125,15 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
         List<ProductionProcesses> otherNotZzFirstProces = new ArrayList<>();
         // 铸轧提前排序
         apsService.zzProcessAps(productionScheduleVo,apsSolution,otherNotZzFirstProces);
+        // 取消第一道工序非铸轧提前排程的锁定状态
+        if(otherNotZzFirstProces != null && otherNotZzFirstProces.size()>0){
+            for (ProductionProcesses otherSerProcesMerge : apsSolution.getProcessesList()) {
+                List<ProductionProcesses> list1 = otherNotZzFirstProces.stream().filter(v -> v.getId().equals(otherSerProcesMerge.getId())).collect(Collectors.toList());
+                if(list1 != null && list1.size()>0){
+                    otherSerProcesMerge.setIfLock(false);
+                }
+            }
+        }
         // 全量排程数据备份
         List<ProductionProcesses> allToApsProcess = new ArrayList<>();
         allToApsProcess.addAll(apsSolution.getProcessesList());
@@ -149,16 +158,14 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
         // 取消第一道工序非铸轧提前排程的锁定状态
         if(otherNotZzFirstProces != null && otherNotZzFirstProces.size()>0){
             for (ProductionProcesses otherSerProcesMerge : apsSolution.getProcessesList()) {
-                if(otherSerProcesMerge.getIfLock()){
-                    List<ProductionProcesses> list1 = otherNotZzFirstProces.stream().filter(v -> v.getId().equals(otherSerProcesMerge.getId())).collect(Collectors.toList());
-                    if(list1 != null && list1.size()>0){
-                        otherSerProcesMerge.setIfLock(false);
-                        otherSerProcesMerge.setStartTime(null);
-                        otherSerProcesMerge.setEndTime(null);
-                        otherSerProcesMerge.setEquipment(null);
-                        otherSerProcesMerge.setEquipmentId(null);
-                        otherSerProcesMerge.setDelay(null);
-                    }
+                List<ProductionProcesses> list1 = otherNotZzFirstProces.stream().filter(v -> v.getId().equals(otherSerProcesMerge.getId())).collect(Collectors.toList());
+                if(list1 != null && list1.size()>0){
+                    otherSerProcesMerge.setIfLock(false);
+                    otherSerProcesMerge.setStartTime(null);
+                    otherSerProcesMerge.setEndTime(null);
+                    otherSerProcesMerge.setEquipment(null);
+                    otherSerProcesMerge.setEquipmentId(null);
+                    otherSerProcesMerge.setDelay(null);
                 }
             }
         }