diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java
index 71517982e..79b899031 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java
@@ -211,6 +211,10 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{
     @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
     private Integer goodsType;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
     /**
      * 规格型号
      */
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java
index e594ff73a..267d6da50 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java
@@ -394,4 +394,8 @@ public class MaterialBaseInfo extends BaseVOEntity{
     @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
     private Integer goodsType;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
 }
\ No newline at end of file
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
index dfaa9e609..28b99e2f6 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
@@ -369,6 +369,10 @@ public class MaterialBaseInfoPO extends BaseVOEntity{
     @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
     private Integer goodsType;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
     @ApiModelProperty("商品规则")
     private MaterialGoodsRuleFeign materialGoodsRule;
 
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
index d5cb6c2ff..a71a79e8e 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
@@ -390,4 +390,7 @@ public class MaterialBaseInfoDO extends BaseVOEntity{
     @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
     private Integer goodsType;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
 }
\ No newline at end of file
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
index 067a9f45d..7704c15c9 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
@@ -369,4 +369,8 @@ public class MaterialBaseInfoDTO extends BaseVOEntity{
     @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
     private Integer goodsType;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
 }
\ No newline at end of file
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
index e511d7f5e..f399c48be 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result column="machine_code" property="machineCode" jdbcType="VARCHAR"/>
         <result property="copyCode" column="copy_code"/>
         <result property="goodsType" column="goods_type"/>
-
+        <result property="grossWeight" column="gross_weight"/>
     </resultMap>
 
 
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                material_classify_name, material_type, material_type_name, pack_id, pack_code, pack_name, unit_code, unit_name, brand_id, brand_code, brand_name, shelf_life, weight_limit,
                volume_limit, material_shape, material_shape_name, material_size, material_length, material_width, material_height, remark, nullify, create_time, create_by, create_by_name,
                update_time, update_by, update_by_name, del_flag, common,material_model,material_unit,machine_code,sku_code, unit_price, currency, origin_country, hs_code, declaration_unit, statutory_unit, statutory_second_unit, copy_code,
-               goods_type
+               goods_type,gross_weight
         from material_base_info
     </sql>
 
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/exchangeRate/ExchangeRateApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/exchangeRate/ExchangeRateApi.java
index 8efc3f8da..ef1cd1e62 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/exchangeRate/ExchangeRateApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/exchangeRate/ExchangeRateApi.java
@@ -22,7 +22,7 @@ import static com.mhd.common.core.utils.PageUtils.startPage;
 
 @Api(tags = "汇率管理")
 @RestController
-@RequestMapping("exchangeRateApi")
+@RequestMapping("/exchangeRateApi")
 public class ExchangeRateApi {
 
     @Resource
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java
index e2a841c65..0acb506a9 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java
@@ -220,4 +220,8 @@ public class MaterialBaseInfo extends BaseVOEntity {
     @ApiModelProperty(name = "推送人")
     private Long pushBy;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
 }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
index 4ea8aa1bb..bc6c3adbd 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
@@ -257,6 +257,10 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
     @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
     private Integer goodsType;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
     @ApiModelProperty("推送状态 1-未推送 2推送中 3-推送成功 4-推送失败")
     private Integer pushStatus;
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
index 4219d4815..18d71d9d8 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
@@ -226,6 +226,10 @@ public class MaterialBaseInfoDO extends BaseVOEntity {
     @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
     private Integer goodsType;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
     @ApiModelProperty("推送状态")
     private Integer pushStatus;
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
index f55a80d2b..b5505a50a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
@@ -269,6 +269,10 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
     private Integer goodsType;
 
+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
     @ApiModelProperty("推送状态")
     private Integer pushStatus;
 
diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
index fd6072c5b..26bc1aad1 100644
--- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pushStatus"    column="push_status"    />
         <result property="pushTime"    column="push_time"    />
         <result property="pushBy"    column="push_by"    />
+        <result property="grossWeight"    column="gross_weight"    />
     </resultMap>
 
 
@@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                material_classify_name, a.material_type, a.material_type_name, a.pack_id, a.pack_code, a.pack_name, a.unit_code, a.unit_name, a.brand_id, a.brand_code, a.brand_name, a.shelf_life, a.weight_limit, a.volume_limit, a.material_shape,
                material_shape_name, a.material_size, a.material_length, a.material_width, a.material_height, a.remark, a.nullify, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, a.common,
                sku_code, a.unit_price, a.currency, a.origin_country, a.hs_code, a.declaration_unit, a.statutory_unit, a.statutory_second_unit, a.copy_code,
-               a.push_status,a.push_time,a.push_by,a.goods_type,
+               a.push_status,a.push_time,a.push_by,a.goods_type,a.gross_weight,
                specification_model as specification_model,nvl(b.stock_qty,0) as stock_quantity from material_base_info a left join (
                select material_base_info_id, sum(INVENTORY_QUANTITY) as stock_qty from MATERIAL_INVENTORY group by material_base_info_id
                ) b on a.material_base_info_id = b.material_base_info_id