From 9079c4f09f4c267576638b5f41c8aa695742a66a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 四月 2026 21:00:46 +0800
Subject: [PATCH] #取消出库优化
---
src/main/java/com/zy/asrs/controller/StationController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StationController.java b/src/main/java/com/zy/asrs/controller/StationController.java
index f2fe531..cecae35 100644
--- a/src/main/java/com/zy/asrs/controller/StationController.java
+++ b/src/main/java/com/zy/asrs/controller/StationController.java
@@ -145,7 +145,7 @@
@PostMapping("/command/clearPath")
public R commandClearPath(@RequestBody StationCommandMoveParam param) {
- if (Cools.isEmpty(param) || Cools.isEmpty(param.getStationId()) || Cools.isEmpty(param.getTaskNo())) {
+ if (param == null || Cools.isEmpty(param.getStationId()) || param.getTaskNo() == null) {
return R.error("缂哄皯鍙傛暟");
}
@@ -166,6 +166,29 @@
return R.ok("娓呯悊璺緞鎴愬姛");
}
+ @PostMapping("/command/clearPathBySlot")
+ public R commandClearPathBySlot(@RequestBody StationCommandMoveParam param) {
+ if (param == null || Cools.isEmpty(param.getStationId()) || param.getSlotIdx() == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+
+ StationObjModel finalStation = findStation(param.getStationId());
+ if (finalStation == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, finalStation.getDeviceNo());
+ if (stationThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ boolean cleared = stationThread.clearPathByStationSlot(param.getStationId(), param.getSlotIdx());
+ if (!cleared) {
+ return R.error("鏈尮閰嶅埌鍙竻鐞嗘Ы浣嶆垨娓呯悊澶辫触");
+ }
+ return R.ok("娓呯悊璺緞鎴愬姛");
+ }
+
private StationObjModel findStation(Integer stationId) {
if (Cools.isEmpty(stationId)) {
return null;
--
Gitblit v1.9.1