From 1d50b4686d850c2069827a620a9e74b22df18c9f 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, 19 Jun 2024 08:22:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E5=A2=9E=E5=8A=A0=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/pojo/query/BomExceptionQuery.java   | 4 ++++
 .../product/bomnew/service/BomNewEbomParentService.java     | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomExceptionQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomExceptionQuery.java
index 85a9bd8a..e7c8c4ed 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomExceptionQuery.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomExceptionQuery.java
@@ -30,4 +30,8 @@ public class BomExceptionQuery implements Serializable {
     @ApiModelProperty(value = "rowId", required = true)
     @NotNull
     protected Long rowId;
+
+    @ApiModelProperty(value = "materialNo", required = true)
+    @NotNull
+    protected String materialNo;
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index daf2f24c..b682b642 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -2391,13 +2391,17 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             BomExceptionQuery bom = query.get(index);
             BomExceptionVO vo = new BomExceptionVO();
             if (index == 0) {
+                BomNewEbomParentEntity parent = getById(bom.getBomRowId());
+                VUtils.isTure(Objects.isNull(parent)).throwMessage(bom.getMaterialNo() + "不存在");
+
                 checkAndSaveEBomException(bom.getBomRowId(), bom.getRowId());
 
-                BomNewEbomParentEntity parent = getById(bom.getBomRowId());
                 vo.setMaterialNo(parent.getMaterialNo());
                 vo.setExceptionStatus(parent.getExceptionStatus());
             } else {
                 BomNewEbomChildEntity child = ebomChildService.getById(bom.getRowId());
+                VUtils.isTure(Objects.isNull(child)).throwMessage(bom.getMaterialNo() + "不存在");
+
                 vo.setMaterialNo(child.getMaterialNo());
                 if (Objects.equals(child.getExceptionStatus(), EBomExceptionStatusEnum.OK.getValue())) {
                     BomNewEbomParentEntity parent = getById(bom.getBomRowId());