From f888d1ef703ca1cf6761652516467b096f572270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 4 Sep 2024 14:57:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=9B=B6=E9=83=A8=E4=BB=B6?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=B8=8D=E4=B8=BAKG=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OriginalBom/OriginalBomToEBomV2Convert.java     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 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 11de0fdb..22e37a5b 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
@@ -312,7 +312,11 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
             parentEntity.setMaterialName(baseMaterialVO.getMaterialName());
             parentEntity.setMaterialDesc(baseMaterialVO.getMaterialDesc());
             parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture());
-            parentEntity.setMaterialUnit("KG");
+            parentEntity.setMaterialUnit(baseMaterialVO.getMaterialUnit());
+            if(!baseMaterialVO.getMaterialUnit().equalsIgnoreCase("KG")){
+                parentEntity.setNum(null);
+            }
+//            parentEntity.setMaterialUnit("KG");
             parentEntity.setProjectType("L");
             parentEntity.setDrawingNo(baseMaterialVO.getDrawingNo());
             parentEntity.setRegReplaceIs(1);
@@ -321,6 +325,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
         }
 
 
+
     }
 
     private BaseMaterialVO getCommonMaterialByRel(BomOriginalListVO parentEntity) {
@@ -358,7 +363,11 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
         childEntity.setUnitWeight(parentV.getUnitWeight());
         childEntity.setNum(parentV.getUnitWeight());
         childEntity.setCreatedBy(SessionUtil.getUserCode());
-        childEntity.setMaterialUnit("KG");
+        if(!material.getMaterialUnit().equalsIgnoreCase("KG")){
+            childEntity.setNum(null);
+        }
+        childEntity.setMaterialUnit(material.getMaterialUnit());
+//        childEntity.setMaterialUnit("KG");
         childEntity.setProjectType("L");
         childEntity.setMaterialOriginalUnit(material.getMaterialUnit());
         childEntity.setSourceRowId(parentV.getRowId().toString());