From 544e4ef13faca4321a6f07db46d4d7d314e734b4 Mon Sep 17 00:00:00 2001
From: "BF-202309241046\\Administrator" <tan_jing_song@126.com>
Date: Thu, 22 Aug 2024 19:10:08 +0800
Subject: [PATCH] =?UTF-8?q?EBOM=20-pbom=20=E7=89=A9=E6=96=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nflg/product/bomnew/constant/EBomConstant.java    | 2 ++
 .../nflg/product/bomnew/service/BomNewEbomParentService.java   | 3 +++
 .../nflg/product/bomnew/service/BomNewPbomParentService.java   | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java
index e8f22b8f..a1823dbd 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java
@@ -23,6 +23,8 @@ public class EBomConstant {
             "materialName","materialDesc","drawingNo"
     };
 
+    public static final String[] EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT3 = {"material", "materialTexture", "projectType", "materialUnit","materialWeight"};
+
     //集团总部代码
     public static final String MAIN_FACTORY_CODE_1010="1010";
 
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 b102b086..c7232e98 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
@@ -454,6 +454,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         //动态判断异常
         //CheckEBomExceptoinDynamic.check(parentChild);
         BomNewSortUtil.orderNumEbomSort(parentChild,0);
+        //使用主数据初始化物料描述
+        //主数据初始化
+        materialMainService.intiMaterialInfo(parentChild, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT3);
         return parentChild;
 
     }
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 47b97f22..494bc378 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
@@ -405,6 +405,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
 
 
             BomNewSortUtil.orderNumPbomSort(parentChild,0);
+        //主数据初始化
+        materialMainService.intiMaterialInfo(parentChild, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT3);
         return parentChild;
 
     }