排程优化

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

@@ -1828,7 +1828,10 @@ public class ApsConstraintProvider implements ConstraintProvider {
                             b = b+15;
                         }else if ("冷轧".equals(hasStartTimeProcess.get(i).getProcessType())) {
                             b = b+10;
+                        }else if ("箔轧".equals(hasStartTimeProcess.get(i).getProcessType())) {
+                            b = b+5;
                         }
+
                     }
                 }else{
                     if(hasStartTimeProcess.get(i).getId() == null && hasStartTimeProcess.get(i+1).getId() == null){
@@ -1977,6 +1980,8 @@ public class ApsConstraintProvider implements ConstraintProvider {
                                         }else{
                                             conflictRoptions2.put("soft-seriesProduceLz","和前一道工序违反换辊的连续约束");
                                         }
+                                    } else if (volumeWidth.compareTo(volumeWidth1)<0) {
+                                        b = b+1;
                                     }
                                 }catch (Exception e){
                                     e.printStackTrace();
@@ -2292,8 +2297,11 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     }
                 })
                 .penalize(HardMediumSoftScore.ONE_MEDIUM,(equipmentId,processes)->{
-                    if("ea69835012de4f2cb9c52496df8be111".equals(equipmentId) && processes.get(0).getDelay() == 2){
+                    if("0001be252874536843730b100163".equals(equipmentId)){
                         int a = 1;
+                        if(processes.get(0).getDelay() == 20){
+                            int b = 1;
+                        }
                     }
                     // 已占用的
                     List<EquipmentRunTime> equipmentRunTimes = processes.get(0).getEquipment().getEquipmentRunTimes();