From a6726983030b50678bd61f106d285950857487fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Thu, 23 May 2024 11:44:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E4=BB=8Ecad=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B9=B6=E8=BD=AC=E5=88=B0ebom=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF31=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E8=AE=BE=E7=BD=AE=E4=B8=8B=E7=BA=A7=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=BC=96=E5=8F=B7=E4=BB=A5=E4=BE=9B=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=E7=94=9F=E6=88=90=E8=99=9A=E6=8B=9F=E5=8C=85=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OriginalBom/OriginalBomToEBomV2Convert.java       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 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 9d29bbf5..bf3332f8 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
@@ -268,7 +268,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
                 }
 
             }
-            buildEBomChild(childVo, parentEntity.getEBomRowId());
+            buildEBomChild(childVo, parentEntity);
         }
     }
 
@@ -411,14 +411,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
 
     }
 
-    private void buildEBomChild(BomOriginalListVO child, Long parentRowId) {
+    private void buildEBomChild(BomOriginalListVO child, BomOriginalListVO parent) {
 
 
         BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity();
         BeanUtil.copyProperties(child, childEntity, "materialGetType");
         childEntity.setRowId(IdWorker.getId());
-        childEntity.setParentRowId(parentRowId);
-        childEntity.setIdentityNo(StrUtil.join("_", parentRowId.toString(), childEntity.getRowId()));
+        childEntity.setParentRowId(parent.getEBomRowId());
+        childEntity.setIdentityNo(StrUtil.join("_", parent.getEBomRowId().toString(), childEntity.getRowId()));
         childEntity.setModifyTime(LocalDateTime.now());
         childEntity.setSourceRowId(StrUtil.isNotBlank(child.getSourceRowId())?child.getSourceRowId(): child.getRowId().toString());
         //当为原材料时，数量=总重  单位改为KG  图号=编码
@@ -428,6 +428,9 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
 //            childEntity.setDrawingNo(childEntity.getMaterialNo());
 //        }
         childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit());
+        if (parent.getMaterialNo().startsWith("31")) {
+            childEntity.setVirtualPartRootMaterialNo(parent.getMaterialNo());
+        }
         this.eBomChildResult.add(childEntity);