预排程退火合并bug修复

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

@@ -1469,11 +1469,13 @@ public class ApsConstraintProvider implements ConstraintProvider {
         List<ApsFurnaceInstallationDo> furnaceInstallations = processes.get(0).getApsOverallConfig().getFurnaceInstallations();
         List<ApsMergeFurnaceDo> mergeFurnaces = processes.get(0).getApsOverallConfig().getMergeFurnaces();
 
+
+        if(processes.size()>1 && processes.get(0).getDelay() == 780 && processes.get(1).getDelay() == 780){
+            int a = 2;
+        }
         //  检查合并工序是否超过容量
         for (Map.Entry<String,List<ProductionProcesses>> entry: ppMap.entrySet()) {
-            if(equipment.getId().equals("7b2ffd8c722d4d5a85b55fc32de99366")){
-                int a = 2;
-            }
+
             List<ProductionProcesses> v = entry.getValue();
             Set<String> groupnames = new HashSet<>();
             BigDecimal totalWeight = new BigDecimal(0);
@@ -3452,13 +3454,13 @@ public class ApsConstraintProvider implements ConstraintProvider {
                 if(prePro.getTaskType().equals("maintenance") || nextPro.getTaskType().equals("maintenance")){
                     b = b+100;
                 }else{
-                    List<ProduceOrder> produceOrder1 = prePro.getProduceOrder();
+                    /*List<ProduceOrder> produceOrder1 = prePro.getProduceOrder();
                     List<ProduceOrder> produceOrder2 = nextPro.getProduceOrder();
                     if(produceOrder1 != null && produceOrder1.size()>0 && produceOrder2 != null && produceOrder2.size()>0
                             && produceOrder1.get(0).getId().equals(produceOrder2.get(0).getId())
                             && !prePro.getUniqueBsProcessesId().equals(nextPro.getUniqueBsProcessesId())){
                         b = b+100;
-                    }else{
+                    }else{*/
                         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                         String startTimeKey = prePro.getStartTime().format(formatter);
                         if(!ppMap.containsKey(startTimeKey)){
@@ -3474,7 +3476,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                         if(nextHas == null || nextHas.size() == 0){
                             processesList.add(nextPro);
                         }
-                    }
+//                    }
                 }
             }else{
                 if(prePro.getEndTime().compareTo(nextPro.getStartTime()) > 0){