From 1bf89831276d685982ad020c607ded1d3d818354 Mon Sep 17 00:00:00 2001 From: luoliming Date: Sun, 23 Jun 2024 16:46:45 +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, 10 insertions(+), 8 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 2200a299..18ef8384 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,29 +230,31 @@ 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, vo); - vo.setSourceRowId(String.valueOf(vo.getParentRowId())); - vo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); - vo.setParentRowId(lastVirtualPackage.getBomRowId()); - result.add(vo); + liftingLayerSummary(lastVirtualPackage, newVo); + newVo.setSourceRowId(String.valueOf(vo.getParentRowId())); + newVo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); + newVo.setParentRowId(lastVirtualPackage.getBomRowId()); + result.add(newVo); } 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, vo); + liftingLayerSummary(lastVirtualPackage, newVo); vo.setSourceRowId(String.valueOf(vo.getParentRowId())); vo.setSourceParentMaterialNo(getParentMaterialNo(vo.getBomRowId())); vo.setParentRowId(lastVirtualPackage.getBomRowId()); - result.add(vo); + result.add(newVo); } continue; } - result.add(vo); + result.add(newVo); } }