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

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java

@@ -5,6 +5,9 @@
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.miscreceipt.vo.MesWmMiscReceiptAuditReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptSaveReqVO;
@@ -12,6 +15,7 @@
import cn.iocoder.yudao.module.mes.service.wm.miscreceipt.MesWmMiscReceiptService;
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;
@@ -19,9 +23,12 @@
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.Set;

import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -77,21 +84,27 @@
    }

    @PutMapping("/submit")
    @Operation(summary = "提交杂项入库单审批")
    @Operation(summary = "提交杂项入库单审批（草稿→审批中），审核人由审批配置统一指定")
    @Parameter(name = "id", description = "编号", required = true)
    @Parameter(name = "processDefinitionKey", description = "流程定义 Key", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:submit')")
    public CommonResult<Boolean> submitMiscReceipt(@RequestParam("id") Long id,
                                                    @RequestParam("processDefinitionKey") String processDefinitionKey) {
        miscReceiptService.submitMiscReceiptApproval(id, processDefinitionKey);
    public CommonResult<Boolean> submitMiscReceipt(@RequestParam("id") Long id) {
        miscReceiptService.submitMiscReceiptApproval(id);
        return success(true);
    }

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

    @GetMapping("/approver-ids")
    @Operation(summary = "获得杂项入库单的审核人编号集合，供前端判断是否展示审核按钮")
    @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
    public CommonResult<List<java.util.Map<String, Object>>> getApprovalProcessList() {
        return success(miscReceiptService.getMiscReceiptApprovalProcessDefinitionList());
    public CommonResult<Set<Long>> getApproverUserIds() {
        return success(miscReceiptService.getMiscReceiptApproverUserIds());
    }

    @PutMapping("/finish")
@@ -124,4 +137,32 @@
                BeanUtils.toBean(list, MesWmMiscReceiptRespVO.class));
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得杂项入库单导入模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MesWmMiscReceiptImportExcelVO> list = Collections.singletonList(
                MesWmMiscReceiptImportExcelVO.builder()
                        .code("MR20260302001").name("示例杂项入库单").type(1)
                        .receiptDate(java.time.LocalDateTime.of(2026, 3, 2, 8, 0))
                        .sourceDocType("").sourceDocCode("").remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "杂项入库单导入模板.xls", "杂项入库单列表", MesWmMiscReceiptImportExcelVO.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:misc-receipt:import')")
    public CommonResult<MesWmMiscReceiptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                                  @RequestParam(value = "updateSupport", required = false,
                                                                          defaultValue = "false") Boolean updateSupport) throws Exception {
        List<MesWmMiscReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmMiscReceiptImportExcelVO.class);
        return success(miscReceiptService.importMiscReceiptList(list, updateSupport));
    }

}