From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java
index badce9e..12f3008 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java
@@ -113,14 +113,24 @@
buildTaskRespVOList(pageResult.getList()));
}
- @PutMapping("/finish")
- @Operation(summary = "瀹屾垚鐩樼偣浠诲姟")
- @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:finish')")
- public CommonResult<Boolean> finishStockTakingTask(@Valid @RequestBody MesWmStockTakingTaskFinishReqVO reqVO) {
- stockTakingTaskService.finishStockTakingTask(reqVO.getId());
+ @PutMapping("/submit-approval")
+ @Operation(summary = "鎻愪氦鐩樼偣缁撴灉瀹℃壒")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟 Key", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:update')")
+ public CommonResult<Boolean> submitStockTakingTaskResultApproval(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ stockTakingTaskService.submitStockTakingResultApproval(id, processDefinitionKey);
return success(true);
}
+ @GetMapping("/approval-process-list")
+ @Operation(summary = "鑾峰緱鐩樼偣缁撴灉瀹℃壒娴佺▼瀹氫箟鍒楄〃")
+ @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')")
+ public CommonResult<List<Map<String, Object>>> getStockTakingTaskResultApprovalProcessDefinitionList() {
+ return success(stockTakingTaskService.getStockTakingTaskResultApprovalProcessDefinitionList());
+ }
+
@PutMapping("/cancel")
@Operation(summary = "鍙栨秷鐩樼偣浠诲姟")
@Parameter(name = "id", description = "缂栧彿", required = true)
--
Gitblit v1.9.3