rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition'

This commit is contained in:
10001392 2024-09-05 09:34:47 +08:00
parent 9e930b2aaa 86be029466
commit 510d546378
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -2140,6 +2140,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
// return dto.getParent();
// }
//检查是否在主数据里
if (CollUtil.isNotEmpty(dto.getDatas())) {
CheckEBomException.checkMaterialNoInMain(dto.getDatas());
}
EBomEdit eBomEdit = new EBomEdit(EBomSourceEnum.FROM_MDM.getValue());
dto.setOpType(EbomEditStatusEnum.HANDLER_CREATED.getValue());
@ -2192,14 +2196,17 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
checkUserRoleAuth(dto.getParent().getCreatedBy());
// //无提交数据后面不处理
// if (CollUtil.isEmpty(dto.getDatas())) {
// return true;
// }
//检查是否在主数据里
if (CollUtil.isNotEmpty(dto.getDatas())) {
CheckEBomException.checkMaterialNoInMain(dto.getDatas());
}
//构建操作数据
EBomEdit eBomEdit = new EBomEdit(EBomSourceEnum.FROM_MDM.getValue());
dto.setOpType(EbomEditStatusEnum.HANDLER_FINISHED.getValue());
eBomEdit.handleBom(dto);
//子级的异常码包含不能提交
List<Integer> checkStatus = CollectionUtil.toList(new Integer[]{
EBomExceptionStatusEnum.EXCEPT_NO_2.getValue(),
EBomExceptionStatusEnum.EXCEPT_NO_3.getValue(),