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 @@ +