From 05ba87c822f5b67e1c11fbcc0006faec57eb5e3d Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Tue, 13 Feb 2024 16:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java    | 6 ++++++
 .../product/bomnew/service/BomNewPbomParentService.java    | 7 +++++++
 2 files changed, 13 insertions(+)

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 23f6cacb..eafed3b5 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
@@ -130,6 +130,12 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                     data.addAll(parents);
                     data.addAll(childs);
                     materialMainService.intiMaterialInfo(data, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
+                    for (BomNewEbomParentVO vi : childs) {
+                        if (StrUtil.isBlank(vi.getCurrentVersion()) &&  MaterialshouldBomExistUtil.checkShouldBomExist(vi)) {
+                            vi.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
+                        }
+                    }
+
                     returnResult = handSeachToTree(parents, childs);
                 }
             }
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 43a15418..681d9e00 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
@@ -125,6 +125,13 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                     List<BomNewPbomParentVO> data = new ArrayList<>();
                     data.addAll(parents);
                     data.addAll(childs);
+
+                    for (BomNewPbomParentVO vi : childs) {
+                        if (StrUtil.isBlank(vi.getCurrentVersion()) &&  MaterialshouldBomExistUtil.checkShouldBomExist(vi)) {
+                            vi.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
+                        }
+                    }
+
                     materialMainService.intiMaterialInfo(data, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
                     return handSeachToTree(parents, childs);
                 }