物料管理-新增/编辑-添加毛重，修改汇率管理问题

2026-05-11 15:55:43 +08:00
parent 594cd7a269
commit e7202f100d
12 changed files with 40 additions and 4 deletions
@@ -211,6 +211,10 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{
    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
    private Integer goodsType;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
    /**
     * 规格型号
     */
@@ -394,4 +394,8 @@ public class MaterialBaseInfo extends BaseVOEntity{
    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
    private Integer goodsType;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
 }
@@ -369,6 +369,10 @@ public class MaterialBaseInfoPO extends BaseVOEntity{
    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
    private Integer goodsType;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
    @ApiModelProperty("商品规则")
    private MaterialGoodsRuleFeign materialGoodsRule;

@@ -390,4 +390,7 @@ public class MaterialBaseInfoDO extends BaseVOEntity{
    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
    private Integer goodsType;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
 }
@@ -369,4 +369,8 @@ public class MaterialBaseInfoDTO extends BaseVOEntity{
    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
    private Integer goodsType;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
 }
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result column="machine_code" property="machineCode" jdbcType="VARCHAR"/>
        <result property="copyCode" column="copy_code"/>
        <result property="goodsType" column="goods_type"/>
-
+        <result property="grossWeight" column="gross_weight"/>
    </resultMap>


@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               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,
-               goods_type
+               goods_type,gross_weight
        from material_base_info
    </sql>

@@ -22,7 +22,7 @@ import static com.mhd.common.core.utils.PageUtils.startPage;

@Api(tags = "汇率管理")
@RestController
-@RequestMapping("exchangeRateApi")
+@RequestMapping("/exchangeRateApi")
 public class ExchangeRateApi {

    @Resource
@@ -220,4 +220,8 @@ public class MaterialBaseInfo extends BaseVOEntity {
    @ApiModelProperty(name = "推送人")
    private Long pushBy;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
 }
@@ -257,6 +257,10 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
    private Integer goodsType;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
    @ApiModelProperty("推送状态 1-未推送 2推送中 3-推送成功 4-推送失败")
    private Integer pushStatus;

@@ -226,6 +226,10 @@ public class MaterialBaseInfoDO extends BaseVOEntity {
    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
    private Integer goodsType;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
    @ApiModelProperty("推送状态")
    private Integer pushStatus;

@@ -269,6 +269,10 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
    @Excel(name = "货物类型:0-物料 1-半成品 2-成品")
    private Integer goodsType;

+    @ApiModelProperty("毛重（kg）")
+    @Excel(name = "毛重（kg）")
+    private BigDecimal grossWeight;
+
    @ApiModelProperty("推送状态")
    private Integer pushStatus;

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="pushStatus"    column="push_status"    />
        <result property="pushTime"    column="push_time"    />
        <result property="pushBy"    column="push_by"    />
+        <result property="grossWeight"    column="gross_weight"    />
    </resultMap>


@@ -70,7 +71,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.goods_type,
+               a.push_status,a.push_time,a.push_by,a.goods_type,a.gross_weight,
               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