소스 검색

排程优化

fangpy 9 달 전
부모
커밋
2f8068d5d5
1개의 변경된 파일20개의 추가작업 그리고 0개의 파일을 삭제
  1. 20 0
      rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ApsServiceImpl.java

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

@@ -137,6 +137,26 @@ public class ApsServiceImpl implements ApsService {
                 for (ProductionProcesses productionProcesses : apsSolution.getProcessesList()) {
                     allProMap.put(productionProcesses.getId(),productionProcesses);
                 }
+                for (ProductionProcesses productionProcesses : apsSolution.getProcessesList()) {
+                    if(productionProcesses.getPreviousProcesses() == null){
+                        if(productionProcesses.getPreviousProcessesIds() != null && productionProcesses.getPreviousProcessesIds().size()>0){
+                            List<ProductionProcesses> previousProcesses = new ArrayList<>();
+                            for (String previousProcessesId : productionProcesses.getPreviousProcessesIds()) {
+                                previousProcesses.add(allProMap.get(previousProcessesId));
+                            }
+                            productionProcesses.setPreviousProcesses(previousProcesses);
+                        }
+                    }
+                    if(productionProcesses.getNextProcesses() == null){
+                        if(productionProcesses.getNextProcessesIds() != null && productionProcesses.getNextProcessesIds().size()>0){
+                            List<ProductionProcesses> nextProcesses = new ArrayList<>();
+                            for (String processesId : productionProcesses.getNextProcessesIds()) {
+                                nextProcesses.add(allProMap.get(processesId));
+                            }
+                            productionProcesses.setNextProcesses(nextProcesses);
+                        }
+                    }
+                }
                 // 提前合并退火作业
                 List<ProductionProcesses> otherThproces = new ArrayList<>();
                 starttimeProcess.forEach((k,v)->{