From 6cf4a3e2ba925e75b60f13bb8ebc5e92d37809b2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 25 七月 2025 13:53:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index f9b68ff..94c48cd 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -29,14 +29,13 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.dispatcher.ShuttleDispatchUtils;
import com.zy.core.enums.*;
-import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.command.ShuttleAssignCommand;
import com.zy.core.model.command.ShuttleCommand;
import com.zy.core.model.command.ShuttleRedisCommand;
import com.zy.core.model.param.ShuttleMoveLocParam;
import com.zy.core.model.protocol.ShuttleProtocol;
-import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.ShuttleThread;
+import com.zy.core.thread.TrafficControlThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -312,11 +311,11 @@
if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO) {
//绉诲姩鍒扮洰鏍囧簱浣�
- Integer mapType = NavigationMapType.NORMAL.id;
+ List<NavigationMapType> mapTypes = NavigationMapType.getMapTypes(NavigationMapType.NORMAL, NavigationMapType.PATH_LOCK);
if (shuttleProtocol.getHasLift()) {
- mapType = NavigationMapType.DFX.id;
+ mapTypes = NavigationMapType.getMapTypes(NavigationMapType.DFX, NavigationMapType.PATH_LOCK);
}
- List<ShuttleCommand> commands = shuttleOperaUtils.getStartToTargetCommands(shuttleProtocol.getCurrentLocNo(), param.getDistLocNo(), mapType, assignCommand, shuttleThread);
+ List<ShuttleCommand> commands = shuttleOperaUtils.getStartToTargetCommands(shuttleProtocol.getCurrentLocNo(), param.getDistLocNo(), mapTypes, assignCommand, shuttleThread);
if (commands == null) {
throw new CoolException("璺緞璁＄畻澶辫触");
}
@@ -338,20 +337,19 @@
//鎵樼洏涓嬮檷
List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleLiftCommand(assignCommand, shuttleThread, false);
assignCommand.setCommands(commands);
- } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE) {
- //鍏呯數寮�鍏�
- boolean charge = false;
- if (shuttleProtocol.getHasCharge()) {
- //宸插厖鐢碉紝鍏抽棴鍏呯數
- charge = false;
- }else {
- //寮�鍚厖鐢�
- charge = true;
- }
- List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, charge);
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE_ON) {
+ //鍏呯數寮�
+ List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, true);
+ assignCommand.setCommands(commands);
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE_OFF) {
+ //鍏呯數鍏�
+ List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, false);
assignCommand.setCommands(commands);
} else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
//澶嶄綅
+ TrafficControlThread trafficControlThread = (TrafficControlThread) SlaveConnection.get(SlaveType.TrafficControl, 1);
+ trafficControlThread.forceCancelTrafficControl(shuttleProtocol.getShuttleNo());
+
shuttleThread.setSyncTaskNo(0);//宸ヤ綔鍙锋竻绌�
shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//浠诲姟鐘舵��-绌洪棽
shuttleThread.setPakMk(true);//浣滀笟鏍囪澶嶄綅
@@ -360,7 +358,7 @@
return R.ok();
} else if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO_TASK) {
//绉诲姩鍒扮洰鏍囧簱浣�(鐢熸垚绉诲姩浠诲姟)
- shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(WrkIoType.LOC_MOVE.id), param.getDistLocNo(), param.getShuttleNo());
+ shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(WrkIoType.SHUTTLE_MOVE.id), param.getDistLocNo(), param.getShuttleNo());
return R.ok();
} else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_DEMO_OPEN) {
//婕旂ず妯″紡-寮�
--
Gitblit v1.9.1