约束优化

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

@@ -25,9 +25,8 @@ public class ApsConstraintProvider implements ConstraintProvider {
     @Override
     public Constraint[] defineConstraints(ConstraintFactory constraintFactory) {
         return new Constraint[]{
-                eqTypeSame(constraintFactory),
-                noPreGbAfterNow(constraintFactory),
-//                hasPreGbAfterNow(constraintFactory),
+//                eqTypeSame(constraintFactory),
+//                noPreGbAfterNow(constraintFactory),
                 hasOnePreGbAfterNow(constraintFactory),
                 eqTimeCross(constraintFactory),
                 deliveryDate(constraintFactory),
@@ -36,9 +35,6 @@ public class ApsConstraintProvider implements ConstraintProvider {
                 lzTimeLessMaxWait(constraintFactory),
                 equipmentRunTime(constraintFactory),
                 balancedEqUse(constraintFactory),
-//                mergeProcess(constraintFactory)
-
-//                mergeSame(constraintFactory),
         };
     }
 
@@ -854,6 +850,9 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     Equipment equipment = null;
                     if(processes != null && processes.size()>0){
                         equipment = processes.get(0).getEquipment();
+                        if(!processes.get(0).getProcessType().equals("铸轧") && !processes.get(0).getProcessType().equals("冷轧")){
+                            return false;
+                        }
                     }
                     List<ProductionProcesses> hasStartTimeProcess = processes.stream().filter(v -> v.getStartTime() != null).collect(Collectors.toList());
                     // 设备占用时间参与连续生产排程