排程优化-退火合并优化

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

@@ -2943,10 +2943,9 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     Equipment equipmentpre = processes.getPreviousProcesses().get(0).getEquipment();
                     if(!equipmentpre.getId().equals(equipmentthis.getId())){
                         a = a + 10000;
-                    }else{
-                        if(!equipmentpre.getWorkshopid().equals(equipmentthis.getWorkshopid())){
-                            a = a + 10000;
-                        }
+                    }
+                    if(!equipmentpre.getWorkshopid().equals(equipmentthis.getWorkshopid())){
+                        a = a + 10000;
                     }
                     return a;
                 })