From 32da594565e93e6d895ebe68c1c85b1271146215 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, 12 Nov 2024 08:41:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(pbom):=20=E4=BF=AE=E5=A4=8D=E5=9B=A0child?=
 =?UTF-8?q?=E8=A1=A8=E7=89=A9=E6=96=99=E5=88=86=E7=B1=BB=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8E=E4=B8=BB=E7=89=A9=E6=96=99=E7=9A=84=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BC=96=E7=A0=81=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=AF=BC=E5=85=A5=E5=88=B0SAP=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8F=B7=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewPbomExportToSAPImpl.java    | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
index 1e980b92..4fa1806f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
@@ -370,22 +370,26 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
 
     private List<BomNewPbomChildEntity> syncMaterial(List<BomNewPbomChildEntity> children) {
         if (CollUtil.isNotEmpty(children)) {
-            List<BaseMaterialVO> materialVOS = materialMainService.getMaterialBaseInfo(children.stream()
+            List<String> materialNos = children.stream()
                     .filter(f -> !StrUtil.equalsIgnoreCase(BomConstant.PROJECT_TYPE_TEMPORARY, f.getProjectType())
                             && StrUtil.isNotEmpty(f.getMaterialNo()))
-                    .map(BomNewPbomChildEntity::getMaterialNo).collect(Collectors.toList()));
-            children.forEach(c -> {
-                if (!StrUtil.equalsIgnoreCase(BomConstant.PROJECT_TYPE_TEMPORARY, c.getProjectType())
-                        && StrUtil.isNotEmpty(c.getMaterialNo())) {
-                    BaseMaterialVO materialVO = materialVOS.stream()
-                            .filter(m -> StrUtil.equals(m.getMaterialNo(), c.getMaterialNo()))
-                            .findFirst()
-                            .orElse(null);
-                    if (Objects.nonNull(materialVO)) {
-                        c.setMaterialCategoryCode(materialVO.getMaterialCategoryCode());
+                    .map(BomNewPbomChildEntity::getMaterialNo).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(materialNos)) {
+                List<BaseMaterialVO> materialVOS = materialMainService.getMaterialBaseInfo(materialNos);
+                children.forEach(c -> {
+                    if (!StrUtil.equalsIgnoreCase(BomConstant.PROJECT_TYPE_TEMPORARY, c.getProjectType())
+                            && StrUtil.isNotEmpty(c.getMaterialNo())) {
+                        BaseMaterialVO materialVO = materialVOS.stream()
+                                .filter(f -> !StrUtil.equalsIgnoreCase(BomConstant.PROJECT_TYPE_TEMPORARY, f.getProjectType())
+                                        && StrUtil.equals(f.getMaterialNo(), c.getMaterialNo()))
+                                .findFirst()
+                                .orElse(null);
+                        if (Objects.nonNull(materialVO)) {
+                            c.setMaterialCategoryCode(materialVO.getMaterialCategoryCode());
+                        }
                     }
-                }
-            });
+                });
+            }
         }
         return children;
     }