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 64ed6fd5..9ec1fc54 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(null);
             }
             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, "未查询到相关物料信息");