调度排程优化

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

@@ -627,15 +627,20 @@ public class ApsConstraintProvider implements ConstraintProvider {
                 })
                 .groupBy(ProductionProcesses::getEquipmentId, ConstraintCollectors.toList())
                 .filter((equipmentId,processes) -> {
-                    if(processes != null && processes.size()>0){
-                        for (ProductionProcesses process : processes) {
-                            if(process.getConflictRoptions().containsKey("soft-seriesZzLb")){
-                                process.getConflictRoptions().remove("soft-seriesZzLb");
+                    if(!"dd".equals(processes.get(0).getApsOverallConfig().getScheduleType().getScheduleType())
+                            && ("冷轧".equals(processes.get(0).getProcessType()) || "箔轧".equals(processes.get(0).getProcessType()))){
+                        return false;
+                    }else{
+                        if(processes != null && processes.size()>0){
+                            for (ProductionProcesses process : processes) {
+                                if(process.getConflictRoptions().containsKey("soft-seriesZzLb")){
+                                    process.getConflictRoptions().remove("soft-seriesZzLb");
+                                }
                             }
+                            return true;
                         }
-                        return true;
+                        return false;
                     }
-                    return false;
                 })
                 .penalize(HardMediumSoftScore.ONE_MEDIUM,(equipmentId,processes)->{
                     int counNum = seriesLzHgCount(processes);

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ApsServiceImpl.java

@@ -696,6 +696,9 @@ public class ApsServiceImpl implements ApsService {
                             nextpro.setPreviousProcesses(nextprepros);
 
                             // 设置合并退火作业下一道工序
+                            if(thps.get(0).getNextProcessesIds() == null){
+                                thps.get(0).setNextProcessesIds(new ArrayList<>());
+                            }
                             thps.get(0).getNextProcessesIds().add(nextProcessesId);
                             List<ProductionProcesses> thnexts = new ArrayList<>();
                             for (String pid : thps.get(0).getNextProcessesIds()) {