feat(wms): 添加调制度和镀层种类字段支持
- 在 WmsMaterialCoil 实体类中新增调制度和镀层种类字段 - 在 WmsMaterialCoilBo 业务对象中添加对应字段定义 - 在 WmsMaterialCoilExportVo 导出视图对象中增加相关字段 - 更新 WmsMaterialCoilMapper.xml 映射文件中的查询语句 - 在 WmsMaterialCoilServiceImpl 服务实现中添加条件查询逻辑 - 扩展字段变更记录功能以支持新字段的跟踪 - 在 WmsMaterialCoilVo 视图对象中添加新字段定义
This commit is contained in:
@@ -138,5 +138,11 @@ public class WmsMaterialCoil extends BaseEntity {
|
||||
|
||||
//发货人
|
||||
private String exportBy;
|
||||
|
||||
|
||||
// 调制度
|
||||
private String temperGrade;
|
||||
// 镀层种类
|
||||
private String coatingType;
|
||||
}
|
||||
|
||||
|
||||
@@ -215,5 +215,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
|
||||
private Boolean onlyScrap;
|
||||
|
||||
private String exportBy;
|
||||
|
||||
|
||||
// 调制度
|
||||
private String temperGrade;
|
||||
// 镀层种类
|
||||
private String coatingType;
|
||||
}
|
||||
|
||||
|
||||
@@ -169,4 +169,9 @@ public class WmsMaterialCoilExportVo {
|
||||
|
||||
// 数据类型
|
||||
private Integer dataType;
|
||||
|
||||
// 调制度
|
||||
private String temperGrade;
|
||||
// 镀层种类
|
||||
private String coatingType;
|
||||
}
|
||||
|
||||
@@ -322,5 +322,11 @@ public class WmsMaterialCoilVo extends BaseEntity {
|
||||
private String exportBy;
|
||||
//发货人昵称
|
||||
private String exportByName;
|
||||
|
||||
|
||||
// 调制度
|
||||
private String temperGrade;
|
||||
// 镀层种类
|
||||
private String coatingType;
|
||||
}
|
||||
|
||||
|
||||
@@ -347,6 +347,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getCreateBy()), "mc.create_by", bo.getCreateBy());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "mc.update_by", bo.getUpdateBy());
|
||||
// 锌层种类和调制度
|
||||
qw.eq(StringUtils.isNotBlank(bo.getCoatingType()), "mc.coating_type", bo.getCoatingType());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getTemperGrade()), "mc.temper_grade", bo.getTemperGrade());
|
||||
// 统一处理 warehouseId 与 warehouseIds:
|
||||
List<Long> warehouseIdList = new ArrayList<>();
|
||||
if (bo.getWarehouseId() != null) {
|
||||
@@ -1740,6 +1743,21 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
if (bo.getPackagingRequirement() != null && !bo.getPackagingRequirement().equals(oldCoil.getPackagingRequirement())) {
|
||||
changedFields.add("包装要求: " + oldCoil.getPackagingRequirement() + " → " + bo.getPackagingRequirement());
|
||||
}
|
||||
if (bo.getItemId() != null && !bo.getItemId().equals(oldCoil.getItemId())) {
|
||||
changedFields.add("物品ID: " + oldCoil.getItemId() + " → " + bo.getItemId());
|
||||
}
|
||||
if (bo.getMaterialType() != null && !bo.getMaterialType().equals(oldCoil.getMaterialType())) {
|
||||
changedFields.add("材料类型: " + oldCoil.getMaterialType() + " → " + bo.getMaterialType());
|
||||
}
|
||||
if (bo.getLength() != null && !bo.getLength().equals(oldCoil.getLength())) {
|
||||
changedFields.add("长度: " + oldCoil.getLength() + " → " + bo.getLength());
|
||||
}
|
||||
if (bo.getTemperGrade() != null && !bo.getTemperGrade().equals(oldCoil.getTemperGrade())) {
|
||||
changedFields.add("调制度: " + oldCoil.getTemperGrade() + " → " + bo.getTemperGrade());
|
||||
}
|
||||
if (bo.getCoatingType() != null && !bo.getCoatingType().equals(oldCoil.getCoatingType())) {
|
||||
changedFields.add("镀层种类: " + oldCoil.getCoatingType() + " → " + bo.getCoatingType());
|
||||
}
|
||||
|
||||
newStep.put("changed_fields", String.join("; ", changedFields));
|
||||
newStep.put("update_time", new java.util.Date());
|
||||
|
||||
@@ -98,7 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
mc.packing_status,
|
||||
mc.sale_id AS saleId,
|
||||
mc.length,
|
||||
w.warehouse_name AS warehouseName,
|
||||
mc.coating_type,
|
||||
mc.temper_grade,
|
||||
su.nick_name AS saleName,
|
||||
aw.actual_warehouse_name AS actualWarehouseName,
|
||||
CASE WHEN mc.item_type = 'raw_material' THEN rm.specification
|
||||
@@ -372,6 +373,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
mc.net_weight AS netWeight,
|
||||
-- 长度
|
||||
mc.length AS length,
|
||||
-- 镀层种类
|
||||
mc.coating_type AS coatingType,
|
||||
-- 调制度
|
||||
mc.temper_grade AS temperGrade,
|
||||
-- 用途(暂无数据源)
|
||||
NULL AS purpose,
|
||||
-- 切边要求
|
||||
|
||||
Reference in New Issue
Block a user