From 320dd02854bc38524934a8b69cfa5d6819d3b6b4 Mon Sep 17 00:00:00 2001 From: luoliming Date: Sun, 23 Jun 2024 16:54:15 +0800 Subject: [PATCH] =?UTF-8?q?PBOM=20=E5=8F=91=E5=B8=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/domain/EBom/EBomToPbomBase.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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 18ef8384..2200a299 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 @@ -230,31 +230,29 @@ public abstract class EBomToPbomBase { */ protected void liftingLayer() { for (BomNewEbomParentVO vo : allBomDetail) { - BomNewEbomParentVO newVo=new BomNewEbomParentVO(); - BeanUtil.copyProperties(vo,newVo); if (StrUtil.isNotBlank(vo.getProjectType()) && vo.getProjectType().equals(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getProductTypeKey())) { BomNewEbomParentVO lastVirtualPackage = getLastVirtualPackage(vo, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE); if (Objects.nonNull(lastVirtualPackage)) { - liftingLayerSummary(lastVirtualPackage, newVo); - newVo.setSourceRowId(String.valueOf(vo.getParentRowId())); - newVo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); - newVo.setParentRowId(lastVirtualPackage.getBomRowId()); - result.add(newVo); + liftingLayerSummary(lastVirtualPackage, vo); + vo.setSourceRowId(String.valueOf(vo.getParentRowId())); + vo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); + vo.setParentRowId(lastVirtualPackage.getBomRowId()); + result.add(vo); } continue; } if (StrUtil.isNotBlank(vo.getProjectType()) && vo.getProjectType().equals(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey())) { BomNewEbomParentVO lastVirtualPackage = getLastVirtualPackage(vo, VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE); if (Objects.nonNull(lastVirtualPackage)) { - liftingLayerSummary(lastVirtualPackage, newVo); + liftingLayerSummary(lastVirtualPackage, vo); vo.setSourceRowId(String.valueOf(vo.getParentRowId())); vo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); vo.setParentRowId(lastVirtualPackage.getBomRowId()); - result.add(newVo); + result.add(vo); } continue; } - result.add(newVo); + result.add(vo); } }