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

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.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.order.ErpPurchaseOrderAuditReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
@@ -36,8 +40,10 @@

import java.io.IOException;
import java.math.BigDecimal;
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;
@@ -47,7 +53,7 @@

@Tag(name = "管理后台 - ERP 采购订单")
@RestController
@RequestMapping("/erp/purchase-order")
@RequestMapping({"/purchase/order", "/erp/purchase-order"})
@Validated
public class ErpPurchaseOrderController {

@@ -89,21 +95,28 @@
        return success(true);
    }

    @PostMapping("/submit")
    @Operation(summary = "提交采购订单审批")
    @PutMapping("/submit")
    @Operation(summary = "提交采购订单审批（未提交/审核不通过 → 审批中）")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('erp:purchase-order:update-status')")
    public CommonResult<Boolean> submitPurchaseOrder(@RequestParam("id") Long id,
                                                     @RequestParam("processDefinitionKey") String processDefinitionKey) {
        Long userId = getLoginUserId();
        purchaseOrderService.submitPurchaseOrder(id, processDefinitionKey, userId);
    public CommonResult<Boolean> submitPurchaseOrder(@RequestParam("id") Long id) {
        purchaseOrderService.submitPurchaseOrder(id);
        return success(true);
    }

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

    @GetMapping("/approver-ids")
    @Operation(summary = "获取采购订单审批人编号集合")
    @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')")
    public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
        return success(purchaseOrderService.getPurchaseOrderApproveProcessDefinitionList());
    public CommonResult<Set<Long>> getPurchaseOrderApproverUserIds() {
        return success(purchaseOrderService.getPurchaseOrderApproverUserIds());
    }

    @DeleteMapping("/delete")
@@ -162,6 +175,29 @@
        ExcelUtils.write(response, "采购订单.xls", "数据", ErpPurchaseOrderRespVO.class, list);
    }

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

    @PostMapping("/import")
    @Operation(summary = "导入采购订单")
    @PreAuthorize("@ss.hasPermission('erp:purchase-order:import')")
    public CommonResult<ErpPurchaseOrderImportRespVO> importExcel(@Valid ErpPurchaseOrderImportReqVO importReqVO)
            throws Exception {
        List<ErpPurchaseOrderImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), ErpPurchaseOrderImportExcelVO.class);
        return success(purchaseOrderService.importPurchaseOrderList(list, importReqVO));
    }

    @PostMapping("/confirm-receipt")
    @Operation(summary = "确认收货")
    @Parameter(name = "id", description = "采购订单编号", required = true)