物料管理-新增/编辑-添加毛重,修改汇率管理问题
This commit is contained in:
+4
@@ -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;
|
||||
|
||||
}
|
||||
+4
@@ -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;
|
||||
|
||||
|
||||
+3
@@ -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;
|
||||
}
|
||||
+4
@@ -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;
|
||||
|
||||
}
|
||||
+2
-2
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user