diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java
index 5679a0c1b..c1413a396 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java
@@ -74,5 +74,12 @@ public class MaterialClassify extends BaseVOEntity{
@Excel(name = "是否作废: 1-否 2-是")
private Integer nullify;
+ @ApiModelProperty("收费标准")
+ @Excel(name = "收费标准")
+ private String chargeStandard;
-}
+ @ApiModelProperty("单位")
+ @Excel(name = "单位")
+ private String unit;
+
+}
\ No newline at end of file
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml
index 31a7e19b6..c6879ab23 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml
@@ -25,11 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
- select material_classify_id, organization_id, organization_name, top_organization_id, code, name, level, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify
+ select material_classify_id, organization_id, organization_name, top_organization_id, code, name, level, parent_code,
+ parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by,
+ update_by_name, del_flag,CHARGE_STANDARD,unit
+ from material_classify
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java
index e997694b1..c8155647e 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java
@@ -258,4 +258,13 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
@ApiModelProperty("是否抄码: 1-是 2-否")
@Excel(name = "是否抄码: 1-是 2-否")
private Integer copyCode;
+ @ApiModelProperty("保额")
+ @Excel(name = "保额")
+ private BigDecimal insureAmount;
+
+ @ApiModelProperty(name = "收费标准")
+ private String chargeStandard;
+
+ @ApiModelProperty(name = "单位")
+ private String unit;
}
\ No newline at end of file
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 9e470bc5b..01bc38dd6 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
@@ -227,4 +227,14 @@ public class MaterialBaseInfo extends BaseVOEntity {
@Excel(name = "毛重(kg)")
private BigDecimal grossWeight;
-}
+ @ApiModelProperty("保额")
+ @Excel(name = "保额")
+ private BigDecimal insureAmount;
+
+ @ApiModelProperty(name = "收费标准")
+ private String chargeStandard;
+
+ @ApiModelProperty(name = "单位")
+ private String unit;
+
+}
\ No newline at end of file
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 448ea452e..249a3e103 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
@@ -274,5 +274,13 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
@ApiModelProperty(name = "推送人名称")
private String pushByName;
+ @ApiModelProperty("保额")
+ @Excel(name = "保额")
+ private BigDecimal insureAmount;
+ @ApiModelProperty(name = "收费标准")
+ private String chargeStandard;
+
+ @ApiModelProperty(name = "单位")
+ private String unit;
}
\ No newline at end of file
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 18d71d9d8..0484546e0 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
@@ -250,4 +250,13 @@ public class MaterialBaseInfoDO extends BaseVOEntity {
@ApiModelProperty("更新时间止")
private String updateTimeEnd;
-}
+ @ApiModelProperty("保额")
+ @Excel(name = "保额")
+ private BigDecimal insureAmount;
+
+ @ApiModelProperty(name = "收费标准")
+ private String chargeStandard;
+
+ @ApiModelProperty(name = "单位")
+ private String unit;
+}
\ No newline at end of file
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 ffbd5e729..b24a34567 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
@@ -302,4 +302,13 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
@ApiModelProperty(name = "推送人名称")
private String pushByName;
-}
+ @ApiModelProperty("保额")
+ @Excel(name = "保额")
+ private BigDecimal insureAmount;
+
+ @ApiModelProperty(name = "收费标准")
+ private String chargeStandard;
+
+ @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 bbd6659e7..2def048c8 100644
--- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -64,6 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
@@ -72,7 +75,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.gross_weight,a.push_by_name,
+ 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 (
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