From 102ee0bda6ab4d372b9daeb3f1f0fa5001ddc46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 27 Jun 2024 11:54:48 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E6=8F=90=E5=B1=82?=
 =?UTF-8?q?=E9=A1=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/domain/EBom/EBomToPbomBase.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 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 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 {