|
@@ -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)->{
|