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

fix(ebom): 处理合并问题

This commit is contained in:
曹鹏飞 2024-05-17 14:19:43 +08:00
parent 7ddac0bae0
commit 3a5a787dc9
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,29 +123,30 @@ public class CheckEBomException {
if (StrUtil.isBlank(vo.getMaterialDesc())) { if (StrUtil.isBlank(vo.getMaterialDesc())) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue()); vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue());
} }
} else {if (StrUtil.isNotBlank(vo.getMaterialNo()) } else {
&& (MaterialGetEnum.MaterialStateEnum.STATE_NO_4.equalsValue(vo.getMaterialState()) if (StrUtil.isNotBlank(vo.getMaterialNo())
|| MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(vo.getMaterialState()))) { && (MaterialGetEnum.MaterialStateEnum.STATE_NO_4.equalsValue(vo.getMaterialState())
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue()); || MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(vo.getMaterialState()))) {
} else if (StrUtil.isBlank(vo.getMaterialNo()) || Objects.isNull(vo.getNum()) || BigDecimal.ZERO.compareTo(vo.getNum()) >= 0) { vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue());
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue()); } else if (StrUtil.isBlank(vo.getMaterialNo()) || Objects.isNull(vo.getNum()) || BigDecimal.ZERO.compareTo(vo.getNum()) >= 0) {
} else if (StrUtil.isNotBlank(vo.getMaterialNo()) && Objects.isNull(vo.getMaterialState())) { vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_4.getValue());
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue()); } else if (StrUtil.isNotBlank(vo.getMaterialNo()) && Objects.isNull(vo.getMaterialState())) {
} else if (StrUtil.isBlank(vo.getProjectType()) && !Objects.equals(vo.getRootIs(), 1) vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue());
&& !Objects.equals(vo.getUserRootIs(), 1) && !Objects.equals(vo.getRootIsForWaitReview(), 1)) { } else if (StrUtil.isBlank(vo.getProjectType()) && !Objects.equals(vo.getRootIs(), 1)
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_8.getValue()); && !Objects.equals(vo.getUserRootIs(), 1) && !Objects.equals(vo.getRootIsForWaitReview(), 1)) {
} else if ((!StrUtil.equals("KG", StringUtil.toUpperCase(vo.getMaterialUnit())) && !StrUtil.equals(StringUtil.toUpperCase(vo.getMaterialUnit()), "PC")) vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_8.getValue());
//|| (!Objects.isNull(mainVO) && !StrUtil.equals(vo.getMaterialUnit(), mainVO.getMaterialUnit()))) { } else if ((!StrUtil.equals("KG", StringUtil.toUpperCase(vo.getMaterialUnit())) && !StrUtil.equals(StringUtil.toUpperCase(vo.getMaterialUnit()), "PC"))
&& (StrUtil.isBlank(vo.getExceptionTag()) || (!vo.getExceptionTag().contains("16")) && !vo.getExceptionTag().contains("12"))) { //|| (!Objects.isNull(mainVO) && !StrUtil.equals(vo.getMaterialUnit(), mainVO.getMaterialUnit()))) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_12.getValue()); && (StrUtil.isBlank(vo.getExceptionTag()) || (!vo.getExceptionTag().contains("16")) && !vo.getExceptionTag().contains("12"))) {
} else if (StrUtil.isNotBlank(vo.getNoticeNums()) && EBomExceptionStatusEnum.EXCEPT_NO_11.equalsValue(vo.getExceptionStatus())) { vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_12.getValue());
vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); } else if (StrUtil.isNotBlank(vo.getNoticeNums()) && EBomExceptionStatusEnum.EXCEPT_NO_11.equalsValue(vo.getExceptionStatus())) {
} else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit()) vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
&& (StrUtil.isBlank(vo.getExceptionTag()) || !vo.getExceptionTag().contains("16"))) { } else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit())
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue()); && (StrUtil.isBlank(vo.getExceptionTag()) || !vo.getExceptionTag().contains("16"))) {
} vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue());
else if (EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(vo.getProjectType()) && StrUtil.isBlank(vo.getMaterialDesc())){ } else if (EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(vo.getProjectType()) && StrUtil.isBlank(vo.getMaterialDesc())) {
vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue());} vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue());
}
} }
} }
checkOther(); checkOther();