From a60cae3d6ad8811844721f3fcfda391e9a998eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 8 May 2024 09:46:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=95=E4=BD=8D=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=EF=BC=8C=E4=B8=94exceptionTag=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=88=96=E4=B8=8D=E5=8C=85=E5=90=AB16=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/EBom/CheckEBomException.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 4ad075c2..19f20661 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
@@ -135,8 +135,8 @@ public class CheckEBomException {
                 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())){
+            } else if (!StrUtil.equals(vo.getMaterialUnit(), vo.getMaterialOriginalUnit())
+                    && (StrUtil.isBlank(vo.getExceptionTag()) || !vo.getExceptionTag().contains("16"))) {
                 vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue());
             }