From 0d1a73f4c0d35951dc42f0e35526d69c0e922afc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 十月 2025 15:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java
index e79f2e8..8739ae6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetInventoryTaskController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.dto.asset.AssetInventoryTaskDTO;
import com.ruoyi.system.dto.asset.AssetInventoryTaskItemDTO;
+import com.ruoyi.system.dto.asset.AssetInventoryTaskItemUpdateDTO;
import com.ruoyi.system.dto.asset.AssetInventoryUserUpdateDTO;
import com.ruoyi.system.query.AssertInventoryQuery;
import com.ruoyi.system.query.InventoryTaskQuery;
@@ -114,7 +115,7 @@
@ApiOperation("开始盘点")
@GetMapping("/start/{id}")
- public R<?> start( @ApiParam(name = "id", value = "盘点任务ID", required = true)
+ public R<?> start(@ApiParam(name = "id", value = "盘点任务ID", required = true)
@PathVariable Integer id){
assetInventoryTaskService.start(id);
return R.ok();
@@ -132,9 +133,27 @@
@ApiOperation("盘点结果处理")
@PostMapping("/result")
- public R<?> handleResult(@RequestBody List<AssetInventoryTaskItemDTO> dtoList) {
+ public R<?> handleResult(@Valid @RequestBody List<AssetInventoryTaskItemDTO> dtoList) {
assetInventoryTaskService.handleResult(dtoList);
return R.ok();
}
+
+ @ApiOperation("取消盘点")
+ @PostMapping("/cancel/{id}")
+ public R<?> cancel (@ApiParam(name = "id", value = "盘点任务ID", required = true)
+ @PathVariable Integer id){
+ if (assetInventoryTaskService.cancel(id)) {
+ return R.ok();
+ } else {
+ return R.fail("取消失败");
+ }
+ }
+
+ @ApiOperation("保存盘点")
+ @PostMapping("/save")
+ public R<?> saveInventory(@Valid @RequestBody List<AssetInventoryTaskItemUpdateDTO> dtoList) {
+ assetInventoryTaskService.saveInventory(dtoList);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1