From 53974c8cf6ac52f07585d6eaeebf22919f36d9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sun, 28 Apr 2024 09:01:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?optimize:=20=E5=AF=BC=E5=85=A5sap=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AFT=E9=A1=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E9=9C=80=E8=A6=81=E8=AE=BE=E7=BD=AEPOTX1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java   | 3 +++
 1 file changed, 3 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 9d089bf7..1aa6202c 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
@@ -964,6 +964,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 t1.setMEINS(c.getMaterialUnit());
                 t1.setMENGE(c.getNum().toString());
                 t1.setPOSTP(c.getProjectType());
+                if (StrUtil.equals("T", c.getProjectType())) {
+                    t1.setPOTX1(c.getMaterialName());
+                }
                 t1.setDATUM(dateYMD);
                 t1s.add(t1);
                 BomNewEbomParentEntity cp = lambdaQuery()

From a6ee24c8c57463a07b58cc6360361b5c26e52b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sun, 28 Apr 2024 09:32:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E8=A1=8C=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      |  3 ++-
 .../product/bomnew/service/DQBomService.java  | 23 +++----------------
 2 files changed, 5 insertions(+), 21 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 1aa6202c..a44111f7 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
@@ -964,7 +964,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 t1.setMEINS(c.getMaterialUnit());
                 t1.setMENGE(c.getNum().toString());
                 t1.setPOSTP(c.getProjectType());
-                if (StrUtil.equals("T", c.getProjectType())) {
+                if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(c.getProjectType())) {
+                    t1.setIDNRK("");
                     t1.setPOTX1(c.getMaterialName());
                 }
                 t1.setDATUM(dateYMD);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
index cf05d9ca..50ebaa40 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
@@ -451,27 +451,10 @@ public class DQBomService {
 
     public List<BomNewDQbomVO> changeMaterial(BomNewDQbomQuery query) {
         VUtils.isTure(Objects.isNull(query.getParent())).throwMessage("父级节点不能为空");
-        if (CollUtil.isNotEmpty(query.getDatas())) return query.getDatas();
 
-        List<String> materialNos = query.getDatas().stream()
-                .map(BomNewDQbomVO::getMaterialNo)
-                .filter(StrUtil::isNotBlank)
-                .distinct()
-                .collect(Collectors.toList());
-        List<BaseMaterialVO> materialBaseInfos = materialMainService.getMaterialBaseInfo(materialNos);
-        query.getDatas().forEach(c -> {
-            BaseMaterialVO vo = materialBaseInfos.stream()
-                    .filter(m -> m.getMaterialNo().equals(c.getMaterialNo()))
-                    .findFirst()
-                    .orElse(null);
-            if (vo != null) {
-                c.setUnitWeight(vo.getMaterialWeight());
-                c.setTotalWeight(BomUtil.calculateTotalWeight(c.getNum(), c.getUnitWeight()));
-                c.setMaterialName(vo.getMaterialName());
-                c.setMaterialUnit(vo.getMaterialUnit());
-                c.setMaterialTexture(vo.getMaterialTexture());
-            }
-        });
+        if (CollUtil.isEmpty(query.getDatas())) return query.getDatas();
+
+        initMaterialInfo(query.getDatas());
         return query.getDatas();
     }