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 8d49a822..49c88ad8 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 @@ -143,8 +143,6 @@ public class CheckEBomException { 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()); } } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 0f37ca5c..233bedd5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -399,13 +399,14 @@ AND created_by = #{userCode} - AND status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode} + AND status IN (1,3) AND (root_is=1 OR user_root_is=1 OR root_is_for_wait_review=1) AND + created_by=#{userCode} - AND root_is=1 AND status=2 + AND (root_is=1 OR user_root_is=1) AND status=2 - AND root_is=1 AND status=4 + AND (root_is=1 OR user_root_is=1) AND status=4 AND devise_name=#{query.deviseName}