fix 修复bug

xiaoyi

4 天以前 05ab6e3f69a5e73624b2573db043f5923e8f7d8b

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java

@@ -8,19 +8,22 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.vo.MesWmDocImportRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -28,8 +31,11 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -47,7 +53,7 @@
    @Resource
    private MesWmItemReceiptService itemReceiptService;
    @Resource
    private ErpSupplierApi supplierApi;
    private SrmSupplierApi srmSupplierApi;
    @Resource
    private MesQcIqcService iqcService;
    @Resource
@@ -165,6 +171,37 @@
        return success(true);
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得采购入库单导入模板")
    @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:import')")
    public void importTemplate(HttpServletResponse response) throws IOException {
        List<MesWmItemReceiptImportExcelVO> list = Arrays.asList(
                MesWmItemReceiptImportExcelVO.builder()
                        .receiptCode("CGRK2026030001").receiptName("3月第一批采购入库")
                        .vendorName("示例供应商").receiptDate("2026-03-01").purchaseOrderCode("PO2026030001")
                        .itemCode("ITEM_RAW_001").receivedQuantity(new BigDecimal("500"))
                        .productionDate("2026-02-20").expireDate("2027-02-19").lotNumber("PB20260220")
                        .remark("示例：同一入库单编码的多行会归并为一张单据").build(),
                MesWmItemReceiptImportExcelVO.builder()
                        .receiptCode("CGRK2026030001").receiptName("3月第一批采购入库")
                        .vendorName("示例供应商").receiptDate("2026-03-01").purchaseOrderCode("PO2026030001")
                        .itemCode("ITEM_RAW_002").receivedQuantity(new BigDecimal("300"))
                        .remark("示例：第二行明细").build()
        );
        ExcelUtils.writeTemplate(response, "采购入库单导入模板.xls", "采购入库单", MesWmItemReceiptImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入采购入库单")
    @Parameters({
            @Parameter(name = "file", description = "Excel 文件", required = true)
    })
    @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:import')")
    public CommonResult<MesWmDocImportRespVO> importExcel(@RequestParam("file") MultipartFile file) throws Exception {
        List<MesWmItemReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmItemReceiptImportExcelVO.class);
        return success(itemReceiptService.importItemReceiptList(list));
    }

    // ==================== 拼接 VO ====================

    private List<MesWmItemReceiptRespVO> buildRespVOList(List<MesWmItemReceiptDO> list) {
@@ -172,9 +209,9 @@
            return Collections.emptyList();
        }
        // 1. 获得关联数据（采购入库使用 ERP 供应商）
        Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
        Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
                convertSet(list, MesWmItemReceiptDO::getVendorId)).getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, v -> v, (a, b) -> a));
                .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
        Map<Long, MesQcIqcDO> iqcMap = iqcService.getIqcMap(
                convertSet(list, MesWmItemReceiptDO::getIqcId));
        Map<Long, MesWmArrivalNoticeDO> noticeMap = arrivalNoticeService.getArrivalNoticeMap(