From c54bb944d9b956adf7d8a679bb83d4b810a3c24d Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Sun, 7 Jan 2024 16:31:42 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java  | 2 +-
 .../nflg/product/bomnew/service/MaterialMainService.java | 9 +++++++--
 2 files changed, 8 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 a8f393e4..0815a75b 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
@@ -271,7 +271,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         BomNewEbomParentEntity parent = this.getBaseMapper().selectById(rowId);
         List<BomNewEbomParentVO> parentChild = this.getBaseMapper().getParentChild(rowId);
         //排除项目类别的赋值
-        materialMainService.intiMaterialInfoInPattern(parentChild,"^21 | ^31", EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
+        materialMainService.intiMaterialInfoInPattern(parentChild,"^21 | ^31",  EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
         if (CollUtil.isNotEmpty(parentChild)) {
             List<String> materialNos = parentChild.stream().map(u -> u.getMaterialNo()).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(materialNos)) {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java
index 6b0b0412..8953e542 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java
@@ -93,14 +93,19 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
         }
     }
 
-    public <T extends BaseMaterialVO> void intiMaterialInfoInPattern(List<T> data , String ignoreMaterialNoPattern , String ... ignorePropertyList) {
+    //
+    public <T extends BaseMaterialVO> void intiMaterialInfoInPattern(List<T> data , String ignoreMaterialRemarkToNnamePattern , String ... ignorePropertyList) {
         List<String> materialNos = data.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(u -> u.getMaterialNo()).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(materialNos)) {
             List<BaseMaterialVO> materialBaseInfos = SpringUtil.getBean(MaterialMainService.class).getMaterialBaseInfo(materialNos);
             Map<String, BaseMaterialVO> materialMp = ListCommonUtil.listToMap(materialBaseInfos, BaseMaterialVO::getMaterialNo);
             for (T t : data) {
-                if ( !Pattern.matches(ignoreMaterialNoPattern, t.getMaterialNo()) && StrUtil.isNotBlank(t.getMaterialNo()) && materialMp.containsKey(t.getMaterialNo())) {
+                if (  StrUtil.isNotBlank(t.getMaterialNo()) && materialMp.containsKey(t.getMaterialNo())) {
+
                     BeanUtil.copyProperties(materialMp.get(t.getMaterialNo()), t,  ignorePropertyList);
+                    if(!Pattern.matches(ignoreMaterialRemarkToNnamePattern, t.getMaterialNo())){
+                        t.setMaterialName(materialMp.get(t.getMaterialNo()).getMaterialDesc());
+                    }
                 }
             }
         }