From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 12f3008..e80c72a 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
@@ -29,6 +29,7 @@
import java.util.Collections;
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;
@@ -84,7 +85,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐩樼偣浠诲姟")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')")
public CommonResult<MesWmStockTakingTaskRespVO> getStockTakingTask(@RequestParam("id") Long id) {
MesWmStockTakingTaskDO task = stockTakingTaskService.getStockTakingTask(id);
if (task == null) {
@@ -95,7 +95,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐩樼偣浠诲姟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')")
public CommonResult<PageResult<MesWmStockTakingTaskRespVO>> getStockTakingTaskPage(@Valid MesWmStockTakingTaskPageReqVO pageReqVO) {
PageResult<MesWmStockTakingTaskDO> pageResult = stockTakingTaskService.getStockTakingTaskPage(pageReqVO);
return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -114,21 +113,26 @@
}
@PutMapping("/submit-approval")
- @Operation(summary = "鎻愪氦鐩樼偣缁撴灉瀹℃壒")
+ @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);
+ public CommonResult<Boolean> submitStockTakingTaskResultApproval(@RequestParam("id") Long id) {
+ stockTakingTaskService.submitStockTakingResultApproval(id);
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("/audit")
+ @Operation(summary = "瀹℃牳鐩樼偣缁撴灉锛堢粨鏋滃鎵逛腑鈫掑凡瀹屾垚/鐩樼偣涓級锛屼粎瀹℃壒浜烘湰浜哄彲鎿嶄綔")
+ @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:audit')")
+ public CommonResult<Boolean> auditStockTakingTaskResult(@Valid @RequestBody MesWmStockTakingTaskAuditReqVO auditReqVO) {
+ stockTakingTaskService.auditStockTakingResult(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱鐩樼偣缁撴灉瀹℃壒鐨勫鏍镐汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(stockTakingTaskService.getStockTakingTaskApproverUserIds());
}
@PutMapping("/cancel")
--
Gitblit v1.9.3