新模型探索

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

@@ -1802,6 +1802,10 @@ public class ApsConstraintListProvider implements ConstraintProvider {
                     if(equipment.getTasks() != null && equipment.getTasks().size()>0){
                         String processType = equipment.getTasks().get(0).getProcessType();
                         if(processType.equals("冷轧") || processType.equals("箔轧")){
+                            for (ProductionProcesses process : equipment.getTasks()) {
+                                process.getConflictRoptions().remove("soft-seriesProduceZz");
+                                process.getConflictRoptions().remove("soft-seriesProduceLz");
+                            }
                             return true;
                         }else{
                             return false;