调度排程优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/listener/TaskStartTimeListener.java

@@ -549,7 +549,7 @@ public class TaskStartTimeListener implements VariableListener<ApsSolution, Prod
 
             toUpdateStartTime = proStartTime;
         }
-        if(process.getId().equals("ffcf3324e3ad4c0abd48831b8d4f8499") && process.getEquipmentId().equals("0001be252874536843730b100191") && process.getDelay() == 0){
+        if(process.getId().equals("705bff4021594d62acee248cf51b4ab0") && process.getEquipmentId().equals("0001be252874536843730b100153") && process.getDelay() == 0){
             int a = 0;
         }
         if(process.getId().equals("753e5d7bb985465b92f40e24abc6b91c") || process.getId().equals("24a272fad1dd4fe2ac475dac44803bfe") || process.getId().equals("77594aa518a945c6be28c1bbd38d9cd4")){

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

@@ -593,7 +593,11 @@ public class ApsConstraintProvider implements ConstraintProvider {
                 .groupBy(ProductionProcesses::getEquipmentId, ConstraintCollectors.toList())
                 .filter((equipmentId,processes) -> {
                     if(processes != null && processes.size()>0){
-                        if(!processes.get(0).getProcessType().equals("铸轧") && !processes.get(0).getProcessType().equals("冷轧")){
+                        if(!processes.get(0).getProcessType().equals("铸轧") && !processes.get(0).getProcessType().equals("冷轧") && !processes.get(0).getProcessType().equals("箔轧")){
+                            return false;
+                        }
+                        if(!"dd".equals(processes.get(0).getApsOverallConfig().getScheduleType().getScheduleType())
+                                && ("冷轧".equals(processes.get(0).getProcessType()) || "箔轧".equals(processes.get(0).getProcessType()))){
                             return false;
                         }
                         for (ProductionProcesses process : processes) {

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

@@ -50,16 +50,16 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
      */
     @Override
     public ProductionScheduleRetVo productionSchedule(ProductionScheduleVo productionScheduleVo) throws Exception{
-//        List<String> blankids = new ArrayList<>();
-//        blankids.add("2501b03eba134b3cac2a8caeab08394c");
+        List<String> blankids = new ArrayList<>();
+        blankids.add("46cdf4f75a694cfaa74fd38096e3438b");
 //        blankids.add("2f3f48a1c3c74c0481ba06df521fe0d7");
 //        blankids.add("75736c469b1a42568af980260c0689a6");
 //        blankids.add("acf4460f9488459780c0dc7d8038f1f9");
 //        blankids.add("efeb1f8d01b04cdb9921c0d1711bb967");
-        /*List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
-                        blankids.contains(v.getProduceOrder().get(0).getId())
-                ).collect(Collectors.toList());
-        productionScheduleVo.setProcesses(collect);*/
+//        List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
+//                        blankids.contains(v.getProduceOrder().get(0).getId())
+//                ).collect(Collectors.toList());
+//        productionScheduleVo.setProcesses(collect);
 
         log.info("*************** 排程开始："+productionScheduleVo.getProductionScheduleId()+" *******************");
         if(productionScheduleVo.getScheduleType().getScheduleType() == null){