From 37ea2b7d78ca1a0cd0ecea5a5f9968f2464d1e6c Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 29 May 2026 16:19:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E4=B8=BA=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=8E=82=E5=AE=B6=E5=8D=B7?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在质检任务实体、业务对象、值对象及映射文件中新增supplierCoilNos字段,用于记录厂家卷号集合(多个使用英文逗号分隔)。同时,在服务实现类中为查询条件添加对该字段的模糊匹配支持,实现按厂家卷号过滤质检任务的功能。 --- .../main/java/com/klp/mes/qc/domain/QcInspectionTask.java | 4 ++++ .../java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java | 5 +++++ .../java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java | 5 +++++ .../klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java | 1 + .../src/main/resources/mapper/qc/QcInspectionTaskMapper.xml | 1 + 5 files changed, 16 insertions(+) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java index 27899a6d..7f7630b5 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java @@ -94,6 +94,10 @@ public class QcInspectionTask extends BaseEntity { * 附件路径(多个用英文逗号分隔) */ private String attachmentFiles; + /** + * 厂家卷号集合,多个使用英文逗号分隔 + */ + private String supplierCoilNos; /** * 删除标志(0=正常,1=已删除) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java index c734383c..4af28c70 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java @@ -108,4 +108,9 @@ public class QcInspectionTaskBo extends BaseEntity { * 附件路径(多个用英文逗号分隔) */ private String attachmentFiles; + + /** + * 厂家卷号集合,多个使用英文逗号分隔 + */ + private String supplierCoilNos; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java index 1d6e2a14..425c4835 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java @@ -134,6 +134,11 @@ public class QcInspectionTaskVo { */ private String attachmentFiles; + /** + * 厂家卷号集合,多个使用英文逗号分隔 + */ + private String supplierCoilNos; + private List coilList; diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java index 71e0b94c..e003f47a 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java @@ -136,6 +136,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { lqw.eq(StringUtils.isNotBlank(bo.getResult()), QcInspectionTask::getResult, bo.getResult()); lqw.like(StringUtils.isNotBlank(bo.getCoilIds()), QcInspectionTask::getCoilIds, bo.getCoilIds()); lqw.like(StringUtils.isNotBlank(bo.getEnterCoilNos()), QcInspectionTask::getEnterCoilNos, bo.getEnterCoilNos()); + lqw.like(StringUtils.isNotBlank(bo.getSupplierCoilNos()), QcInspectionTask::getSupplierCoilNos, bo.getSupplierCoilNos()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml index 059ce91b..97e24714 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml @@ -23,6 +23,7 @@ +