feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化

云

4 天以前 b852254d90e7d1955db31db154193ec8ee84d8b3

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

@@ -26,11 +26,6 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

/**
 * MES 杂项入库单 Controller
 *
 * @author 芋道源码
 */
@Tag(name = "管理后台 - MES 杂项入库单")
@RestController
@RequestMapping("/mes/wm/misc-receipt")
@@ -82,14 +77,23 @@
    }

    @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) {
        miscReceiptService.submitMiscReceipt(id);
    public CommonResult<Boolean> submitMiscReceipt(@RequestParam("id") Long id,
                                                    @RequestParam("processDefinitionKey") String processDefinitionKey) {
        miscReceiptService.submitMiscReceiptApproval(id, processDefinitionKey);
        return success(true);
    }

    @GetMapping("/approval-process-list")
    @Operation(summary = "获得杂项入库审批流程定义列表")
    @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
    public CommonResult<List<java.util.Map<String, Object>>> getApprovalProcessList() {
        return success(miscReceiptService.getMiscReceiptApprovalProcessDefinitionList());
    }

    @PutMapping("/finish")
    @Operation(summary = "执行入库")
    @Parameter(name = "id", description = "编号", required = true)