From f5c1aecd5693f63038b124cc570f7789c46adfce Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 18 May 2026 14:22:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QcInspectionTask实体类中新增belongCompany字段 - 在QcInspectionTaskBo业务对象中新增belongCompany字段 - 在QcInspectionTaskVo视图对象中新增belongCompany字段并配置Excel导出 - 在MyBatis映射文件中添加belongCompany字段映射 - 在查询条件中添加所属单位模糊匹配功能 --- .../java/com/klp/mes/qc/domain/QcInspectionTask.java | 4 ++++ .../com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java | 5 +++++ .../com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java | 6 ++++++ .../qc/service/impl/QcInspectionTaskServiceImpl.java | 11 ++++++----- .../resources/mapper/qc/QcInspectionTaskMapper.xml | 1 + 5 files changed, 22 insertions(+), 5 deletions(-) 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 20a9ae16..5464c0ab 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 @@ -34,6 +34,10 @@ public class QcInspectionTask extends BaseEntity { * 任务类型（内控/产品检验） */ private String taskType; + /** + * 所属单位 + */ + private String belongCompany; /** * 来源类型（生产/采购/库存） */ 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 479c0e77..ac092ea1 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 @@ -34,6 +34,11 @@ public class QcInspectionTaskBo extends BaseEntity { */ private String taskType; + /** + * 所属单位 + */ + private String belongCompany; + /** * 来源类型（生产/采购/库存） */ 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 80b59e0a..9ef1cd0e 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 @@ -43,6 +43,12 @@ public class QcInspectionTaskVo { @ExcelDictFormat(readConverterExp = "内=控/产品检验") private String taskType; + /** + * 所属单位 + */ + @ExcelProperty(value = "所属单位") + private String belongCompany; + /** * 来源类型（生产/采购/库存） */ 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 5b953efb..c0aec3cb 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 @@ -61,7 +61,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { public TableDataInfo queryPageList(QcInspectionTaskBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - + // 批量查询钢卷信息，避免N+1查询问题 if (result.getRecords() != null && !result.getRecords().isEmpty()) { // 收集所有需要查询的coilIds @@ -71,7 +71,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { allCoilIdsList.add(task.getCoilIds()); } } - + // 如果有需要查询的钢卷ID if (!allCoilIdsList.isEmpty()) { // 将所有coilIds合并成一个大的ID列表 @@ -79,7 +79,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { WmsMaterialCoilBo wmsMaterialCoilBo = new WmsMaterialCoilBo(); wmsMaterialCoilBo.setCoilIds(allCoilIds); List allCoils = wmsMaterialCoilService.queryList(wmsMaterialCoilBo); - + // 为每个任务设置对应的钢卷列表 for (QcInspectionTaskVo task : result.getRecords()) { if (StringUtils.isNotBlank(task.getCoilIds())) { @@ -95,7 +95,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { } } } - + // 从所有钢卷中筛选出属于当前任务的钢卷 List taskCoils = allCoils.stream() .filter(coil -> taskCoilIds.contains(coil.getCoilId())) @@ -105,7 +105,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { } } } - + return TableDataInfo.build(result); } @@ -123,6 +123,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getTaskCode()), QcInspectionTask::getTaskCode, bo.getTaskCode()); lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), QcInspectionTask::getTaskType, bo.getTaskType()); + lqw.like(StringUtils.isNotBlank(bo.getBelongCompany()), QcInspectionTask::getBelongCompany, bo.getBelongCompany()); lqw.eq(StringUtils.isNotBlank(bo.getSourceType()), QcInspectionTask::getSourceType, bo.getSourceType()); lqw.eq(bo.getSourceId() != null, QcInspectionTask::getSourceId, bo.getSourceId()); lqw.eq(bo.getSchemeId() != null, QcInspectionTask::getSchemeId, bo.getSchemeId()); diff --git a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml index 01664e75..860ab064 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml @@ -8,6 +8,7 @@ +