Merge branch 'dev_qinhongzhanWMS' into wms_dev

# Conflicts:
#	mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java

@@ -264,12 +264,12 @@ public class InMaterialDetailDTO extends BaseVOEntity {
     private Integer isDifferentType;
 
     // ========== 报关相关明细字段 ==========
-    @ApiModelProperty("规格型号/ITEM（选择物料后自动带出，不可编辑）")
+    @ApiModelProperty("规格型号（选择物料后自动带出，不可编辑）")
     @Excel(name = "规格型号/ITEM")
-    private String specification;
+    private String specificationModel;
 
-    @ApiModelProperty("商品SKU码（选择物料后自动带出，不可编辑）")
-    @Excel(name = "商品SKU码")
+    @ApiModelProperty("SKU码（选择物料后自动带出，不可编辑）")
+    @Excel(name = "SKU码")
     private String skuCode;
 
     @ApiModelProperty("Invoice No.")
@@ -286,7 +286,7 @@ public class InMaterialDetailDTO extends BaseVOEntity {
 
     @ApiModelProperty("申报单位")
     @Excel(name = "申报单位")
-    private String declaredUnit;
+    private String declarationUnit;
 
     @ApiModelProperty("Batch Ref NO's")
     @Excel(name = "Batch Ref NO's")
@@ -298,7 +298,7 @@ public class InMaterialDetailDTO extends BaseVOEntity {
 
     @ApiModelProperty("原产国")
     @Excel(name = "原产国")
-    private String countryOfOrigin;
+    private String originCountry;
 
     @ApiModelProperty("箱号/卡板号")
     @Excel(name = "箱号/卡板号")

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java

@@ -215,6 +215,30 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     @ApiModelProperty("法定第二单位")
     private String statutorySecondUnit;
 
+    @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;
+
     @ApiModelProperty("规格型号")
     private String specificationModel;
 }