From bebf75f3015a9b72ad22b5307c1012ce8b28dbf6 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, 16 Apr 2024 16:27:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8C=85=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=9B=A0pbom=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=9F=E6=9D=90=E6=96=99=EF=BC=8C=E6=89=80?=
 =?UTF-8?q?=E4=BB=A5=E6=9C=89=E7=9A=84bom=E6=98=AF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8C=85=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/PBom/ConvertToMBom1020.java      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom1020.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom1020.java
index 16661f15..c7e8147c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom1020.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom1020.java
@@ -9,7 +9,6 @@ import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
 import com.nflg.product.bomnew.pojo.entity.BomNewMbomParentEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
 import com.nflg.product.bomnew.util.StringUtil;
-import com.nflg.product.bomnew.util.VUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -73,10 +72,14 @@ public class ConvertToMBom1020  extends  ConvertToMBomBase{
 
         for (ConvertToMBomDTO item : childBomTree) {
 
-            ConvertToMBomDTO directDeliveryPackage = item.getChildNodes().stream().filter(u -> VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(u.getVirtualPartType())).collect(Collectors.toList()).get(0);
-            VUtils.isTure(Objects.isNull(directDeliveryPackage)).throwMessage("发货包下,没有直发包");
-
-            recursionHandlerChild1020(item, directDeliveryPackage);
+            ConvertToMBomDTO directDeliveryPackage = item.getChildNodes()
+                    .stream()
+                    .filter(u -> VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.equalsValue(u.getVirtualPartType()))
+                    .findFirst().orElse(null);
+            //VUtils.isTure(Objects.isNull(directDeliveryPackage)).throwMessage("发货包下,没有直发包");
+            if (directDeliveryPackage != null) {
+                recursionHandlerChild1020(item, directDeliveryPackage);
+            }
         }
         //处理制作包无下级的情况
         handEmptyMakePackage(childBomTree);