|
@@ -1348,10 +1348,12 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
|
|
|
}
|
|
|
// 后道工序
|
|
|
if(process.getNextProcessesIds() != null && process.getNextProcessesIds().size()>0){
|
|
|
+ // 后道工序历史备份
|
|
|
+ List<String> oldnextids = new ArrayList<>();
|
|
|
+ oldnextids.addAll(process.getNextProcessesIds());
|
|
|
+ process.setOldNextProcessesIds(oldnextids);
|
|
|
+ // 后道工序对象赋值
|
|
|
List<ProductionProcesses> nexts = new ArrayList<>();
|
|
|
- /*for (String nextId : process.getNextProcessesIds()) {
|
|
|
- nexts.add(idMaps.get(nextId));
|
|
|
- }*/
|
|
|
for (String previousProcessesId : process.getNextProcessesIds()) {
|
|
|
for (ProductionProcesses nextprocess : productionScheduleVo.getProcesses()) {
|
|
|
if(nextprocess.getId().equals(previousProcessesId)){
|
|
@@ -1362,11 +1364,9 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
|
|
|
}
|
|
|
if(nexts != null && nexts.size()>0){
|
|
|
process.setNextProcesses(nexts);
|
|
|
+ }else{
|
|
|
+ process.setNextProcessesIds(null);
|
|
|
}
|
|
|
- // 后道工序历史备份
|
|
|
- List<String> oldnextids = new ArrayList<>();
|
|
|
- oldnextids.addAll(process.getNextProcessesIds());
|
|
|
- process.setOldNextProcessesIds(oldnextids);
|
|
|
}
|
|
|
// 默认批次为1
|
|
|
if(process.getProducePcNum() == null){
|