From 0fb12afba031c0e731d9f9e24b0d7de94efb815a Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Thu, 20 Jun 2024 14:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/domain/EBom/EBomFormalTreeTask.java | 3 +++
 .../product/bomnew/service/domain/PBom/PBomFormalTreeTask.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java
index 6e9c3bb1..104875d4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java
@@ -3,6 +3,7 @@ package com.nflg.product.bomnew.service.domain.EBom;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.nflg.product.bomnew.constant.EBomConstant;
 import com.nflg.product.bomnew.constant.OriginalConstant;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity;
@@ -10,6 +11,7 @@ import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentFormalVO;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
 import com.nflg.product.bomnew.service.BomNewEbomParentFormalService;
 import com.nflg.product.bomnew.service.BomNewEbomParentService;
+import com.nflg.product.bomnew.service.MaterialMainService;
 import com.nflg.product.bomnew.util.ListCommonUtil;
 import com.nflg.product.bomnew.util.MaterialshouldBomExistUtil;
 import lombok.Getter;
@@ -50,6 +52,7 @@ public class EBomFormalTreeTask extends RecursiveTask<List<BomNewEbomParentForma
             vo.setLevelNum(levelNum);
         }
 
+        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
 
         List<Long> bomRowIds=bomDetail.stream().filter(u -> Objects.nonNull(u.getBomRowId()) && u.getBomRowId()>0 ).map(BomNewEbomParentFormalVO::getBomRowId).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(bomRowIds)) {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
index a098c8d4..7fbbef66 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
@@ -2,6 +2,7 @@ package com.nflg.product.bomnew.service.domain.PBom;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.nflg.product.bomnew.constant.EBomConstant;
 import com.nflg.product.bomnew.constant.OriginalConstant;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentFormalEntity;
@@ -10,6 +11,7 @@ import com.nflg.product.bomnew.pojo.vo.BomNewPbomChildVO;
 import com.nflg.product.bomnew.pojo.vo.BomNewPbomParentFormalVO;
 import com.nflg.product.bomnew.service.BomNewEbomParentFormalService;
 import com.nflg.product.bomnew.service.BomNewPbomParentFormalService;
+import com.nflg.product.bomnew.service.MaterialMainService;
 import com.nflg.product.bomnew.util.ListCommonUtil;
 import com.nflg.product.bomnew.util.MaterialshouldBomExistUtil;
 import lombok.Getter;
@@ -47,6 +49,7 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentForma
         bomDetail ) {
             vo.setLevelNum(levelNum);
         }
+        SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
 
         List<Long> bomRowIds=bomDetail.stream().filter(u -> u.getBomRowId()>0 ).map(BomNewPbomParentFormalVO::getBomRowId).collect(Collectors.toList());