基础信息-物料管理-新增添加货物类型

2026-05-09 14:54:27 +08:00
parent 0ca5bed1f9
commit 93d0f258c3
11 changed files with 45 additions and 2 deletions
@@ -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 = "推送时间")
@@ -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;

@@ -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;

@@ -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;

@@ -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