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 1ef4fa9c..7bbbbf0b 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 @@ -266,7 +266,7 @@ public abstract class EBomToPbomBase { newEnt.setRowId(IdWorker.getId()); newEnt.setSourceRowId(String.valueOf(firstLevelBom.getParentRowId())); newEnt.setSourceParentMaterialNo(parentVO.getMaterialNo()); - newEnt.setParentRowId(parentVO.getBomRowId()); + newEnt.setParentRowId(directDeliveryVo.getBomRowId()); result.add(newEnt); } } else if (firstLevelBom.getProjectType().equals(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getProductTypeKey())) { @@ -275,7 +275,7 @@ public abstract class EBomToPbomBase { newEnt.setRowId(IdWorker.getId()); newEnt.setSourceRowId(String.valueOf(firstLevelBom.getParentRowId())); newEnt.setSourceParentMaterialNo(parentVO.getMaterialNo()); - newEnt.setParentRowId(parentVO.getBomRowId()); + newEnt.setParentRowId(preAssemblyVo.getBomRowId()); result.add(newEnt); } } else {