fix 修复bug

xiaoyi

5 天以前 05ab6e3f69a5e73624b2573db043f5923e8f7d8b

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java

@@ -10,16 +10,19 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
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.controller.admin.wm.productsales.vo.MesWmProductSalesImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesShippingReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.vo.MesWmDocImportRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
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;
@@ -27,8 +30,10 @@
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.*;

import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -157,6 +162,38 @@
        return success(true);
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得销售出库单导入模板")
    @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:import')")
    public void importTemplate(HttpServletResponse response) throws IOException {
        List<MesWmProductSalesImportExcelVO> list = Arrays.asList(
                MesWmProductSalesImportExcelVO.builder()
                        .salesCode("XSCK2026030001").salesName("3月第一批销售出库")
                        .clientName("示例客户").salesDate("2026-03-01").salesOrderCode("SO2026030001")
                        .contactName("张三").contactTelephone("13800138000")
                        .contactAddress("新疆乌鲁木齐市示例路 1 号").carrier("顺丰快递").shippingNumber("SF1234567890")
                        .itemCode("ITEM_RAW_001").quantity(new BigDecimal("100"))
                        .remark("示例：同一出库单号的多行会归并为一张单据").build(),
                MesWmProductSalesImportExcelVO.builder()
                        .salesCode("XSCK2026030001").salesName("3月第一批销售出库")
                        .clientName("示例客户").salesDate("2026-03-01").salesOrderCode("SO2026030001")
                        .itemCode("ITEM_RAW_002").quantity(new BigDecimal("50"))
                        .remark("示例：第二行明细").build()
        );
        ExcelUtils.writeTemplate(response, "销售出库单导入模板.xls", "销售出库单", MesWmProductSalesImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入销售出库单")
    @Parameters({
            @Parameter(name = "file", description = "Excel 文件", required = true)
    })
    @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:import')")
    public CommonResult<MesWmDocImportRespVO> importExcel(@RequestParam("file") MultipartFile file) throws Exception {
        List<MesWmProductSalesImportExcelVO> list = ExcelUtils.read(file, MesWmProductSalesImportExcelVO.class);
        return success(productSalesService.importProductSalesList(list));
    }

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

    private List<MesWmProductSalesRespVO> buildRespVOList(List<MesWmProductSalesDO> list) {