fix(mes): 修复批次正反向追溯链路

liu

2026-10-24 3990ae574c221e3764ce9cbc2e4e3eb71b7b1b52

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java

@@ -5,6 +5,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.warehouse.vo.area.MesWmWarehouseAreaImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaSaveReqVO;
@@ -16,13 +19,17 @@
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
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;
import jakarta.validation.Valid;
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.util.Collections;
import java.util.List;
import java.util.Map;
@@ -95,6 +102,37 @@
        return success(buildWarehouseAreaRespVOList(list));
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得库位导入模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MesWmWarehouseAreaImportExcelVO> list = Collections.singletonList(
                MesWmWarehouseAreaImportExcelVO.builder()
                        .code("A001").name("示例库位").warehouseName("示例仓库").locationName("示例库区")
                        .type(1).area(new java.math.BigDecimal("20.00"))
                        .maxLoad(new java.math.BigDecimal("1000.00"))
                        .positionX(1).positionY(1).positionZ(1)
                        .status(0).frozen(false).allowItemMixing(true).allowBatchMixing(true)
                        .remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "库位导入模板.xls", "库位列表", MesWmWarehouseAreaImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入库位")
    @Parameters({
            @Parameter(name = "file", description = "Excel 文件", required = true),
            @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true")
    })
    @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:import')")
    public CommonResult<MesWmWarehouseAreaImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                                    @RequestParam(value = "updateSupport", required = false,
                                                                            defaultValue = "false") Boolean updateSupport) throws Exception {
        List<MesWmWarehouseAreaImportExcelVO> list = ExcelUtils.read(file, MesWmWarehouseAreaImportExcelVO.class);
        return success(areaService.importWarehouseAreaList(list, updateSupport));
    }

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

    /**