feat(mes): 新增批量查询方法并优化IPQC/IQC导出功能

云

2026-09-04 3495965b99dfcbf191eefb8294a8de05bedc160a

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java

@@ -1,22 +1,35 @@
package cn.iocoder.yudao.module.mes.controller.admin.qc.oqc;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcQualityExportVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.MesQcIndicatorDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicatorresult.MesQcIndicatorResultDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicatorresult.MesQcIndicatorResultDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcLineMapper;
import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
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.qc.indicator.MesQcIndicatorService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -31,9 +44,14 @@
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -49,11 +67,17 @@
    @Resource
    private MesQcOqcService oqcService;
    @Resource
    private MesMdClientService clientService;
    private CrmCustomerApi customerApi;
    @Resource
    private MesMdItemService itemService;
    @Resource
    private MesMdUnitMeasureService unitMeasureService;
    @Resource
    private MesQcIndicatorResultService indicatorResultService;
    @Resource
    private MesQcIndicatorService indicatorService;
    @Resource
    private MesQcOqcLineMapper oqcLineMapper;

    @Resource
    private AdminUserApi adminUserApi;
@@ -116,8 +140,8 @@
                               HttpServletResponse response) throws IOException {
        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
        List<MesQcOqcDO> list = oqcService.getOqcPage(pageReqVO).getList();
        List<MesQcOqcRespVO> voList = buildOqcRespVOList(list);
        ExcelUtils.write(response, "出货检验单.xls", "数据", MesQcOqcRespVO.class, voList);
        List<MesQcQualityExportVO> exportList = buildOqcQualityExportList(list);
        ExcelUtils.write(response, "出货检验单.xls", "数据", MesQcQualityExportVO.class, exportList);
    }

    // ==================== 拼接 VO ====================
@@ -127,7 +151,7 @@
            return Collections.emptyList();
        }
        // 批量查询客户
        Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
        Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
                convertSet(list, MesQcOqcDO::getClientId));
        // 批量查询物料
        Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
