排程算法优化

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

@@ -1255,7 +1255,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     if(serspre.length == 5 && sersafter.length == 5){
                         // 合金不同或者产品类型不同则需要换辊和立板
                         if(!serspre[0].equals(sersafter[0]) || !serspre[1].equals(sersafter[1])){
-                            b = b+4;
+                            b = b+15;
                             conflictRoptions1.put("soft-seriesProduceZz","和后一道工序违反换辊和立板的连续约束");
                             conflictRoptions2.put("soft-seriesProduceZz","和前一道工序违反换辊和立板的连续约束");
                         }else{
@@ -1268,11 +1268,11 @@ public class ApsConstraintProvider implements ConstraintProvider {
                                 BigDecimal i1 = new BigDecimal(s1);
                                 BigDecimal i2 = new BigDecimal(s2);
                                 if(i1.compareTo(i2)<0){
-                                    b = b+4;
+                                    b = b+15;
                                     conflictRoptions1.put("soft-seriesProduceZz","和后一道工序违反换辊和立板的连续约束");
                                     conflictRoptions2.put("soft-seriesProduceZz","和前一道工序违反换辊和立板的连续约束");
                                 }else if(i1.compareTo(i2)>0){
-                                    b = b+3;
+                                    b = b+8;
                                     conflictRoptions1.put("soft-seriesProduceZz","和后一道工序违反立板的连续约束");
                                     conflictRoptions2.put("soft-seriesProduceZz","和前一道工序违反立板的连续约束");
                                 }