From 1e775815bd6bf8dfe95a0d3f995b177a7b916045 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Mon, 1 Jul 2024 23:00:23 +0800
Subject: [PATCH] =?UTF-8?q?ebom-=E6=9D=A5=E6=BA=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OriginalBom/OriginalBomToEBomV2Convert.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
index 121c8ad6..8015d069 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
@@ -335,25 +335,25 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
     }
 
 
-    protected BomNewEbomChildEntity buildCommonEbomChildEntity(BaseMaterialVO material, BomOriginalListVO parent) {
+    protected BomNewEbomChildEntity buildCommonEbomChildEntity(BaseMaterialVO material, BomOriginalListVO parentV) {
         BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity();
-        childEntity.setParentRowId(parent.getEBomRowId() > 0 ? parent.getEBomRowId() : parent.getRowId());
+        childEntity.setParentRowId(parentV.getEBomRowId() > 0 ? parentV.getEBomRowId() : parentV.getRowId());
         childEntity.setOrderNumber("001");
-        childEntity.setIdentityNo(StrUtil.join("-", parent.getMaterialNo(), material.getMaterialNo()));
+        childEntity.setIdentityNo(StrUtil.join("-", parentV.getMaterialNo(), material.getMaterialNo()));
         //图号=物料编码
         childEntity.setDrawingNo(material.getMaterialNo());
         childEntity.setMaterialNo(material.getMaterialNo());
         childEntity.setMaterialName(material.getMaterialName());
         childEntity.setMaterialDesc(material.getMaterialDesc());
         childEntity.setMaterialTexture(material.getMaterial());
-        childEntity.setUnitWeight(parent.getUnitWeight());
-        childEntity.setNum(parent.getUnitWeight());
+        childEntity.setUnitWeight(parentV.getUnitWeight());
+        childEntity.setNum(parentV.getUnitWeight());
         childEntity.setCreatedBy(SessionUtil.getUserCode());
         childEntity.setMaterialUnit("KG");
         childEntity.setProjectType("L");
         childEntity.setMaterialOriginalUnit(material.getMaterialUnit());
-        childEntity.setSourceRowId(parent.getRowId().toString());
-        parent.setBomExist(1);
+        childEntity.setSourceRowId(parentV.getRowId().toString());
+        parentV.setBomExist(1);
 
         // this.eBomChildResult.add(childEntity);
         return childEntity;