调度排程优化

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

@@ -228,8 +228,8 @@ public class TaskStartTimeListener implements VariableListener<ApsSolution, Prod
                 if(process.getPreviousProcesses().size()>1){
                     for (ProductionProcesses previousProcess : process.getPreviousProcesses()) {
                         if(previousProcess.getEndTime() == null){
-                            log.error("preProcess:"+preProcess.getId()+" OrderMark:"+preProcess.getOrderMark());
-                            log.error("preProcess-blankid:"+preProcess.getProduceOrder().get(0).getId());
+                            log.error("preProcess:"+previousProcess.getId()+" OrderMark:"+previousProcess.getOrderMark());
+                            log.error("preProcess-blankid:"+previousProcess.getProduceOrder().get(0).getId());
                             log.error("process:"+process.getId()+" OrderMark:"+process.getOrderMark());
                             log.error("process-blankid:"+process.getProduceOrder().get(0).getId());
                         }
@@ -275,6 +275,9 @@ public class TaskStartTimeListener implements VariableListener<ApsSolution, Prod
 
             // 当前工序最小开始时间、结束时间
             LocalDateTime proStartTime = endTime.plusMinutes(lzTimes);
+            if(proStartTime.compareTo(process.getApsOverallConfig().getStartTime())<0){
+                proStartTime = process.getApsOverallConfig().getStartTime();
+            }
             if(process.getProcessType().equals("成退") || process.getProcessType().equals("中退") || process.getProcessType().equals("小卷成退")){
                 proStartTime = proStartTime.minusSeconds(proStartTime.getSecond()) // 减去当前秒数
                         .minusNanos(proStartTime.getNano()) // 减去当前纳秒数

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

@@ -134,7 +134,8 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
 
         List<ProductionProcesses> processesList = null;
         if("dd".equals(productionScheduleVo.getScheduleType().getScheduleType())){
-            processesList = ddsService.thOtherMerge(thList, otherNotThproces);
+//            processesList = ddsService.thOtherMerge(thList, otherNotThproces);
+            processesList = thList;
         }else{
             processesList = apsService.thOtherMerge(thList, otherNotThproces);
         }
@@ -143,7 +144,8 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
         List<ProductionProcesses> otherSerProces = new ArrayList<>();
         List<ProductionProcesses> otherSerProcesMerges = null;
         if("dd".equals(productionScheduleVo.getScheduleType().getScheduleType())){
-            otherSerProcesMerges = ddsService.seriesLzBzMerge(processesList, otherSerProces);
+//            otherSerProcesMerges = ddsService.seriesLzBzMerge(processesList, otherSerProces);
+            otherSerProcesMerges = processesList;
         }else{
             otherSerProcesMerges = apsService.seriesLzBzMerge(processesList, otherSerProces);
         }