From 6f33a9381fc5aa87d93c567d98a2717b216f2848 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 四月 2026 20:25:00 +0800
Subject: [PATCH] #取消出库优化
---
src/main/java/com/zy/asrs/controller/OpenController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 062ca37..669f683 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -27,12 +27,15 @@
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;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+
+import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
@@ -60,6 +63,10 @@
private ConfigService configService;
@Autowired
private DeviceConfigService deviceConfigService;
+ @Autowired
+ private HighPrivilegeGrantService highPrivilegeGrantService;
+ @Autowired
+ private HttpServletRequest request;
// 绉诲簱浠诲姟
@PostMapping("/createLocMoveTask")
@@ -137,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();
}
@@ -163,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);
}
--
Gitblit v1.9.1