From 26784989e73fc36c6315e54939d1b13a50eb5020 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 三月 2026 21:03:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/StationController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StationController.java b/src/main/java/com/zy/asrs/controller/StationController.java
index adc9359..1d3b63d 100644
--- a/src/main/java/com/zy/asrs/controller/StationController.java
+++ b/src/main/java/com/zy/asrs/controller/StationController.java
@@ -70,6 +70,9 @@
}
StationCommand command = stationThread.getCommand(StationCommandType.MOVE, taskNo, stationId, targetStationId, 0);
+ if (command == null) {
+ return R.error("鐢熸垚杈撻�佸懡浠ゅけ璐ワ紝璺緞涓虹┖鎴栦笉鍙揪");
+ }
MessageQueue.offer(SlaveType.Devp, devpNo, new Task(2, command));
return R.ok();
}
@@ -130,6 +133,29 @@
return R.ok();
}
+ @PostMapping("/command/clearPath")
+ public R commandClearPath(@RequestBody StationCommandMoveParam param) {
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getStationId()) || Cools.isEmpty(param.getTaskNo())) {
+ 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.clearPath(param.getTaskNo());
+ if (!cleared) {
+ return R.error("鏈尮閰嶅埌鍙竻鐞嗚矾寰勬垨娓呯悊澶辫触");
+ }
+ return R.ok("娓呯悊璺緞鎴愬姛");
+ }
+
private StationObjModel findStation(Integer stationId) {
if (Cools.isEmpty(stationId)) {
return null;
--
Gitblit v1.9.1