Merge remote-tracking branch 'origin/dev_20260429' into dev_20260429

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java

@@ -207,6 +207,10 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
 
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
     /**
      * 规格型号
      */

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

@@ -389,4 +389,9 @@ public class MaterialBaseInfo extends BaseVOEntity{
     @ApiModelProperty("是否抄码: 1-是 2-否")
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
+
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
 }

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

@@ -365,6 +365,10 @@ public class MaterialBaseInfoPO extends BaseVOEntity{
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
 
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
     @ApiModelProperty("商品规则")
     private MaterialGoodsRuleFeign materialGoodsRule;
 

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

@@ -385,4 +385,9 @@ public class MaterialBaseInfoDO extends BaseVOEntity{
     @ApiModelProperty("是否抄码: 1-是 2-否")
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
+
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
 }

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

@@ -364,4 +364,9 @@ public class MaterialBaseInfoDTO extends BaseVOEntity{
     @ApiModelProperty("是否抄码: 1-是 2-否")
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
+
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
 }

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

@@ -48,6 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result column="material_unit" property="materialUnit" jdbcType="VARCHAR"/>
         <result column="machine_code" property="machineCode" jdbcType="VARCHAR"/>
         <result property="copyCode" column="copy_code"/>
+        <result property="goodsType" column="goods_type"/>
+
     </resultMap>
 
 
@@ -55,7 +57,8 @@ 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,sku_code, unit_price, currency, origin_country, hs_code, declaration_unit, statutory_unit, statutory_second_unit, copy_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, copy_code,
+               goods_type
         from material_base_info
     </sql>
 

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java

@@ -207,6 +207,10 @@ public class MaterialBaseInfo extends BaseVOEntity {
     @TableField("copy_code")
     private Integer copyCode;
 
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
     @ApiModelProperty(name = "推送状态 1-未推送 2-推送中 3-推送成功 4-推送失败")
     private Integer pushStatus;
     @ApiModelProperty(name = "推送时间")

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java

@@ -253,6 +253,10 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
 
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
     @ApiModelProperty("推送状态 1-未推送 2推送中 3-推送成功 4-推送失败")
     private Integer pushStatus;
 

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java

@@ -222,6 +222,10 @@ public class MaterialBaseInfoDO extends BaseVOEntity {
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
 
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
     @ApiModelProperty("推送状态")
     private Integer pushStatus;
 

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

@@ -265,6 +265,10 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     @Excel(name = "是否抄码: 1-是 2-否")
     private Integer copyCode;
 
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
     @ApiModelProperty("推送状态")
     private Integer pushStatus;
 

mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="specificationModel"    column="SPECIFICATION_MODEL"    />
         <result property="stockQuantity"    column="stock_quantity"    />
         <result property="copyCode"    column="copy_code"    />
+        <result property="goodsType"    column="goods_type"    />
         <result property="pushStatus"    column="push_status"    />
         <result property="pushTime"    column="push_time"    />
         <result property="pushBy"    column="push_by"    />
@@ -69,7 +70,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.push_status,a.push_time,a.push_by,a.goods_type,
                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