From 51abcc54d73569b1cf2132f89740878205d2cd6c Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 24 Jun 2024 14:13:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=20=E5=8D=95=E4=BD=8Dkg=20?=
 =?UTF-8?q?=E5=8D=95=E9=87=8D=3D=E6=95=B0=E9=87=8F=3D=E6=80=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index b63bd8f0..e40496e4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1786,10 +1786,19 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             if (StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) {
                 baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
+            }else{
+                baseMaterialVO.setUnitWeight(new BigDecimal(0));
             }
             if (ObjectUtil.isNull(baseMaterialVO.getNum())) {
                 baseMaterialVO.setNum(new BigDecimal(1));
             }
+            baseMaterialVO.setTotalWeight(NumberUtil.mul(baseMaterialVO.getUnitWeight(), baseMaterialVO.getNum()));
+
+            //materialUnit KG  单重=数量=总重
+            if(baseMaterialVO.getMaterialUnit().toUpperCase().equals("KG")){
+                baseMaterialVO.setNum(baseMaterialVO.getUnitWeight());
+                baseMaterialVO.setTotalWeight(baseMaterialVO.getUnitWeight());
+            }
 
 
             if (StrUtil.isNotBlank(baseMaterialVO.getMaterialNo())
@@ -1802,7 +1811,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 baseMaterialVO.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_7.getValue());
             }
 
-            baseMaterialVO.setTotalWeight(NumberUtil.mul(baseMaterialVO.getUnitWeight(), baseMaterialVO.getNum()));
+
             return baseMaterialVO;
         }
         throw new NflgBusinessException(STATE.Error, "未查询到相关物料信息");

From 795ff6f6ab1b8823116a4ae6c96be4cb06166859 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 24 Jun 2024 14:16:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?queryMaterial=20=20=E5=8D=95=E4=BD=8Dkg?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E9=87=8F=3D=E5=8D=95=E9=87=8D=3D=E6=80=BB?=
 =?UTF-8?q?=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index e40496e4..8723aa2a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1787,7 +1787,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             if (StrUtil.isNotBlank(materialMainEntity.getMaterialWeight())) {
                 baseMaterialVO.setUnitWeight(new BigDecimal(materialMainEntity.getMaterialWeight()));
             }else{
-                baseMaterialVO.setUnitWeight(new BigDecimal(0));
+                baseMaterialVO.setUnitWeight(null);
             }
             if (ObjectUtil.isNull(baseMaterialVO.getNum())) {
                 baseMaterialVO.setNum(new BigDecimal(1));