From 03c3ae747f82ad22c761c79e7b1c0e0031c57d41 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 四月 2026 20:28:35 +0800
Subject: [PATCH] #出库站点命令下发
---
src/main/java/com/zy/asrs/controller/OpenController.java | 61 +++++++++++-------------------
1 files changed, 23 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 792590a..669f683 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -27,6 +27,7 @@
import com.zy.core.thread.StationThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
+import com.zy.system.service.HighPrivilegeGrantService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,8 +35,9 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -61,6 +63,10 @@
private ConfigService configService;
@Autowired
private DeviceConfigService deviceConfigService;
+ @Autowired
+ private HighPrivilegeGrantService highPrivilegeGrantService;
+ @Autowired
+ private HttpServletRequest request;
// 绉诲簱浠诲姟
@PostMapping("/createLocMoveTask")
@@ -112,42 +118,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();
}
-
- 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();
+ return R.error("鐢熸垚鎵归噺鍑哄簱浠诲姟澶辫触");
}
@PostMapping("/completeTask")
@@ -169,7 +144,7 @@
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
- boolean completeTask = commonService.cancelTask(param);
+ boolean completeTask = commonService.cancelTask(param, false);
if (completeTask) {
return R.ok();
}
@@ -195,7 +170,7 @@
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
- CancelTaskBatchResult result = commonService.cancelTaskBatch(param);
+ CancelTaskBatchResult result = commonService.cancelTaskBatch(param, false);
return R.ok().add(result);
}
@@ -212,6 +187,16 @@
return R.error("淇敼浠诲姟浼樺厛绾у拰鎵规搴忓彿澶辫触");
}
+ @PostMapping("/cancelOutTaskBatchInfo")
+ @OpenApiLog(memo = "鍙栨秷鍑哄簱浠诲姟鎵规鍜屾壒娆″簭鍙�")
+ public R cancelOutTaskBatchInfo(@RequestBody CancelTaskBatchParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ CancelTaskBatchResult result = commonService.cancelOutTaskBatchInfo(param);
+ return R.ok().add(result);
+ }
+
@PostMapping("/deviceStatus")
// @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
public R getDeviceStatus() {
--
Gitblit v1.9.1