From a5095fe55a166ecff7813aef8ad4dc2833a83e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 15 Aug 2024 22:10:42 +0800
Subject: [PATCH] =?UTF-8?q?F=E6=8F=90=E5=B1=82=E5=90=8E=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E5=8C=85=E8=A6=81=E9=80=92=E5=BD=92=E5=BE=80?=
 =?UTF-8?q?=E4=B8=8A=E6=A3=80=E6=9F=A5=E5=88=A0=E9=99=A42-=E5=85=88?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=91=E7=94=9F=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/EBom/EBomToPbomBase.java   | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
index edc84e7e..74dc3531 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
@@ -739,20 +739,23 @@ public abstract class EBomToPbomBase {
                 else {
                     addEBomNew.add(parentBom.getBomRowId());
                 }
-
-                //如子级都为F 项父级也不转
-                Set<String> projectSet = newParentChild.stream().map(u -> u.getProjectType().toUpperCase()).collect(Collectors.toSet());
-                if (CollUtil.isNotEmpty(projectSet)) {
-                    if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) &&
-                            (ImmutableSet.of("F").equals(projectSet) || ImmutableSet.of("F", "Z").equals(projectSet) || ImmutableSet.of("Z").equals(projectSet))) {
-                        parentBom.setNoConvertToPBomIs(1);
-                        parentBom.setNotToPBomForFZ(BomConstant.YES);
-                        childDelMaterialNos.add(parentBom.getMaterialNo());
-                    }
+            }
+            //如子级都为F 项父级也不转
+            Set<String> projectSet = newParentChild.stream().map(u -> u.getProjectType().toUpperCase()).collect(Collectors.toSet());
+            if (CollUtil.isNotEmpty(projectSet)) {
+                if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(parentBom.getVirtualPartType()) &&
+                        (ImmutableSet.of("F").equals(projectSet) || ImmutableSet.of("F", "Z").equals(projectSet) || ImmutableSet.of("Z").equals(projectSet))) {
+                    parentBom.setNoConvertToPBomIs(1);
+                    parentBom.setNotToPBomForFZ(BomConstant.YES);
+                    childDelMaterialNos.add(parentBom.getMaterialNo());
                 }
             }
 
         }
+        List<BomNewEbomParentVO> FzItem = allBomDetail.stream().filter(u -> StrUtil.isNotBlank(u.getProjectType()) && ImmutableList.of("F", "Z").contains(u.getProjectType())).collect(Collectors.toList());
+        FzItem.forEach(u->{
+            u.setNotToPBomForFZ(BomConstant.YES);
+        });
         //递归 F，Z项所有父级
         handlerFZEmptyBom();
 
@@ -764,9 +767,11 @@ public abstract class EBomToPbomBase {
         List<BomNewEbomParentVO> parentBoms = getParentForAllSubNodeIsNotToPBomForFZ();
         while (CollUtil.isNotEmpty(parentBoms)){
             parentBoms.forEach(u->{
-                u.setNoConvertToPBomIs(1);
-                u.setNotToPBomForFZ(BomConstant.YES);
-                childDelMaterialNos.add(u.getMaterialNo());
+                if (!VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey().equals(u.getVirtualPartType()) && !VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey().equals(u.getVirtualPartType())) {
+                    u.setNoConvertToPBomIs(1);
+                    u.setNotToPBomForFZ(BomConstant.YES);
+                    childDelMaterialNos.add(u.getMaterialNo());
+                }
             });
             parentBoms = getParentForAllSubNodeIsNotToPBomForFZ();
         }
@@ -811,6 +816,10 @@ public abstract class EBomToPbomBase {
 
 
         }
+        List<BomNewEbomParentVO> FzItem = allBomDetail.stream().filter(u -> StrUtil.isNotBlank(u.getProjectType()) && ImmutableList.of("F", "Z").contains(u.getProjectType())).collect(Collectors.toList());
+        FzItem.forEach(u->{
+            u.setNotToPBomForFZ(BomConstant.YES);
+        });
 
         //递归 F，Z项所有父级
         handlerFZEmptyBom();