小卷退火调度优化

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

@@ -1426,13 +1426,13 @@ public class ApsConstraintProvider implements ConstraintProvider {
                 }else{
                     List<ProduceOrder> produceOrder1 = prePro.getProduceOrder();
                     List<ProduceOrder> produceOrder2 = nextPro.getProduceOrder();
-                    if(produceOrder1 != null && produceOrder1.size()>0 && produceOrder2 != null && produceOrder2.size()>0
+                    /*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())){
                         conflictRoptions1.put("hard-eqTimeCrossMinTuihuo","同一坯料计划不同工序退火不能排一起");
                         conflictRoptions2.put("hard-eqTimeCrossMinTuihuo","同一坯料计划不同工序退火不能排一起");
                         b++;
-                    }else{
+                    }else{*/
                         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                         String startTimeKey = prePro.getStartTime().format(formatter);
                         if(!ppMap.containsKey(startTimeKey)){
@@ -1448,7 +1448,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                         if(nextHas == null || nextHas.size() == 0){
                             processesList.add(nextPro);
                         }
-                    }
+//                    }
                 }
             }else{
                 if(prePro.getEndTime().compareTo(nextPro.getStartTime()) > 0){