|
@@ -1720,6 +1720,9 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 退火被合并工序处理
|
|
|
|
+ solvedBalance.getProcessesList().addAll(otherThproces);
|
|
|
|
+
|
|
for (ProductionProcessesTa productionProcesses : solvedBalance.getProcessesList()) {
|
|
for (ProductionProcessesTa productionProcesses : solvedBalance.getProcessesList()) {
|
|
productionProcesses.setPreviousProcesses(null);
|
|
productionProcesses.setPreviousProcesses(null);
|
|
productionProcesses.setRooprocess(null);
|
|
productionProcesses.setRooprocess(null);
|