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

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java

@@ -8,6 +8,10 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestAuditReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
@@ -36,18 +40,19 @@
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;

import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;

@Tag(name = "管理后台 - ERP 采购申请")
@RestController
@RequestMapping({"/erp/purchase-request", "/purchase/request"})
@RequestMapping({"/purchase/request", "/erp/purchase-request"})
@Validated
public class ErpPurchaseRequestController {

@@ -133,21 +138,53 @@
        ExcelUtils.write(response, "采购申请.xls", "数据", ErpPurchaseRequestRespVO.class, list);
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得导入采购申请模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<ErpPurchaseRequestImportExcelVO> list = Arrays.asList(
                ErpPurchaseRequestImportExcelVO.builder().no("CGSQ-示例-001").requestTime(null)
                        .requestReason("").supplierName("").discountPercent(null).depositPrice(null)
                        .remark("").productCode("").productUnitCode("").productPrice(null)
                        .count(null).taxPercent(null).demandTime(null).qcCheckFlag(false)
                        .itemRemark("").build()
        );
        // 输出
        ExcelUtils.write(response, "采购申请导入模板.xls", "采购申请列表", ErpPurchaseRequestImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入采购申请")
    @PreAuthorize("@ss.hasPermission('erp:purchase-request:import')")
    public CommonResult<ErpPurchaseRequestImportRespVO> importExcel(@Valid ErpPurchaseRequestImportReqVO importReqVO)
            throws Exception {
        List<ErpPurchaseRequestImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), ErpPurchaseRequestImportExcelVO.class);
        return success(purchaseRequestService.importPurchaseRequestList(list, importReqVO));
    }

    @PutMapping("/submit")
    @Operation(summary = "提交采购申请审批")
    @Operation(summary = "提交采购申请审批（未提交/审核不通过 → 审批中），审批人由审批配置统一指定")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('erp:purchase-request:submit')")
    public CommonResult<Boolean> submitPurchaseRequest(@RequestParam("id") Long id,
                                                       @RequestParam("processDefinitionKey") String processDefinitionKey) {
        Long userId = getLoginUserId();
        purchaseRequestService.submitPurchaseRequest(id, processDefinitionKey, userId);
    public CommonResult<Boolean> submitPurchaseRequest(@RequestParam("id") Long id) {
        purchaseRequestService.submitPurchaseRequest(id);
        return success(true);
    }

    @GetMapping("/approve-process-list")
    @Operation(summary = "获取采购申请审批流程列表")
    @PutMapping("/audit")
    @Operation(summary = "审核采购申请（审批中 → 审核通过/审核不通过），仅审批人本人可操作")
    @PreAuthorize("@ss.hasPermission('erp:purchase-request:audit')")
    public CommonResult<Boolean> auditPurchaseRequest(@Valid @RequestBody ErpPurchaseRequestAuditReqVO auditReqVO) {
        purchaseRequestService.auditPurchaseRequest(auditReqVO.getId(), auditReqVO.getPass(),
                auditReqVO.getReviewRemark());
        return success(true);
    }

    @GetMapping("/approver-ids")
    @Operation(summary = "获得采购申请的审批人编号集合，供前端判断是否展示审核按钮")
    @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
    public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
        return success(purchaseRequestService.getPurchaseRequestApproveProcessDefinitionList());
    public CommonResult<Set<Long>> getApproverUserIds() {
        return success(purchaseRequestService.getPurchaseRequestApproverUserIds());
    }

    @PostMapping("/generate-order")