|
@@ -902,12 +902,12 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
|
|
productionProcesses.getApsOverallConfig().setFurnaceInstallations(null);
|
|
productionProcesses.getApsOverallConfig().setFurnaceInstallations(null);
|
|
productionProcesses.getApsOverallConfig().setMergeFurnaces(null);
|
|
productionProcesses.getApsOverallConfig().setMergeFurnaces(null);
|
|
}
|
|
}
|
|
- if(productionProcesses.getOldNextProcessesIds() != null){
|
|
|
|
|
|
+// if(productionProcesses.getOldNextProcessesIds() != null){
|
|
productionProcesses.setNextProcessesIds(productionProcesses.getOldNextProcessesIds());
|
|
productionProcesses.setNextProcessesIds(productionProcesses.getOldNextProcessesIds());
|
|
- }
|
|
|
|
- if(productionProcesses.getOldPreviousProcessesIds() != null){
|
|
|
|
|
|
+// }
|
|
|
|
+// if(productionProcesses.getOldPreviousProcessesIds() != null){
|
|
productionProcesses.setPreviousProcessesIds(productionProcesses.getOldPreviousProcessesIds());
|
|
productionProcesses.setPreviousProcessesIds(productionProcesses.getOldPreviousProcessesIds());
|
|
- }
|
|
|
|
|
|
+// }
|
|
// 冲突约束补充处理
|
|
// 冲突约束补充处理
|
|
if(productionProcesses.getConflictRoptions() != null && productionProcesses.getConflictRoptions().size()>0){
|
|
if(productionProcesses.getConflictRoptions() != null && productionProcesses.getConflictRoptions().size()>0){
|
|
productionProcesses.getConflictRoptions().forEach((k,v)->{
|
|
productionProcesses.getConflictRoptions().forEach((k,v)->{
|