From fb7ac3f813b4188c824c60e34574b09c68dacf5a Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Mon, 14 Oct 2024 09:43:52 +0800
Subject: [PATCH] =?UTF-8?q?EBOM=2010=E3=80=8140=E3=80=8150=E3=80=8160?=
 =?UTF-8?q?=E3=80=8170=E5=A4=A7=E7=B1=BB=E4=BB=A5=E5=8F=8A200201=E5=B0=8F?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?B00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java | 5 ++++-
 .../nflg/product/bomnew/service/BomNewPbomParentService.java | 3 +--
 2 files changed, 5 insertions(+), 3 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 1b36fdac..228b74a4 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
@@ -443,7 +443,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                         child.setEditStatus(parent.getEditStatus());
                         child.setVirtualPackageIs(parent.getVirtualPackageIs());
                         child.setSuperMaterialStatus(parent.getSuperMaterialStatus());
-                        if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
+                        // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
+                        if(MaterialshouldBomExistUtil.checkNoNeedBom(child)){
+                            child.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
+                        }else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                             child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
                         } else {
                             child.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
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 e5a762a1..99552fc2 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
@@ -395,8 +395,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                         // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
                         if(MaterialshouldBomExistUtil.checkNoNeedBom(child)){
                             child.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
-                        }else
-                            if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
+                        }else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                             child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
                         } else {
                             child.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);