diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java index ea8721d8..f52f8ffc 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialWarningController.java @@ -2,7 +2,11 @@ package com.klp.controller; import java.util.List; import java.util.Arrays; +import java.util.stream.Collectors; +import com.klp.domain.bo.WmsMaterialCoilBo; +import com.klp.domain.vo.WmsMaterialCoilVo; +import com.klp.service.IWmsMaterialCoilService; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -35,13 +39,42 @@ import com.klp.common.core.page.TableDataInfo; public class WmsMaterialWarningController extends BaseController { private final IWmsMaterialWarningService iWmsMaterialWarningService; + private final IWmsMaterialCoilService wmsMaterialCoilService; /** * 查询钢卷通用维度告警(长度/厚度/宽度)列表 */ @GetMapping("/list") public TableDataInfo list(WmsMaterialWarningBo bo, PageQuery pageQuery) { - return iWmsMaterialWarningService.queryPageList(bo, pageQuery); + TableDataInfo result = iWmsMaterialWarningService.queryPageList(bo, pageQuery); + // 收集所有钢卷ID,批量查询钢卷信息并填充 + List list = result.getRows(); + if (list != null && !list.isEmpty()) { + String coilIds = list.stream() + .map(WmsMaterialWarningVo::getCoilId) + .filter(java.util.Objects::nonNull) + .distinct() + .map(String::valueOf) + .collect(Collectors.joining(",")); + if (!coilIds.isEmpty()) { + WmsMaterialCoilBo wmsMaterialCoilBo = new WmsMaterialCoilBo(); + wmsMaterialCoilBo.setCoilIds(coilIds); + List coilVos = wmsMaterialCoilService.queryList(wmsMaterialCoilBo); + java.util.Map coilMap = coilVos.stream() + .filter(v -> v.getCoilId() != null) + .collect(java.util.stream.Collectors.toMap( + WmsMaterialCoilVo::getCoilId, + v -> v, + (a, b) -> a)); + for (WmsMaterialWarningVo warning : list) { + WmsMaterialCoilVo coilVo = coilMap.get(warning.getCoilId()); + if (coilVo != null) { + warning.setCoilVo(coilVo); + } + } + } + } + return result; } /** diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java index 87836f54..f9fbee7e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java @@ -43,7 +43,7 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService private final WmsMaterialWarningMapper baseMapper; private final ConfigService configService; - private final IWmsMaterialCoilService wmsMaterialCoilService; + /** * 查询钢卷通用维度告警(长度/厚度/宽度) @@ -60,33 +60,6 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService public TableDataInfo queryPageList(WmsMaterialWarningBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - // 收集所有钢卷ID,批量查询钢卷信息并填充 - List list = result.getRecords(); - if (list != null && !list.isEmpty()) { - String coilIds = list.stream() - .map(WmsMaterialWarningVo::getCoilId) - .filter(java.util.Objects::nonNull) - .distinct() - .map(String::valueOf) - .collect(Collectors.joining(",")); - if (!coilIds.isEmpty()) { - WmsMaterialCoilBo wmsMaterialCoilBo = new WmsMaterialCoilBo(); - wmsMaterialCoilBo.setCoilIds(coilIds); - List coilVos = wmsMaterialCoilService.queryList(wmsMaterialCoilBo); - java.util.Map coilMap = coilVos.stream() - .filter(v -> v.getCoilId() != null) - .collect(java.util.stream.Collectors.toMap( - WmsMaterialCoilVo::getCoilId, - v -> v, - (a, b) -> a)); - for (WmsMaterialWarningVo warning : list) { - WmsMaterialCoilVo coilVo = coilMap.get(warning.getCoilId()); - if (coilVo != null) { - warning.setCoilVo(coilVo); - } - } - } - } return TableDataInfo.build(result); }