feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java

@@ -3,31 +3,38 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportExcelVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemPageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSaveReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemStatusUpdateReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSyncUpdateReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.category.MdmItemCategoryDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.warehouse.MdmWarehouseDO;
import cn.iocoder.yudao.module.mdm.service.brand.MdmBrandService;
import cn.iocoder.yudao.module.mdm.service.category.MdmItemCategoryService;
import cn.iocoder.yudao.module.mdm.service.item.MdmItemBatchConfigService;
import cn.iocoder.yudao.module.mdm.service.item.MdmItemService;
import cn.iocoder.yudao.module.mdm.service.unit.MdmUnitMeasureService;
import cn.iocoder.yudao.module.mdm.service.warehouse.MdmWarehouseService;
import cn.iocoder.yudao.module.mes.api.item.MesMdItemApi;
import cn.iocoder.yudao.module.mes.api.wm.warehouse.MesWmWarehouseApi;
import cn.iocoder.yudao.module.mes.api.wm.warehouse.dto.MesWmWarehouseRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
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 java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;

@@ -51,7 +58,7 @@
    @Resource
    private MdmUnitMeasureService unitMeasureService;
    @Resource
    private MdmWarehouseService warehouseService;
    private MesWmWarehouseApi mesWmWarehouseApi;
    @Resource
    private MdmBrandService brandService;
    @Resource
@@ -77,6 +84,14 @@
    @PreAuthorize("@ss.hasPermission('mdm:item:update')")
    public CommonResult<Boolean> updateItemStatus(@RequestBody MdmItemStatusUpdateReqVO reqVO) {
        itemService.updateItemStatus(reqVO.getId(), reqVO.getStatus());
        return success(true);
    }

    @PutMapping("/update-sync")
    @Operation(summary = "更新物料同步状态")
    @PreAuthorize("@ss.hasPermission('mdm:item:update')")
    public CommonResult<Boolean> updateItemSync(@Valid @RequestBody MdmItemSyncUpdateReqVO reqVO) {
        itemService.updateItemSync(reqVO.getId(), reqVO.getSync());
        return success(true);
    }

@@ -139,14 +154,14 @@
        });
        Map<Long, MdmUnitMeasureDO> auxUnitMap = unitIds.isEmpty() ?
                Collections.emptyMap() : unitMeasureService.getUnitMeasureMap(unitIds);
        // 批量关联查询仓库名称
        // 批量关联查询仓库名称（使用 MES 仓库）
        Set<Long> warehouseIds = new HashSet<>();
        respList.forEach(resp -> {
            if (resp.getWarehouseId() != null) warehouseIds.add(resp.getWarehouseId());
        });
        Map<Long, MdmWarehouseDO> warehouseMap = warehouseIds.isEmpty() ?
                Collections.emptyMap() : warehouseService.getWarehouseList(warehouseIds).stream()
                        .collect(Collectors.toMap(MdmWarehouseDO::getId, w -> w));
        Map<Long, MesWmWarehouseRespDTO> warehouseMap = warehouseIds.isEmpty() ?
                Collections.emptyMap() : mesWmWarehouseApi.getWarehouseList(warehouseIds).stream()
                        .collect(Collectors.toMap(MesWmWarehouseRespDTO::getId, w -> w));
        // 赋值
        respList.forEach(resp -> {
            // 分类名称
@@ -166,7 +181,7 @@
            if (auxUnit2 != null) {
                resp.setUnitMeasureName3(auxUnit2.getName());
            }
            MdmWarehouseDO warehouse = warehouseMap.get(resp.getWarehouseId());
            MesWmWarehouseRespDTO warehouse = warehouseMap.get(resp.getWarehouseId());
            if (warehouse != null) {
                resp.setWarehouseName(warehouse.getName());
            }
@@ -202,6 +217,30 @@
        return success(respList);
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得导入物料模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MdmItemImportExcelVO> list = Arrays.asList(
                MdmItemImportExcelVO.builder().code("ITEM001").name("示例物料").categoryName("示例分类")
                        .specification("").unitMeasureName("个").unitMeasureName2("").unitMeasureRate1(null)
                        .unitMeasureName3("").unitMeasureRate2(null).brandName("").barCode("")
                        .purchasePrice(null).salesPrice(null).costPrice(null).safetyStock(null)
                        .minStock(null).maxStock(null).expiryDay(null).status(0).remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "物料导入模板.xls", "物料列表", MdmItemImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入物料")
    @PreAuthorize("@ss.hasPermission('mdm:item:import')")
    public CommonResult<MdmItemImportRespVO> importExcel(@Valid MdmItemImportReqVO importReqVO)
            throws Exception {
        List<MdmItemImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), MdmItemImportExcelVO.class);
        return success(itemService.importItemList(list, importReqVO));
    }

    /**
     * 填充物料响应 VO 的关联名称（分类、主单位、辅单位、仓库名称）
     */
@@ -234,11 +273,11 @@
                resp.setUnitMeasureName3(unit3.getName());
            }
        }
        // 默认仓库名称
        // 默认仓库名称（使用 MES 仓库）
        if (resp.getWarehouseId() != null) {
            MdmWarehouseDO warehouse = warehouseService.getWarehouse(resp.getWarehouseId());
            if (warehouse != null) {
                resp.setWarehouseName(warehouse.getName());
            List<MesWmWarehouseRespDTO> warehouses = mesWmWarehouseApi.getWarehouseList(List.of(resp.getWarehouseId()));
            if (!warehouses.isEmpty()) {
                resp.setWarehouseName(warehouses.get(0).getName());
            }
        }
    }