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;
|
private String attachmentFiles;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 数据来源:2=二级系统同步,3=三级本地录入
|
||||||
|
*/
|
||||||
|
private Integer sourceSystem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 工序来源(如:粗轧、精轧、酸洗、退火等)
|
||||||
|
*/
|
||||||
|
private String processSource;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,4 +120,14 @@ public class WmsCoilAbnormalBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String attachmentFiles;
|
private String attachmentFiles;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 数据来源:2=二级系统同步,3=三级本地录入
|
||||||
|
*/
|
||||||
|
private Integer sourceSystem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 工序来源(如:粗轧、精轧、酸洗、退火等)
|
||||||
|
*/
|
||||||
|
private String processSource;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -195,6 +195,10 @@ public class WmsCoilAbnormalExportVo {
|
|||||||
@ColumnWidth(10)
|
@ColumnWidth(10)
|
||||||
private String plateSurface;
|
private String plateSurface;
|
||||||
|
|
||||||
|
private String sourceSystem;
|
||||||
|
|
||||||
|
private String processSource;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 钢卷ID,用于合并单元格的标识(隐藏列)
|
* 钢卷ID,用于合并单元格的标识(隐藏列)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -145,4 +145,14 @@ public class WmsCoilAbnormalVo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String attachmentFiles;
|
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.getJudgeTime() != null, WmsCoilAbnormal::getJudgeTime, bo.getJudgeTime());
|
||||||
lqw.eq(bo.getMainMark() != null, WmsCoilAbnormal::getMainMark, bo.getMainMark());
|
lqw.eq(bo.getMainMark() != null, WmsCoilAbnormal::getMainMark, bo.getMainMark());
|
||||||
lqw.eq(bo.getWholeCoilMark() != null, WmsCoilAbnormal::getWholeCoilMark, bo.getWholeCoilMark());
|
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;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5779,6 +5779,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
dto.setWholeCoilMark(abnormal.getWholeCoilMark() != null ? abnormal.getWholeCoilMark().toString() : "");
|
dto.setWholeCoilMark(abnormal.getWholeCoilMark() != null ? abnormal.getWholeCoilMark().toString() : "");
|
||||||
dto.setAbnormalRemark(abnormal.getRemark() != null ? abnormal.getRemark() : "");
|
dto.setAbnormalRemark(abnormal.getRemark() != null ? abnormal.getRemark() : "");
|
||||||
dto.setPlateSurface(abnormal.getPlateSurface() != null ? abnormal.getPlateSurface() : "");
|
dto.setPlateSurface(abnormal.getPlateSurface() != null ? abnormal.getPlateSurface() : "");
|
||||||
|
// dto.setSourceSystem(abnormal.getSourceSystem() != null ? abnormal.getSourceSystem().toString() : "");
|
||||||
|
// dto.setProcessSource(abnormal.getProcessSource() != null ? abnormal.getProcessSource() : "");
|
||||||
} else {
|
} else {
|
||||||
// 空异常信息
|
// 空异常信息
|
||||||
dto.setProductionLine("");
|
dto.setProductionLine("");
|
||||||
@@ -5798,6 +5800,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
dto.setWholeCoilMark("");
|
dto.setWholeCoilMark("");
|
||||||
dto.setAbnormalRemark("");
|
dto.setAbnormalRemark("");
|
||||||
dto.setPlateSurface("");
|
dto.setPlateSurface("");
|
||||||
|
// dto.setSourceSystem("");
|
||||||
|
// dto.setProcessSource("");
|
||||||
}
|
}
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
|
|||||||
@@ -25,6 +25,8 @@
|
|||||||
<result property="wholeCoilMark" column="whole_coil_mark"/>
|
<result property="wholeCoilMark" column="whole_coil_mark"/>
|
||||||
<result property="remark" column="remark"/>
|
<result property="remark" column="remark"/>
|
||||||
<result property="attachmentFiles" column="attachment_files"/>
|
<result property="attachmentFiles" column="attachment_files"/>
|
||||||
|
<result property="sourceSystem" column="source_system"/>
|
||||||
|
<result property="processSource" column="process_source"/>
|
||||||
<result property="delFlag" column="del_flag"/>
|
<result property="delFlag" column="del_flag"/>
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
|
|||||||
@@ -3210,6 +3210,8 @@ CREATE TABLE `wms_coil_abnormal` (
|
|||||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||||
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
|
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
|
||||||
`plate_surface` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上下板面',
|
`plate_surface` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上下板面',
|
||||||
|
`source_system` tinyint NOT NULL DEFAULT 3 COMMENT '数据来源:2=二级系统同步,3=三级本地录入',
|
||||||
|
`process_source` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工序来源(如:粗轧、精轧、酸洗、退火等)',
|
||||||
PRIMARY KEY (`abnormal_id`) USING BTREE,
|
PRIMARY KEY (`abnormal_id`) USING BTREE,
|
||||||
INDEX `idx_coil_id`(`coil_id` ASC) USING BTREE COMMENT '钢卷ID索引',
|
INDEX `idx_coil_id`(`coil_id` ASC) USING BTREE COMMENT '钢卷ID索引',
|
||||||
INDEX `idx_judge_time`(`judge_time` ASC) USING BTREE COMMENT '判级时间索引(可选,根据查询需求添加)',
|
INDEX `idx_judge_time`(`judge_time` ASC) USING BTREE COMMENT '判级时间索引(可选,根据查询需求添加)',
|
||||||
|
|||||||
Reference in New Issue
Block a user