feat(wms/coil/abnormal): 新增钢卷异常记录数据来源与工序来源
在WmsCoilAbnormal实体及相关业务对象中新增以下字段: 1. 数据来源(sourceSystem):标识数据来自二级系统同步或三级本地录入 2. 工序来源(processSource):记录异常发生的具体工序(如粗轧、精轧等) 调整涉及数据库表结构、Java实体类、业务对象、查询条件及导出映射。调整前,异常记录缺少数据来源和工序信息;调整后,新增字段支持按数据来源和工序进行筛选与统计,提升异常追溯与分析能力。同时为物料钢卷服务中的相关DTO预留字段映射注释。
This commit is contained in:
@@ -123,4 +123,14 @@ public class WmsCoilAbnormal extends BaseEntity {
|
||||
*/
|
||||
private String attachmentFiles;
|
||||
|
||||
/**
|
||||
* 数据来源:2=二级系统同步,3=三级本地录入
|
||||
*/
|
||||
private Integer sourceSystem;
|
||||
|
||||
/**
|
||||
* 工序来源(如:粗轧、精轧、酸洗、退火等)
|
||||
*/
|
||||
private String processSource;
|
||||
|
||||
}
|
||||
|
||||
@@ -120,4 +120,14 @@ public class WmsCoilAbnormalBo extends BaseEntity {
|
||||
*/
|
||||
private String attachmentFiles;
|
||||
|
||||
/**
|
||||
* 数据来源:2=二级系统同步,3=三级本地录入
|
||||
*/
|
||||
private Integer sourceSystem;
|
||||
|
||||
/**
|
||||
* 工序来源(如:粗轧、精轧、酸洗、退火等)
|
||||
*/
|
||||
private String processSource;
|
||||
|
||||
}
|
||||
|
||||
@@ -195,6 +195,10 @@ public class WmsCoilAbnormalExportVo {
|
||||
@ColumnWidth(10)
|
||||
private String plateSurface;
|
||||
|
||||
private String sourceSystem;
|
||||
|
||||
private String processSource;
|
||||
|
||||
/**
|
||||
* 钢卷ID,用于合并单元格的标识(隐藏列)
|
||||
*/
|
||||
|
||||
@@ -145,4 +145,14 @@ public class WmsCoilAbnormalVo extends BaseEntity {
|
||||
*/
|
||||
private String attachmentFiles;
|
||||
|
||||
/**
|
||||
* 数据来源
|
||||
*/
|
||||
private Integer sourceSystem;
|
||||
|
||||
/**
|
||||
* 工序来源
|
||||
*/
|
||||
private String processSource;
|
||||
|
||||
}
|
||||
|
||||
@@ -80,6 +80,8 @@ public class WmsCoilAbnormalServiceImpl implements IWmsCoilAbnormalService {
|
||||
lqw.eq(bo.getJudgeTime() != null, WmsCoilAbnormal::getJudgeTime, bo.getJudgeTime());
|
||||
lqw.eq(bo.getMainMark() != null, WmsCoilAbnormal::getMainMark, bo.getMainMark());
|
||||
lqw.eq(bo.getWholeCoilMark() != null, WmsCoilAbnormal::getWholeCoilMark, bo.getWholeCoilMark());
|
||||
lqw.eq(bo.getSourceSystem() != null, WmsCoilAbnormal::getSourceSystem, bo.getSourceSystem());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getProcessSource()), WmsCoilAbnormal::getProcessSource, bo.getProcessSource());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
@@ -5779,6 +5779,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
dto.setWholeCoilMark(abnormal.getWholeCoilMark() != null ? abnormal.getWholeCoilMark().toString() : "");
|
||||
dto.setAbnormalRemark(abnormal.getRemark() != null ? abnormal.getRemark() : "");
|
||||
dto.setPlateSurface(abnormal.getPlateSurface() != null ? abnormal.getPlateSurface() : "");
|
||||
// dto.setSourceSystem(abnormal.getSourceSystem() != null ? abnormal.getSourceSystem().toString() : "");
|
||||
// dto.setProcessSource(abnormal.getProcessSource() != null ? abnormal.getProcessSource() : "");
|
||||
} else {
|
||||
// 空异常信息
|
||||
dto.setProductionLine("");
|
||||
@@ -5798,6 +5800,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
dto.setWholeCoilMark("");
|
||||
dto.setAbnormalRemark("");
|
||||
dto.setPlateSurface("");
|
||||
// dto.setSourceSystem("");
|
||||
// dto.setProcessSource("");
|
||||
}
|
||||
|
||||
return dto;
|
||||
|
||||
Reference in New Issue
Block a user