昨天 eccad5a129106377a275be4f7cdc58e99e9b95d4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java
@@ -12,6 +12,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLinePageVO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
@@ -88,8 +89,8 @@
    @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')")
    public CommonResult<PageResult<MesWmReturnIssueLineRespVO>> getReturnIssueLinePage(
            @Valid MesWmReturnIssueLinePageReqVO pageReqVO) {
        PageResult<MesWmReturnIssueLineDO> pageResult = issueLineService.getReturnIssueLinePage(pageReqVO);
        return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
        PageResult<MesWmReturnIssueLinePageVO> pageResult = issueLineService.getReturnIssueLinePage(pageReqVO);
        return success(new PageResult<>(buildRespVOListFromPageVO(pageResult.getList()), pageResult.getTotal()));
    }
    @GetMapping("/list-by-issue")
@@ -104,6 +105,40 @@
    // ==================== 拼接 VO ====================
    /**
     * 分页查询结果构建 RespVO(SQL 已关联 mdm_item,code/name/specification 直接从 PageVO 取)
     */
    private List<MesWmReturnIssueLineRespVO> buildRespVOListFromPageVO(List<MesWmReturnIssueLinePageVO> list) {
        if (CollUtil.isEmpty(list)) {
            return Collections.emptyList();
        }
        // 1. 获得关联数据(计量单位、生产任务)
        Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(
                convertSet(list, MesWmReturnIssueLinePageVO::getItemId));
        Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
        Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
                convertSet(list, MesWmReturnIssueLinePageVO::getTaskId));
        // 2. 构建结果
        return BeanUtils.toBean(list, MesWmReturnIssueLineRespVO.class, vo -> {
            // code/name/specification 从 PageVO 直接映射(字段名不同需手动赋值)
            list.stream()
                    .filter(v -> java.util.Objects.equals(v.getId(), vo.getId()))
                    .findFirst()
                    .ifPresent(pageVO -> {
                        vo.setItemCode(pageVO.getCode());
                        vo.setItemName(pageVO.getName());
                        vo.setSpecification(pageVO.getSpecification());
                    });
            // 计量单位仍需从 itemMap 获取
            MapUtils.findAndThen(itemMap, vo.getItemId(), item ->
                    MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                            unit -> vo.setUnitMeasureName(unit.getName())));
            MapUtils.findAndThen(taskMap, vo.getTaskId(), task ->
                    vo.setTaskCode(task.getCode()).setTaskName(task.getName()));
        });
    }
    private List<MesWmReturnIssueLineRespVO> buildRespVOList(List<MesWmReturnIssueLineDO> list) {
        if (CollUtil.isEmpty(list)) {
            return Collections.emptyList();