From 8293df0459ef110a005c8c806102b8b1e62002d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 7 Oct 2024 08:34:43 +0800 Subject: [PATCH] =?UTF-8?q?pbom-=E5=BC=82=E5=B8=B8=E6=A3=80=E6=9F=A5-?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/CheckPBomException.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckPBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckPBomException.java index 8e6ea243..e09cc843 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckPBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckPBomException.java @@ -63,6 +63,9 @@ public class CheckPBomException { || MaterialGetEnum.MaterialStateEnum.STATE_NO_5.equalsValue(vo.getMaterialState()))) { vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_2.getValue()); } + if(StrUtil.isNotBlank(vo.getMaterialNo()) && Objects.isNull(vo.getMaterialState()) ){ + vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue()); + } } initExceptionYellowWarn(); @@ -73,7 +76,7 @@ public class CheckPBomException { * @param */ public void initExceptionYellowWarn() { - Set exceptionItems = allBomDetail.stream().filter(u -> EBomExceptionStatusEnum.EXCEPT_NO_2.equalsValue(u.getExceptionStatus())).collect(Collectors.toSet()); + Set exceptionItems = allBomDetail.stream().filter(u -> EBomExceptionStatusEnum.EXCEPT_NO_2.equalsValue(u.getExceptionStatus()) || EBomExceptionStatusEnum.EXCEPT_NO_7.equalsValue(u.getExceptionStatus()) ).collect(Collectors.toSet()); for (BomNewPbomParentVO vo : exceptionItems) { initExceptionParent(vo); }