From cdcf08e70660beb59d8cb2329e3dae0ff963ed01 Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Thu, 26 Sep 2024 10:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90PBOM=E6=97=B6=EF=BC=8Cbom?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AD=90=E9=A1=B9=E7=9A=84=E8=AF=9D=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=85=E7=94=9F=E6=88=90EBOM=E6=AD=A3=E5=BC=8F=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E7=94=9F=E6=88=90PBOM=E4=BB=BB=E5=8A=A12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java   | 8 +++++---
 1 file changed, 5 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 e2328aec..9d66b376 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
@@ -1022,9 +1022,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 //                    //4、删掉ebom 子级的数据
 //                    ebomChildService.remove(Wrappers.<BomNewEbomChildEntity>lambdaQuery().in(BomNewEbomChildEntity::getParentRowId,ebomParentIdList));
 //                }
-                //3、判断parent下是否有子级，如果没有的话，把parent给删除了  物料****因下级全部是F项，仅保存EBOM，未生成PBOM数据
+                //3、判断parent下是否有子级，排除电控系统和仙桃的，如果没有的话，把parent给删除了  物料****因下级全部是F项，仅保存EBOM，未生成PBOM数据 仙桃)
                 List<BomNewPbomParentEntity> emptyChildParentList = eBomToPBom.getPBomParentResult().stream()
-                        .filter(p -> !p.getMaterialDesc().contains("电控系统") && !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
+                        .filter(p -> !p.getMaterialDesc().contains("电控系统") && !p.getMaterialDesc().contains("仙桃)")
+                                && !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
                         .collect(Collectors.toList());
                 if(!emptyChildParentList.isEmpty()){
                     List<BomNewPbomParentEntity> fList = emptyChildParentList.stream().filter(p -> {
@@ -1216,7 +1217,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 eBomToPBom.getPBomChildResult().removeAll(pbomChild);
                 //3、判断parent下是否有子级，如果没有的话，把parent给删除了  物料****因下级全部是F项，仅保存EBOM，未生成PBOM数据
                 List<BomNewPbomParentEntity> emptyChildParentList = eBomToPBom.getPBomParentResult().stream()
-                        .filter(p -> !p.getMaterialDesc().contains("电控系统") && !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
+                        .filter(p -> !p.getMaterialDesc().contains("电控系统") && !p.getMaterialDesc().contains("仙桃)")
+                                && !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
                         .collect(Collectors.toList());
                 if(!emptyChildParentList.isEmpty()){
                     List<BomNewPbomParentEntity> fList = emptyChildParentList.stream().filter(p -> {