From 46bc958dc5bac3fd9861284020af5b8883d8e045 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 三月 2026 16:06:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   63 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9bbe2f5..792590a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,6 +4,7 @@
 import com.core.common.Cools;
 import com.core.common.R;
 import com.core.exception.CoolException;
+import com.zy.asrs.domain.Result.CancelTaskBatchResult;
 import com.zy.asrs.domain.param.*;
 import com.zy.asrs.entity.DeviceConfig;
 import com.zy.asrs.entity.LocMast;
@@ -34,6 +35,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -116,13 +118,36 @@
             return R.error("浠诲姟鍒楄〃涓嶈兘涓虹┖");
         }
 
-        for (CreateOutTaskParam createOutTaskParam : taskList) {
+        List<CreateOutTaskParam> sortedTaskList = new ArrayList<>(taskList);
+        sortedTaskList.sort(Comparator.nullsLast(Comparator
+                .comparing(this::getSortableBatch, Comparator.nullsLast(String::compareTo))
+                .thenComparing(this::getSortableBatchSeq, Comparator.nullsLast(Integer::compareTo))));
+
+        for (CreateOutTaskParam createOutTaskParam : sortedTaskList) {
             if (createOutTaskParam == null) {
                 throw new CoolException("浠诲姟鍙傛暟涓嶈兘涓虹┖");
             }
             commonService.createOutTask(createOutTaskParam);
         }
         return R.ok();
+    }
+
+    private String getSortableBatch(CreateOutTaskParam param) {
+        if (param == null) {
+            return null;
+        }
+        String batch = param.getBatch();
+        if (batch == null || batch.trim().isEmpty()) {
+            return null;
+        }
+        return batch;
+    }
+
+    private Integer getSortableBatchSeq(CreateOutTaskParam param) {
+        if (param == null) {
+            return null;
+        }
+        return param.getBatchSeq();
     }
 
     @PostMapping("/completeTask")
@@ -151,6 +176,42 @@
         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) {
+        if (param == null) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖");
+        }
+        CancelTaskBatchResult result = commonService.cancelTaskBatch(param);
+        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