|
@@ -646,7 +646,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
|
|
|
//前道工序输出
|
|
|
List<PreviousProcessVo> processVo = newProcessIds.stream().filter(pro -> pro.getPreviousstepid().equals(apsProcessOperationDo1.getPreviousprocessid())).collect(Collectors.toList());
|
|
|
+ ApsProcessOperationOutMaterDo outMaterDo = processVo.get(0).getApsProcessOperationOutMaterDo();
|
|
|
processOperationDo.setPreviousprocessid(processVo.get(0).getProcessId());
|
|
|
+ processOperationDo.setPlaninputid(outMaterDo.getId());
|
|
|
|
|
|
//更新前道工序的后道工序
|
|
|
ApsProcessOperationDo aDo = apsProcessOperationDoList.stream().filter(qtr -> processVo.get(0).getProcessId().equals(qtr.getId())).findAny().orElse(null);
|
|
@@ -725,6 +727,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
processOperationOutMaterDo.setBlankid(oldblankid);
|
|
|
apsProcessOperationOutMaterDoList.add(processOperationOutMaterDo);
|
|
|
}
|
|
|
+ previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDos1.get(0));
|
|
|
|
|
|
//本道工序的可选设备
|
|
|
List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(omd -> apsProcessOperationDo.getId().equals(omd.getMainid())).collect(Collectors.toList());
|