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 d953bb484..29c8c9485 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
@@ -169,4 +169,28 @@ public class MaterialBaseInfo extends BaseVOEntity {
@ApiModelProperty("是否公用: 1-是 2-否")
@Excel(name = "是否公用: 1-是 2-否")
private Integer common;
+
+ @ApiModelProperty("SKU码")
+ private String skuCode;
+
+ @ApiModelProperty("单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty("币制")
+ private String currency;
+
+ @ApiModelProperty("原产国")
+ private String originCountry;
+
+ @ApiModelProperty("HS码")
+ private String hsCode;
+
+ @ApiModelProperty("申报单位")
+ private String declarationUnit;
+
+ @ApiModelProperty("法定单位")
+ private String statutoryUnit;
+
+ @ApiModelProperty("法定第二单位")
+ private String statutorySecondUnit;
}
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 baf2d61d2..25ada58fc 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
@@ -189,4 +189,29 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
@Excel(name = "是否公用: 1-是 2-否")
private Integer common;
+
+ @ApiModelProperty("SKU码")
+ private String skuCode;
+
+ @ApiModelProperty("单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty("币制")
+ private String currency;
+
+ @ApiModelProperty("原产国")
+ private String originCountry;
+
+ @ApiModelProperty("HS码")
+ private String hsCode;
+
+ @ApiModelProperty("申报单位")
+ private String declarationUnit;
+
+ @ApiModelProperty("法定单位")
+ private String statutoryUnit;
+
+ @ApiModelProperty("法定第二单位")
+ private String statutorySecondUnit;
+
}
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 9d9d2b6c8..d2c5e0509 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
@@ -187,4 +187,28 @@ public class MaterialBaseInfoDO extends BaseVOEntity {
@ApiModelProperty("是否公用: 1-是 2-否")
@Excel(name = "是否公用: 1-是 2-否")
private Integer common;
+
+ @ApiModelProperty("SKU码")
+ private String skuCode;
+
+ @ApiModelProperty("单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty("币制")
+ private String currency;
+
+ @ApiModelProperty("原产国")
+ private String originCountry;
+
+ @ApiModelProperty("HS码")
+ private String hsCode;
+
+ @ApiModelProperty("申报单位")
+ private String declarationUnit;
+
+ @ApiModelProperty("法定单位")
+ private String statutoryUnit;
+
+ @ApiModelProperty("法定第二单位")
+ private String statutorySecondUnit;
}
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 0f40a6c79..aeba674ec 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
@@ -190,4 +190,28 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
@ApiModelProperty("是否公用: 1-是 2-否")
@Excel(name = "是否公用: 1-是 2-否")
private Integer common;
+
+ @ApiModelProperty("SKU码")
+ private String skuCode;
+
+ @ApiModelProperty("单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty("币制")
+ private String currency;
+
+ @ApiModelProperty("原产国")
+ private String originCountry;
+
+ @ApiModelProperty("HS码")
+ private String hsCode;
+
+ @ApiModelProperty("申报单位")
+ private String declarationUnit;
+
+ @ApiModelProperty("法定单位")
+ private String statutoryUnit;
+
+ @ApiModelProperty("法定第二单位")
+ private String statutorySecondUnit;
}
diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
index 18c9ba30e..c965523f2 100644
--- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select material_base_info_id, organization_id, organization_name, top_organization_id, shipper_id, shipper_code, shipper_name, material_code, material_name, bar_code, material_classify_code, 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 from material_base_info
+ select material_base_info_id, organization_id, organization_name, top_organization_id, shipper_id, shipper_code, shipper_name, material_code, material_name, bar_code, material_classify_code, 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,sku_code, unit_price, currency, origin_country, hs_code, declaration_unit, statutory_unit, statutory_second_unit from material_base_info