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

fix: 优化异常检查时的根节点判断逻辑

This commit is contained in:
曹鹏飞 2024-04-22 15:07:06 +08:00
parent 140d1b80e9
commit f12a19cba4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
View File

@ -129,8 +129,8 @@ public class CheckEBomException {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue());
} else if (StrUtil.isNotBlank(vo.getMaterialNo()) && Objects.isNull(vo.getMaterialState())) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue());
} else if (StrUtil.isBlank(vo.getProjectType())
&& (Objects.equals(vo.getRootIs(), 0) && Objects.equals(vo.getUserRootIs(), 0) && Objects.equals(vo.getRootIsForWaitReview(), 0))) {
} else if (StrUtil.isBlank(vo.getProjectType()) && !Objects.equals(vo.getRootIs(), 1)
&& !Objects.equals(vo.getUserRootIs(), 1) && !Objects.equals(vo.getRootIsForWaitReview(), 1)) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_8.getValue());
} else if (StrUtil.isNotBlank(vo.getNoticeNums()) && EBomExceptionStatusEnum.EXCEPT_NO_11.equalsValue(vo.getExceptionStatus())) {
vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java
View File

@ -68,13 +68,16 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
detailVO.setDeviseName(ebomParentEntity.getDeviseName());
detailVO.setBomExist(ebomParentEntity.getBomExist());
detailVO.setStatus(ebomParentEntity.getStatus());
detailVO.setRootIs(ebomParentEntity.getRootIs());
detailVO.setUserRootIs(ebomParentEntity.getUserRootIs());
detailVO.setRootIsForWaitReview(ebomParentEntity.getRootIsForWaitReview());
} else {
detailVO.setRootIs(0);
detailVO.setUserRootIs(0);
detailVO.setRootIsForWaitReview(0);
}
}
}
}
/**