From 7717cecc5a430da50ef5bafe887bf1acc553a9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 28 May 2024 09:38:02 +0800
Subject: [PATCH] =?UTF-8?q?optimize(ebom):=20=E4=BC=98=E5=8C=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 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 efcf11e3..0fb6629b 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
@@ -2386,23 +2386,28 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         if (CollUtil.isNotEmpty(keys)) {
             datas.addAll(SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(keys));
         }
-        List<QueryMaterialsVO> vos = Convert.toList(QueryMaterialsVO.class, datas);
-        query.forEach(it -> {
-            if (Objects.nonNull(it.getUnitWeight()) || StrUtil.isNotBlank(it.getProjectType())) {
-                QueryMaterialsVO vo = vos.stream().filter(m -> StrUtil.equals(m.getMaterialNo(), it.getMaterialNo())
-                                || StrUtil.equals(m.getDrawingNo(), it.getDrawingNo()))
-                        .findFirst().orElse(null);
-                if (Objects.nonNull(vo)) {
-                    if (Objects.nonNull(it.getUnitWeight())) {
-                        vo.setUnitWeight(it.getUnitWeight());
-                    }
-                    if (StrUtil.isNotBlank(it.getProjectType())) {
-                        vo.setProjectType(it.getProjectType());
-                    }
-                }
+        return datas.stream().map(d -> {
+            QueryMaterialsVO vo = new QueryMaterialsVO();
+            vo.setMaterialNo(d.getMaterialNo());
+            vo.setMaterialName(d.getMaterialName());
+            vo.setMaterialDesc(d.getMaterialDesc());
+            vo.setUnitWeight(d.getMaterialWeight());
+            vo.setMaterialCategoryCode(d.getMaterialCategoryCode());
+            vo.setMaterialState(d.getMaterialState());
+            vo.setDrawingNo(d.getDrawingNo());
+            vo.setMaterialTexture(d.getMaterialTexture());
+            vo.setMaterialUnit(d.getMaterialUnit());
+            vo.setCategoryName(d.getCategoryName());
+            QueryMaterialsQuery q = query.stream()
+                    .filter(f -> StrUtil.equals(f.getMaterialNo(), vo.getMaterialNo()) || StrUtil.equals(f.getDrawingNo(), vo.getDrawingNo()))
+                    .findFirst()
+                    .orElse(null);
+            if (Objects.nonNull(q)) {
+                vo.setUnitWeight(q.getUnitWeight());
+                vo.setProjectType(q.getProjectType());
             }
-        });
-        return vos;
+            return vo;
+        }).collect(Collectors.toList());
     }
 
     public Integer getSapErrorNum() {