|
@@ -397,7 +397,8 @@ public class BizDayworkItemController extends BaseController {
|
|
|
process.setProcessAlias(processDetail.getProcessAlias());
|
|
|
process.setProcessStepNumber(processDetail.getProcessStepNumber());
|
|
|
daywork.setCurrentProcess(process);
|
|
|
- for (BizLotTechnologicalProcessDetail detail : abNormalDetailList) {
|
|
|
+ List<BizLotTechnologicalProcessDetail> collectList = abNormalDetailList.stream().filter(item -> item.getLotTechnologicalProcessId().equals(daywork.getTechnologicalProcessId())).collect(Collectors.toList());
|
|
|
+ for (BizLotTechnologicalProcessDetail detail : collectList) {
|
|
|
BizProcess newProcess = new BizProcess();
|
|
|
newProcess.setId(detail.getProcessId());
|
|
|
newProcess.setProcessCode(detail.getProcessCode());
|
|
@@ -413,7 +414,8 @@ public class BizDayworkItemController extends BaseController {
|
|
|
process.setProcessAlias(processDetail.getProcessAlias());
|
|
|
process.setProcessStepNumber(processDetail.getProcessStepNumber());
|
|
|
daywork.setCurrentProcess(process);
|
|
|
- for (BizTechnologicalProcessDetail detail : normalDetailList) {
|
|
|
+ List<BizTechnologicalProcessDetail> collectList = normalDetailList.stream().filter(item -> item.getTechnologicalProcessId().equals(daywork.getTechnologicalProcessId())).collect(Collectors.toList());
|
|
|
+ for (BizTechnologicalProcessDetail detail : collectList) {
|
|
|
BizProcess newProcess = new BizProcess();
|
|
|
newProcess.setId(detail.getProcessId());
|
|
|
newProcess.setProcessCode(detail.getProcessCode());
|