From 5d1e9418f4691e79376170825846b8edabf8e52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 2 May 2024 16:54:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8D=95=E4=BD=8D=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java    | 3 +++
 .../product/bomnew/service/domain/EBom/CheckEBomException.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
index beb93511..e44de207 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
@@ -329,6 +329,9 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
     @ApiModelProperty(value = "待复核根节点")
     private Integer rootIsForWaitReview;
 
+    @ApiModelProperty(value = "物料原始单位(来自CAD)")
+    private String materialOriginalUnit;
+
     private String materialNoAndProductType;
 
     public String getMaterialNoAndProductType() {
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 9f768737..1c79db39 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
@@ -137,6 +137,9 @@ public class CheckEBomException {
             } 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())){
+                vo.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_16.getValue());
+            }
 
         }
         checkOther();