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 '判级时间索引(可选,根据查询需求添加)',