@@ -138,10 +162,12 @@
        // 批量查询检测人员
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                convertSet(list, MesQcOqcDO::getInspectorUserId));
        // 批量查询检验项指标
        Map<Long, String> indicatorSummaryMap = buildIndicatorSummaryMap(list);
        // 拼装 VO
        return BeanUtils.toBean(list, MesQcOqcRespVO.class, vo -> {
            findAndThen(clientMap, vo.getClientId(),
                    client -> vo.setClientNickname(client.getNickname()));
                    client -> vo.setClientNickname(client.getName()));
            findAndThen(itemMap, vo.getItemId(), item -> {
                vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
                findAndThen(unitMeasureMap, item.getUnitMeasureId(),
@@ -149,7 +175,166 @@
            });
            findAndThen(userMap, vo.getInspectorUserId(),
                    user -> vo.setInspectorNickname(user.getNickname()));
            vo.setIndicatorResultSummary(indicatorSummaryMap.getOrDefault(vo.getId(), ""));
        });
    }

    /**
     * 构建导出行：一单一行，检验指标 / 判定依据取自行明细并拼接
     */
    private List<MesQcQualityExportVO> buildOqcQualityExportList(List<MesQcOqcDO> list) {
        if (CollUtil.isEmpty(list)) {
            return Collections.emptyList();
        }
        // 批量查询检测人员
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                convertSet(list, MesQcOqcDO::getInspectorUserId));
        // 批量查询物料
        Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
                convertSet(list, MesQcOqcDO::getItemId));
        // 批量查询行明细
        List<MesQcOqcLineDO> lines = oqcLineMapper.selectListByOqcIds(convertSet(list, MesQcOqcDO::getId));
        Map<Long, List<MesQcOqcLineDO>> lineMap = lines.stream()
                .collect(Collectors.groupingBy(MesQcOqcLineDO::getOqcId));
        // 批量查询检测指标
        Map<Long, MesQcIndicatorDO> indicatorMap = CollUtil.isEmpty(lines) ? Collections.emptyMap()
                : indicatorService.getIndicatorMap(convertSet(lines, MesQcOqcLineDO::getIndicatorId));
        // 批量查询实测值：检验单 ID -> {指标 ID -> 实测值}
        Map<Long, Map<Long, String>> measureMap = buildMeasureValueMap(
                convertSet(list, MesQcOqcDO::getId), MesBizTypeConstants.QC_OQC);
        // 组装导出行
        List<MesQcQualityExportVO> exportList = new ArrayList<>(list.size());
        for (MesQcOqcDO oqc : list) {
            MesQcQualityExportVO vo = new MesQcQualityExportVO();
            vo.setDocName(oqc.getName());
            MesMdItemDO item = itemMap.get(oqc.getItemId());
            vo.setItemName(item != null ? item.getName() : "");
            vo.setBatchNo(oqc.getBatchCode());
            vo.setInspectDate(MesQcQualityExportVO.formatDateTime(oqc.getInspectDate()));
            List<String> indicatorNames = new ArrayList<>();
            List<String> judgementSegments = new ArrayList<>();
            for (MesQcOqcLineDO line : lineMap.getOrDefault(oqc.getId(), Collections.emptyList())) {
                MesQcIndicatorDO indicator = indicatorMap.get(line.getIndicatorId());
                String name = indicator != null && StrUtil.isNotBlank(indicator.getName())
                        ? indicator.getName() : "";
                String range = MesQcQualityExportVO.buildRangeText(
                        line.getStandardValue(), line.getMinThreshold(), line.getMaxThreshold());
                if (StrUtil.isNotBlank(name)) {
                    String measuredValue = measureMap
                            .getOrDefault(oqc.getId(), Collections.emptyMap())
                            .get(line.getIndicatorId());
                    indicatorNames.add(StrUtil.isNotBlank(measuredValue) ? name + ":" + measuredValue : name);
                    if (StrUtil.isNotBlank(range)) {
                        judgementSegments.add(name + range);
                    }
                }
            }
            vo.setIndicatorNames(String.join("、", indicatorNames));
            vo.setJudgementBasis(String.join("；", judgementSegments));
            vo.setCheckResultText(getCheckResultLabel(oqc.getCheckResult()));
            findAndThen(userMap, oqc.getInspectorUserId(),
                    user -> vo.setInspectorName(user.getNickname()));
            // 暂无审核人数据来源，导出空列
            vo.setAuditorName("");
            vo.setRemark(oqc.getRemark());
            exportList.add(vo);
        }
        return exportList;
    }

    /**
     * 构建 检验单 ID -> {指标 ID -> 实测值} 映射，实测值取自检验结果明细表
     */
    private Map<Long, Map<Long, String>> buildMeasureValueMap(Set<Long> qcIds, int qcType) {
        Map<Long, Map<Long, String>> measureMap = new HashMap<>();
        if (CollUtil.isEmpty(qcIds)) {
            return measureMap;
        }
        List<MesQcIndicatorResultDO> results = indicatorResultService.getIndicatorResultListByQcIdsAndType(
                new ArrayList<>(qcIds), qcType);
        if (CollUtil.isEmpty(results)) {
            return measureMap;
        }
        Map<Long, Long> resultQcMap = results.stream()
                .collect(Collectors.toMap(MesQcIndicatorResultDO::getId, MesQcIndicatorResultDO::getQcId));
        List<MesQcIndicatorResultDetailDO> details = indicatorResultService.getIndicatorResultDetailListByResultIds(
                new ArrayList<>(resultQcMap.keySet()));
        if (CollUtil.isEmpty(details)) {
            return measureMap;
        }
        for (MesQcIndicatorResultDetailDO detail : details) {
            Long qcId = resultQcMap.get(detail.getResultId());
            if (qcId == null) {
                continue;
            }
            measureMap.computeIfAbsent(qcId, k -> new HashMap<>())
                    .put(detail.getIndicatorId(), detail.getValue());
        }
        return measureMap;
    }

    private String getCheckResultLabel(Integer checkResult) {
        if (checkResult == null) {
            return "";
        }
        return DictFrameworkUtils.parseDictDataLabel(
                DictTypeConstants.MES_QC_CHECK_RESULT, String.valueOf(checkResult));
    }

    /**
     * 构建每个检验单的检验项指标汇总字符串（qcType = OQC）
     */
    private Map<Long, String> buildIndicatorSummaryMap(List<MesQcOqcDO> list) {
        Map<Long, String> indicatorSummaryMap = new HashMap<>();
        Set<Long> qcIds = convertSet(list, MesQcOqcDO::getId);
        if (CollUtil.isEmpty(qcIds)) {
            return indicatorSummaryMap;
        }
        // 按 QC ID 批量查询检验结果
        List<MesQcIndicatorResultDO> indicatorResults = indicatorResultService.getIndicatorResultListByQcIdsAndType(
                new ArrayList<>(qcIds), MesBizTypeConstants.QC_OQC);
        if (CollUtil.isEmpty(indicatorResults)) {
            return indicatorSummaryMap;
        }
        // 按 QC ID 分组结果
        Map<Long, List<MesQcIndicatorResultDO>> resultMap = indicatorResults.stream()
                .collect(Collectors.groupingBy(MesQcIndicatorResultDO::getQcId));
        // 批量查询检验结果明细
        Set<Long> resultIds = convertSet(indicatorResults, MesQcIndicatorResultDO::getId);
        List<MesQcIndicatorResultDetailDO> indicatorDetails = indicatorResultService.getIndicatorResultDetailListByResultIds(
                new ArrayList<>(resultIds));
        // 按结果 ID 分组明细
        Map<Long, List<MesQcIndicatorResultDetailDO>> detailMapByResultId = indicatorDetails.stream()
                .collect(Collectors.groupingBy(MesQcIndicatorResultDetailDO::getResultId));
        // 批量查询检测指标
        Set<Long> indicatorIds = convertSet(indicatorDetails, MesQcIndicatorResultDetailDO::getIndicatorId);
        Map<Long, MesQcIndicatorDO> indicatorMap = indicatorService.getIndicatorMap(indicatorIds);

        // 构建每个 QC 的指标汇总字符串
        resultMap.forEach((qcId, results) -> {
            List<String> indicatorSummaries = new ArrayList<>();
            for (MesQcIndicatorResultDO result : results) {
                List<MesQcIndicatorResultDetailDO> details = detailMapByResultId.getOrDefault(result.getId(), Collections.emptyList());
                for (MesQcIndicatorResultDetailDO detail : details) {
                    // 通过 indicatorId 关联指标名称，查不到则回退为 "指标"
                    String indicatorName = "指标";
                    MesQcIndicatorDO indicator = indicatorMap.get(detail.getIndicatorId());
                    if (indicator != null && StrUtil.isNotBlank(indicator.getName())) {
                        indicatorName = indicator.getName();
                    }
                    String value = detail.getValue();
                    String remark = detail.getRemark();
                    // 格式化为 "指标名称:值" 或 "指标名称:值(备注)"
                    String indicatorStr = indicatorName + ":" + value;
                    if (StrUtil.isNotBlank(remark)) {
                        indicatorStr += "(" + remark + ")";
                    }
                    indicatorSummaries.add(indicatorStr);
                }
            }
            indicatorSummaryMap.put(qcId, String.join(", ", indicatorSummaries));
        });
        return indicatorSummaryMap;
    }

}