退火排程优化

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

@@ -1467,6 +1467,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
             if(v.size()>1){
                 int a = 1;
             }
+            Set<String> processTypeSet = new HashSet<>();
             boolean mergeRule = true;
             for (ProductionProcesses productionProcesses : v) {
                 if(productionProcesses.getVolumeMetalstate() == null){
@@ -1503,8 +1504,10 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     groupname = "group-self-" + productionProcesses.getVolumeMetal() + productionProcesses.getVolumeMetalstate() + productionProcesses.getProducttype() + productionProcesses.getVolumeWidth() + productionProcesses.getVolumeThickness();
                 }
                 groupnames.add(groupname);
+
+                processTypeSet.add(productionProcesses.getProcessType());
             }
-            if(totalWeight.compareTo(equipmentBearing)>0){
+            if(totalWeight.compareTo(equipmentBearing)>0 || processTypeSet.size()>1){
                 b++;
                 mergeRule = false;
             }