Merge remote-tracking branch 'origin/dev_business' into dev_business

liu

2026-09-04 569df4daf76eb586f1add62707d0ffa2b7ff20f2

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java

@@ -10,11 +10,14 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockMoveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockRespVO;
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 cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;

@@ -69,7 +72,7 @@
    @Resource
    private MesWmWarehouseAreaService areaService;
    @Resource
    private ErpSupplierApi supplierApi;
    private SrmSupplierApi srmSupplierApi;

    @GetMapping("/get")
    @Operation(summary = "获得库存记录")
@@ -135,6 +138,30 @@
                buildRespVOList(pageResult.getList()));
    }

    @GetMapping("/import-template")
    @Operation(summary = "下载库存现有量导入模板")
    @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:import')")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 输出示例数据，方便使用者参考
        List<MesWmMaterialStockImportExcelVO> list = List.of(
                MesWmMaterialStockImportExcelVO.builder().itemCode("M001").warehouse("原料仓")
                        .location("A区").area("A-01").batchCode("B20260101").vendor("XX供应商")
                        .operationType("覆盖").quantity(new BigDecimal("100")).build()
        );
        ExcelUtils.write(response, "库存现有量导入模板.xls", "库存列表",
                MesWmMaterialStockImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入库存现有量")
    @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:import')")
    public CommonResult<MesWmMaterialStockImportRespVO> importExcel(
            @Valid MesWmMaterialStockImportReqVO importReqVO) throws Exception {
        List<MesWmMaterialStockImportExcelVO> list = ExcelUtils.read(
                importReqVO.getFile(), MesWmMaterialStockImportExcelVO.class);
        return success(materialStockService.importMaterialStockList(list));
    }

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

    private List<MesWmMaterialStockRespVO> buildRespVOList(List<MesWmMaterialStockDO> list) {
@@ -153,9 +180,9 @@
                convertSet(list, MesWmMaterialStockDO::getLocationId));
        Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
                convertSet(list, MesWmMaterialStockDO::getAreaId));
        Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
        Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
                convertSet(list, MesWmMaterialStockDO::getVendorId)).getCheckedData().stream()
                .collect(Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
                .collect(Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
        // 2. 构建结果
        return BeanUtils.toBean(list, MesWmMaterialStockRespVO.class, vo -> {
            MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {