From 42e5b6dd2bd750cbcf92c06fc187e97de230787e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 3 Jun 2026 15:48:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms/coil/abnormal):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=BC=82=E5=B8=B8=E8=AE=B0=E5=BD=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90=E4=B8=8E=E5=B7=A5=E5=BA=8F=E6=9D=A5?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在WmsCoilAbnormal实体及相关业务对象中新增以下字段： 1. 数据来源（sourceSystem）：标识数据来自二级系统同步或三级本地录入 2. 工序来源（processSource）：记录异常发生的具体工序（如粗轧、精轧等） 调整涉及数据库表结构、Java实体类、业务对象、查询条件及导出映射。调整前，异常记录缺少数据来源和工序信息；调整后，新增字段支持按数据来源和工序进行筛选与统计，提升异常追溯与分析能力。同时为物料钢卷服务中的相关DTO预留字段映射注释。 --- .../src/main/java/com/klp/domain/WmsCoilAbnormal.java | 10 ++++++++++ .../main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java | 10 ++++++++++ .../com/klp/domain/vo/WmsCoilAbnormalExportVo.java | 4 ++++ .../main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java | 10 ++++++++++ .../klp/service/impl/WmsCoilAbnormalServiceImpl.java | 2 ++ .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++++ .../resources/mapper/klp/WmsCoilAbnormalMapper.xml | 2 ++ script/sql/mysql/klp-oa.sql | 2 ++ 8 files changed, 44 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java index c2565838..5be5f7c5 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java @@ -123,4 +123,14 @@ public class WmsCoilAbnormal extends BaseEntity { */ private String attachmentFiles; + /** + * 数据来源：2=二级系统同步，3=三级本地录入 + */ + private Integer sourceSystem; + + /** + * 工序来源（如：粗轧、精轧、酸洗、退火等） + */ + private String processSource; + } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java index c172f4a4..3d51d930 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java @@ -120,4 +120,14 @@ public class WmsCoilAbnormalBo extends BaseEntity { */ private String attachmentFiles; + /** + * 数据来源：2=二级系统同步，3=三级本地录入 + */ + private Integer sourceSystem; + + /** + * 工序来源（如：粗轧、精轧、酸洗、退火等） + */ + private String processSource; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalExportVo.java index 426334b5..6cd67210 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalExportVo.java @@ -195,6 +195,10 @@ public class WmsCoilAbnormalExportVo { @ColumnWidth(10) private String plateSurface; + private String sourceSystem; + + private String processSource; + /** * 钢卷ID，用于合并单元格的标识（隐藏列） */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java index 88dcbee4..910fcbd0 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java @@ -145,4 +145,14 @@ public class WmsCoilAbnormalVo extends BaseEntity { */ private String attachmentFiles; + /** + * 数据来源 + */ + private Integer sourceSystem; + + /** + * 工序来源 + */ + private String processSource; + } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java index abe2e0bc..2a27175e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java @@ -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; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 90b56d80..0c1955be 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -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; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml index b9167d35..b8d323d8 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml @@ -25,6 +25,8 @@ + + diff --git a/script/sql/mysql/klp-oa.sql b/script/sql/mysql/klp-oa.sql index 72f67d76..9d08bfdc 100644 --- a/script/sql/mysql/klp-oa.sql +++ b/script/sql/mysql/klp-oa.sql @@ -3210,6 +3210,8 @@ CREATE TABLE `wms_coil_abnormal` ( `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 '更新人', `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, INDEX `idx_coil_id`(`coil_id` ASC) USING BTREE COMMENT '钢卷ID索引', INDEX `idx_judge_time`(`judge_time` ASC) USING BTREE COMMENT '判级时间索引（可选，根据查询需求添加）',