Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-dq
This commit is contained in:
commit
007cb34971
|
|
@ -170,13 +170,13 @@ public class CheckEBomException {
|
||||||
qList.forEach(u -> u.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_9.getValue()));
|
qList.forEach(u -> u.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_9.getValue()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.getValue().equals(parent.getProjectType())) {
|
// if (ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.getValue().equals(parent.getProjectType())) {
|
||||||
List<BomNewEbomParentVO> qList = child.stream().filter(u -> ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.getValue().equals(u.getProjectType())).collect(Collectors.toList());
|
// List<BomNewEbomParentVO> qList = child.stream().filter(u -> ProjectTypeInputTypeEnum.ProjectTypeEnum.TYPE_F.getValue().equals(u.getProjectType())).collect(Collectors.toList());
|
||||||
if (CollUtil.isNotEmpty(qList)) {
|
// if (CollUtil.isNotEmpty(qList)) {
|
||||||
parent.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_10.getValue());
|
// parent.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_10.getValue());
|
||||||
qList.forEach(u -> u.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_10.getValue()));
|
// qList.forEach(u -> u.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_10.getValue()));
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
// checkCircularDependency(checkEBomExceptionDTOS);
|
// checkCircularDependency(checkEBomExceptionDTOS);
|
||||||
//bom异常-黄色警号
|
//bom异常-黄色警号
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue