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

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java

@@ -3,20 +3,26 @@
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.mes.controller.admin.wm.equipmentreceipt.vo.*;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.equipmentreceipt.MesWmEquipmentReceiptDO;
import cn.iocoder.yudao.module.mes.service.wm.equipmentreceipt.MesWmEquipmentReceiptService;
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;
import java.util.Set;

import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

@@ -68,19 +74,26 @@
    }

    @PutMapping("/submit-approval")
    @Operation(summary = "提交设备入库单审批")
    @Operation(summary = "提交设备入库单审批（草稿→审批中），审核人由审批配置统一指定")
    @PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:submit')")
    public CommonResult<Boolean> submitApproval(@RequestParam("id") Long id,
                                                  @RequestParam("processDefinitionKey") String processDefinitionKey) {
        equipmentReceiptService.submitEquipmentReceiptApproval(id, processDefinitionKey);
    public CommonResult<Boolean> submitApproval(@RequestParam("id") Long id) {
        equipmentReceiptService.submitEquipmentReceiptApproval(id);
        return success(true);
    }

    @GetMapping("/approval-process-list")
    @Operation(summary = "获得设备入库审批流程定义列表")
    @PutMapping("/audit")
    @Operation(summary = "审核设备入库单（审批中→已审批/草稿），仅审批人本人可操作")
    @PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:audit')")
    public CommonResult<Boolean> audit(@Valid @RequestBody MesWmEquipmentReceiptAuditReqVO auditReqVO) {
        equipmentReceiptService.auditEquipmentReceipt(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
        return success(true);
    }

    @GetMapping("/approver-ids")
    @Operation(summary = "获得设备入库单的审核人编号集合，供前端判断是否展示审核按钮")
    @PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:query')")
    public CommonResult<List<Map<String, Object>>> approvalProcessList() {
        return success(equipmentReceiptService.getEquipmentReceiptApprovalProcessDefinitionList());
    public CommonResult<Set<Long>> approverIds() {
        return success(equipmentReceiptService.getEquipmentReceiptApproverUserIds());
    }

    @PutMapping("/finish")
@@ -99,4 +112,32 @@
        return success(true);
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得设备入库单导入模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MesWmEquipmentReceiptImportExcelVO> list = Collections.singletonList(
                MesWmEquipmentReceiptImportExcelVO.builder()
                        .code("ER001").name("示例设备入库单")
                        .receiptDate(java.time.LocalDateTime.now())
                        .remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "设备入库单导入模板.xls", "设备入库单列表", MesWmEquipmentReceiptImportExcelVO.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:equipment-receipt:import')")
    public CommonResult<MesWmEquipmentReceiptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                                       @RequestParam(value = "updateSupport", required = false,
                                                                               defaultValue = "false") Boolean updateSupport) throws Exception {
        List<MesWmEquipmentReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmEquipmentReceiptImportExcelVO.class);
        return success(equipmentReceiptService.importEquipmentReceiptList(list, updateSupport));
    }

}