From a2a5f1b9b70be48687ac7f84ebf6aa132c3721e9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 三月 2026 21:18:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6f0447b..f519cd1 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -111,19 +111,11 @@
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
-
- List<CreateOutTaskParam> taskList = param.getTaskList();
- if (taskList == null || taskList.size() == 0) {
- return R.error("浠诲姟鍒楄〃涓嶈兘涓虹┖");
+ boolean result = commonService.createOutTaskBatch(param);
+ if (result) {
+ return R.ok();
}
-
- for (CreateOutTaskParam createOutTaskParam : taskList) {
- if (createOutTaskParam == null) {
- throw new CoolException("浠诲姟鍙傛暟涓嶈兘涓虹┖");
- }
- commonService.createOutTask(createOutTaskParam);
- }
- return R.ok();
+ return R.error("鐢熸垚鎵归噺鍑哄簱浠诲姟澶辫触");
}
@PostMapping("/completeTask")
@@ -152,6 +144,19 @@
return R.error("浠诲姟鍙栨秷澶辫触");
}
+ @PostMapping("/manualRollbackTask")
+ @OpenApiLog(memo = "浠诲姟浜哄伐鍥炴粴")
+ public R manualRollbackTask(@RequestBody ManualRollbackTaskParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ boolean rollback = commonService.manualRollbackTask(param);
+ if (rollback) {
+ return R.ok();
+ }
+ return R.error("浠诲姟浜哄伐鍥炴粴澶辫触");
+ }
+
@PostMapping("/cancelTaskBatch")
@OpenApiLog(memo = "浠诲姟鎵归噺鍙栨秷")
public R cancelTaskBatch(@RequestBody CancelTaskBatchParam param) {
@@ -162,6 +167,19 @@
return R.ok().add(result);
}
+ @PostMapping("/updateTaskPriorityAndBatchSeq")
+ @OpenApiLog(memo = "淇敼浠诲姟浼樺厛绾у拰鎵规搴忓彿")
+ public R updateTaskPriorityAndBatchSeq(@RequestBody UpdateTaskPriorityAndBatchSeqParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ boolean result = commonService.updateTaskPriorityAndBatchSeq(param);
+ if (result) {
+ return R.ok();
+ }
+ return R.error("淇敼浠诲姟浼樺厛绾у拰鎵规搴忓彿澶辫触");
+ }
+
@PostMapping("/deviceStatus")
// @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
public R getDeviceStatus() {
--
Gitblit v1.9.1