Merge branch 'dev_lzh_wms_20260120' into wms_dev

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java

@@ -209,12 +209,6 @@ public class MaterialBaseInfo extends BaseVOEntity{
     @ApiModelProperty("规格型号")
     @Excel(name = "规格型号")
     private String specificationModel;
-    /**
-     * 商品SKU码
-     */
-    @ApiModelProperty("商品SKU码")
-    @Excel(name = "商品SKU码")
-    private String skucode;
     /**
      * Invoice No
      */
@@ -345,4 +339,27 @@ public class MaterialBaseInfo extends BaseVOEntity{
     @ApiModelProperty("单位")
     @Excel(name = "单位")
     private String unit;
+
+
+    @ApiModelProperty("SKU码")
+    private String skuCode;
+
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+
+    @ApiModelProperty("原产国")
+    private String originCountry;
+
+    @ApiModelProperty("HS码")
+    private String hsCode;
+
+    @ApiModelProperty("申报单位")
+    private String declarationUnit;
+
+    @ApiModelProperty("法定单位")
+    private String statutoryUnit;
+
+    @ApiModelProperty("法定第二单位")
+    private String statutorySecondUnit;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java

@@ -207,12 +207,6 @@ public class MaterialBaseInfoPO extends BaseVOEntity{
     @ApiModelProperty("规格型号")
     @Excel(name = "规格型号")
     private String specificationModel;
-    /**
-     * 商品SKU码
-     */
-    @ApiModelProperty("商品SKU码")
-    @Excel(name = "商品SKU码")
-    private String skucode;
     /**
      * Invoice No
      */
@@ -344,4 +338,26 @@ public class MaterialBaseInfoPO extends BaseVOEntity{
     @Excel(name = "单位")
     private String unit;
 
+
+    @ApiModelProperty("SKU码")
+    private String skuCode;
+
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("原产国")
+    private String originCountry;
+
+    @ApiModelProperty("HS码")
+    private String hsCode;
+
+    @ApiModelProperty("申报单位")
+    private String declarationUnit;
+
+    @ApiModelProperty("法定单位")
+    private String statutoryUnit;
+
+    @ApiModelProperty("法定第二单位")
+    private String statutorySecondUnit;
+
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java

@@ -229,12 +229,6 @@ public class MaterialBaseInfoDO extends BaseVOEntity{
     @ApiModelProperty("规格型号")
     @Excel(name = "规格型号")
     private String specificationModel;
-    /**
-     * 商品SKU码
-     */
-    @ApiModelProperty("商品SKU码")
-    @Excel(name = "商品SKU码")
-    private String skucode;
     /**
      * Invoice No
      */
@@ -365,4 +359,26 @@ public class MaterialBaseInfoDO extends BaseVOEntity{
     @ApiModelProperty("单位")
     @Excel(name = "单位")
     private String unit;
+
+
+    @ApiModelProperty("SKU码")
+    private String skuCode;
+
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("原产国")
+    private String originCountry;
+
+    @ApiModelProperty("HS码")
+    private String hsCode;
+
+    @ApiModelProperty("申报单位")
+    private String declarationUnit;
+
+    @ApiModelProperty("法定单位")
+    private String statutoryUnit;
+
+    @ApiModelProperty("法定第二单位")
+    private String statutorySecondUnit;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java

@@ -207,12 +207,7 @@ public class MaterialBaseInfoDTO extends BaseVOEntity{
     @ApiModelProperty("规格型号")
     @Excel(name = "规格型号")
     private String specificationModel;
-    /**
+
-     * 商品SKU码
-     */
-    @ApiModelProperty("商品SKU码")
-    @Excel(name = "商品SKU码")
-    private String skucode;
     /**
      * Invoice No
      */
@@ -343,4 +338,26 @@ public class MaterialBaseInfoDTO extends BaseVOEntity{
     @ApiModelProperty("单位")
     @Excel(name = "单位")
     private String unit;
+
+
+    @ApiModelProperty("SKU码")
+    private String skuCode;
+
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("原产国")
+    private String originCountry;
+
+    @ApiModelProperty("HS码")
+    private String hsCode;
+
+    @ApiModelProperty("申报单位")
+    private String declarationUnit;
+
+    @ApiModelProperty("法定单位")
+    private String statutoryUnit;
+
+    @ApiModelProperty("法定第二单位")
+    private String statutorySecondUnit;
 }

mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select material_base_info_id, organization_id, organization_name, top_organization_id, shipper_id, 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,material_model,material_unit,machine_code
+               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
         from material_base_info
     </sql>
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java

@@ -54,7 +54,7 @@ public class MaterialBaseInfoApi extends BaseController {
     {
         //转换实体
         MaterialBaseInfoDO materialBaseInfoDO = materialBaseInfoAssembler.toDO(materialBaseInfoDTO);
-        if(materialBaseInfoDTO.getMaterialBaseInfoId() != null){
+        if(1 == materialBaseInfoDTO.getUpdateFeign()){
             return toAjax(materialBaseInfoApplicationService.update(materialBaseInfoDO));
         }else {
             return toAjax(materialBaseInfoApplicationService.insert(materialBaseInfoDO));