From 98a8405682b7c47862d9422391fbfc975c91d3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Tue, 23 Jul 2024 09:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=ACPBOM-=E6=B2=B9=E6=BC=86=E5=8C=85?= =?UTF-8?q?=E9=97=AE=E9=A2=98(1010=E6=97=A0=E9=9C=80=E4=BB=99=E6=A1=83?= =?UTF-8?q?=E6=B2=B9=E6=BC=86=E5=8C=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/EBomToPBomFor31.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/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java index ae74b214..41d751f8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java @@ -68,9 +68,11 @@ public class EBomToPBomFor31 extends EBomToPbomBase { data1010.add(parent); for (BomNewEbomParentVO data : deliveryPackage1010) { List subVos = new ArrayList<>(); - if (data.getMaterialName().contains("仙桃") && !VirtualPackageTypeEnum.PAINT_PACKAGE.equalsValue(data.getVirtualPartType())) { //只获取下降虚拟包(排除仙桃油漆包) - subVos.add(data); - subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList())); + if (data.getMaterialName().contains("仙桃") ) { //只获取下降虚拟包(排除仙桃油漆包) + if(!data.getMaterialName().contains(VirtualPackageTypeEnum.PAINT_PACKAGE.getDescription())) { + subVos.add(data); + subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList())); + } } else { // subVos = result.stream().filter(u -> u.getLevelNumber().compareTo(data.getLevelNumber()) >= 0 && u.getLevelNumber().compareTo(NumberUtil.add(data.getLevelNumber(), BigDecimal.valueOf(0.01))) < 0).collect(Collectors.toList()); subVos=getResultAllSubIncludeSelf(data);