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 119bd3c2a..19953912e 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
@@ -281,6 +281,9 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
@ApiModelProperty(name = "收费标准")
private BigDecimal chargeStandard;
+ @ApiModelProperty(name = "物料分类收费标准")
+ private BigDecimal chargeStandardClass;
+
@ApiModelProperty(name = "单位")
private String unit;
}
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
index 2def048c8..259004ab2 100644
--- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -76,9 +77,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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.gross_weight,a.push_by_name,a.unit,a.INSURE_AMOUNT,a.CHARGE_STANDARD,
- specification_model as specification_model,nvl(b.stock_qty,0) as stock_quantity from material_base_info a left join (
+ specification_model as specification_model,nvl(b.stock_qty,0) as stock_quantity,c.charge_standard as charge_standard_class
+
+ 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
+ ) b on a.material_base_info_id = b.material_base_info_id left join "NGWL_TEST_SYSTEM"."MATERIAL_CLASSIFY" c on a.MATERIAL_CLASSIFY_CODE = c. CODE