diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java index 3bef5f0e..db3ef9cb 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java @@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; +import com.klp.domain.vo.WmsMaterialCoilVo; import lombok.Data; @@ -91,5 +92,9 @@ public class QcChemicalItemVo { @ExcelProperty(value = "备注") private String remark; + /** + * 钢卷信息 + */ + private WmsMaterialCoilVo coil; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java index fd3b080e..29853843 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java @@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; +import com.klp.domain.vo.WmsMaterialCoilVo; import lombok.Data; @@ -98,5 +99,9 @@ public class QcPhysicalItemVo { @ExcelProperty(value = "备注") private String remark; + /** + * 钢卷信息 + */ + private WmsMaterialCoilVo coil; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java index 7d737844..fcfd772b 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java @@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; +import com.klp.domain.bo.WmsMaterialCoilBo; +import com.klp.domain.vo.WmsMaterialCoilVo; +import com.klp.service.IWmsMaterialCoilService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.mes.qc.domain.bo.QcChemicalItemBo; @@ -18,6 +21,7 @@ import com.klp.mes.qc.service.IQcChemicalItemService; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.stream.Collectors; /** * 质量的化学成分明细Service业务层处理 @@ -30,6 +34,7 @@ import java.util.Collection; public class QcChemicalItemServiceImpl implements IQcChemicalItemService { private final QcChemicalItemMapper baseMapper; + private final IWmsMaterialCoilService coilService; /** * 查询质量的化学成分明细 @@ -46,7 +51,9 @@ public class QcChemicalItemServiceImpl implements IQcChemicalItemService { public TableDataInfo queryPageList(QcChemicalItemBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + TableDataInfo page = TableDataInfo.build(result); + fillCoilInfo(page.getRows()); + return page; } /** @@ -74,6 +81,21 @@ public class QcChemicalItemServiceImpl implements IQcChemicalItemService { return lqw; } + private void fillCoilInfo(List list) { + if (list == null || list.isEmpty()) { + return; + } + List coilIds = list.stream().map(QcChemicalItemVo::getCoilId).filter(java.util.Objects::nonNull).distinct().collect(Collectors.toList()); + if (coilIds.isEmpty()) { + return; + } + WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo(); + coilBo.setCoilIds(coilIds.stream().map(String::valueOf).collect(Collectors.joining(","))); + List coils = coilService.queryList(coilBo); + Map coilMap = coils.stream().collect(Collectors.toMap(WmsMaterialCoilVo::getCoilId, v -> v, (a, b) -> a)); + list.forEach(v -> v.setCoil(coilMap.get(v.getCoilId()))); + } + /** * 新增质量的化学成分明细 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java index 5e5ca874..8d01ae9d 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java @@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; +import com.klp.domain.bo.WmsMaterialCoilBo; +import com.klp.domain.vo.WmsMaterialCoilVo; +import com.klp.service.IWmsMaterialCoilService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.mes.qc.domain.bo.QcPhysicalItemBo; @@ -18,6 +21,7 @@ import com.klp.mes.qc.service.IQcPhysicalItemService; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.stream.Collectors; /** * 物理性能明细Service业务层处理 @@ -30,6 +34,7 @@ import java.util.Collection; public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService { private final QcPhysicalItemMapper baseMapper; + private final IWmsMaterialCoilService coilService; /** * 查询物理性能明细 @@ -46,7 +51,9 @@ public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService { public TableDataInfo queryPageList(QcPhysicalItemBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + TableDataInfo page = TableDataInfo.build(result); + fillCoilInfo(page.getRows()); + return page; } /** @@ -75,6 +82,21 @@ public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService { return lqw; } + private void fillCoilInfo(List list) { + if (list == null || list.isEmpty()) { + return; + } + List coilIds = list.stream().map(QcPhysicalItemVo::getCoilId).filter(java.util.Objects::nonNull).distinct().collect(Collectors.toList()); + if (coilIds.isEmpty()) { + return; + } + WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo(); + coilBo.setCoilIds(coilIds.stream().map(String::valueOf).collect(Collectors.joining(","))); + List coils = coilService.queryList(coilBo); + Map coilMap = coils.stream().collect(Collectors.toMap(WmsMaterialCoilVo::getCoilId, v -> v, (a, b) -> a)); + list.forEach(v -> v.setCoil(coilMap.get(v.getCoilId()))); + } + /** * 新增物理性能明细 */