From 032e790ce1d57ef6987cbb07b017e2d662538803 Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Sat, 14 Sep 2024 10:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E6=8E=A7=E7=B3=BB=E7=BB=9F=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8C=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java       | 18 ++++++++++++++++++
 1 file changed, 18 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 7b4127cb..ec54efbf 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
@@ -993,6 +993,24 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             EBomToPbomBase eBomToPBom =parent.getMaterialNo().startsWith("31")?  new EBomToPBomFor31(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())):new EBomToPBom(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode()));
             eBomToPBom.convert();
+            //【电控系统】 发货包优化 删除 【直发】【制作】、下的物料  by 10002327 240914
+            if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) {
+                //1、删掉pbom 父级的数据
+                List<BomNewPbomParentEntity> pbomParent = eBomToPBom.getPBomParentResult().stream().filter(p -> (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("直发")) ||
+                        p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("制作")).collect(Collectors.toList());
+                eBomToPBom.getPBomParentResult().removeAll(pbomParent);
+                //2、删掉pbom 子级的数据
+                List<BomNewPbomChildEntity> pbomChild = eBomToPBom.getPBomChildResult().stream()
+                        .filter(c -> pbomParent.stream().map(BomNewPbomParentEntity::getRowId).collect(Collectors.toList()).contains(c.getParentRowId()))
+                        .collect(Collectors.toList());
+                eBomToPBom.getPBomChildResult().removeAll(pbomChild);
+                //3、删掉ebom 父级的数据
+                List<Long> ebomParentIdList = pbomParent.stream().map(BomNewPbomParentEntity::getSourceRowId).collect(Collectors.toList());
+                this.delBatch(ebomParentIdList);
+                //4、删掉ebom 子级的数据
+                ebomChildService.remove(Wrappers.<BomNewEbomChildEntity>lambdaQuery().in(BomNewEbomChildEntity::getParentRowId,ebomParentIdList));
+
+            }
 
             if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) {
                 pBomParentService.saveOrUpdateBatch(eBomToPBom.getPBomParentResult());