diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index a8286847..8d49a822 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -119,31 +119,34 @@ public class CheckEBomException { // .orElse(null); vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); // } - if (StrUtil.isNotBlank(vo.getMaterialNo()) - && (MaterialGetEnum.MaterialStateEnum.STATE_NO_4.equalsValue(vo.getMaterialState()) - || MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(vo.getMaterialState()))) { - vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue()); - } else if (StrUtil.isBlank(vo.getMaterialNo()) || Objects.isNull(vo.getNum()) || BigDecimal.ZERO.compareTo(vo.getNum()) >= 0) { - 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(), 1) - && !Objects.equals(vo.getUserRootIs(), 1) && !Objects.equals(vo.getRootIsForWaitReview(), 1)) { - vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_8.getValue()); - } else if ((!StrUtil.equals("KG", StringUtil.toUpperCase(vo.getMaterialUnit())) && !StrUtil.equals(StringUtil.toUpperCase(vo.getMaterialUnit()), "PC")) - //|| (!Objects.isNull(mainVO) && !StrUtil.equals(vo.getMaterialUnit(), mainVO.getMaterialUnit()))) { - && (StrUtil.isBlank(vo.getExceptionTag()) || (!vo.getExceptionTag().contains("16")) && !vo.getExceptionTag().contains("12"))) { - vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_12.getValue()); - } else if (StrUtil.isNotBlank(vo.getNoticeNums()) && EBomExceptionStatusEnum.EXCEPT_NO_11.equalsValue(vo.getExceptionStatus())) { - vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); + if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, vo.getProjectType(), true)) { + if (StrUtil.isBlank(vo.getMaterialDesc())) { + vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue()); + } + } else { + if (StrUtil.isNotBlank(vo.getMaterialNo()) + && (MaterialGetEnum.MaterialStateEnum.STATE_NO_4.equalsValue(vo.getMaterialState()) + || MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(vo.getMaterialState()))) { + vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue()); + } else if (StrUtil.isBlank(vo.getMaterialNo()) || Objects.isNull(vo.getNum()) || BigDecimal.ZERO.compareTo(vo.getNum()) >= 0) { + 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(), 1) + && !Objects.equals(vo.getUserRootIs(), 1) && !Objects.equals(vo.getRootIsForWaitReview(), 1)) { + vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_8.getValue()); + } else if ((!StrUtil.equals("KG", StringUtil.toUpperCase(vo.getMaterialUnit())) && !StrUtil.equals(StringUtil.toUpperCase(vo.getMaterialUnit()), "PC")) + //|| (!Objects.isNull(mainVO) && !StrUtil.equals(vo.getMaterialUnit(), mainVO.getMaterialUnit()))) { + && (StrUtil.isBlank(vo.getExceptionTag()) || (!vo.getExceptionTag().contains("16")) && !vo.getExceptionTag().contains("12"))) { + vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_12.getValue()); + } else if (StrUtil.isNotBlank(vo.getNoticeNums()) && EBomExceptionStatusEnum.EXCEPT_NO_11.equalsValue(vo.getExceptionStatus())) { + vo.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue()); + } else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit()) && StrUtil.isBlank(vo.getExceptionTag())) { + vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue()); + } else if (EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(vo.getProjectType()) && StrUtil.isBlank(vo.getMaterialDesc())) { + vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue()); + } } - else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit()) && StrUtil.isBlank(vo.getExceptionTag())){ - vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue()); - } - else if (EBomConstant.PROJECT_TYPE_T.equalsIgnoreCase(vo.getProjectType()) && StrUtil.isBlank(vo.getMaterialDesc())){ - vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_17.getValue()); - } - } checkOther(); }