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);