From 8bf4612a3123df6aeca2790c6f5210caadcf7d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sat, 18 May 2024 17:15:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D2=E4=B8=AAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java    | 2 +-
 .../nflg/product/bomnew/service/BomNewPbomParentService.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 c68c3755..28d1c565 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
@@ -1126,7 +1126,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         try {
             this.getBaseMapper().updateRootState();
             ebomChildService.getBaseMapper().updateEBomMaterialUse();
-            this.compucteLevelNum();
+            //this.compucteLevelNum();
 
         } catch (Exception e) {
             log.info("计算层级出错:" + e.getMessage());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index b9758cc1..6d216d38 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -586,7 +586,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         VUtils.isTure(root.getMaterialNo().startsWith("31")).throwMessage("31码物料不能进行复制");
 
         BomNewPbomChildEntity child = pbomChildService.getById(rowId);
-        if (child.getVirtualPartRootMaterialNo().startsWith("31") && child.getVirtualPartType() > 0) {
+        if (Objects.nonNull(child) && child.getVirtualPartRootMaterialNo().startsWith("31") && child.getVirtualPartType() > 0) {
             VUtils.isTure(true).throwMessage("31下的虚拟包不能复制");
         }