From fb77d052884648998c24efb2bd5a42714d27c55e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 10 May 2024 15:59:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E4=BB=8Eexcel=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6=E7=89=A9=E6=96=99=E5=8D=95=E4=BD=8D=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/EBomImportService.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
index 27ca3154..8bcf24d0 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
@@ -294,6 +294,8 @@ public class EBomImportService {
         child.setDrawingNo(parent.getDrawingNo());
         child.setMaterialDesc(parent.getMaterialDesc());
         child.setUnitWeight(parent.getUnitWeight());
+        child.setMaterialUnit(parent.getMaterialUnit());
+        child.setMaterialOriginalUnit(parent.getMaterialOriginalUnit());
         child.setNum(parent.getNum());
         child.setTotalWeight(parent.getTotalWeight());
         child.setProjectType(projectType);
@@ -324,11 +326,12 @@ public class EBomImportService {
             parent.setUnitWeight(vo.getMaterialWeight());
             parent.setMaterialName(vo.getMaterialName());
             parent.setMaterialTexture(vo.getMaterialTexture());
+            parent.setMaterialUnit(vo.getMaterialUnit());
             if (StrUtil.isBlank(data.getMaterialDesc())) {
                 parent.setMaterialDesc(vo.getMaterialDesc());
             }
         }
-        parent.setMaterialUnit(data.getUnit());
+        parent.setMaterialOriginalUnit(data.getUnit());
         parent.setNum(data.getNum());
         parent.setTotalWeight(BomUtil.calculateTotalWeight(parent.getNum(), parent.getUnitWeight()));
         parent.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
@@ -382,11 +385,12 @@ public class EBomImportService {
             parent.setUnitWeight(vo.getMaterialWeight());
             parent.setMaterialName(vo.getMaterialName());
             parent.setMaterialTexture(vo.getMaterialTexture());
+            parent.setMaterialUnit(vo.getMaterialUnit());
+            parent.setMaterialOriginalUnit(vo.getMaterialUnit());
             if (StrUtil.isBlank(materialDesc)) {
                 parent.setMaterialDesc(vo.getMaterialDesc());
             }
         }
-        parent.setMaterialUnit("PC");
         //parent.setUnitWeight(BigDecimal.ZERO);
         parent.setNum(BigDecimal.ONE);
         //parent.setTotalWeight(BomUtil.calculateTotalWeight(data.getNum(), data.getUnitWeight()));