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 cb4b4df6..3cdd2a3f 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 @@ -233,29 +233,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); } }