From db7e5e8995363db9278544224ddf608b089b6be9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 07 六月 2023 09:01:21 +0800
Subject: [PATCH] 穿梭车方向问题

---
 src/main/java/com/zy/core/thread/ShuttleThread.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index e6eac50..025d0e9 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -210,7 +210,7 @@
 
                 //灏嗗洓鍚戠┛姊溅鐘舵�佷繚瀛樿嚦鏁版嵁搴�
                 BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
-                BasShuttle basShuttle = shuttleService.selectById(shuttleProtocol.getShuttleNo());
+                BasShuttle basShuttle = shuttleService.selectById(slave.getId());
                 if (basShuttle == null) {
                     basShuttle = new BasShuttle();
                     //鍥涘悜绌挎杞﹀彿
@@ -467,10 +467,16 @@
                     commands.add(getPalletCommand(assignCommand.getTaskMode() == 3 ? (short) 1 : (short) 2));
                     break;
                 case 5://寮哄埗宸︾Щ
+                    commands.add(getForceMoveCommand((short) 2));
+                    break;
                 case 6://寮哄埗鍙崇Щ
+                    commands.add(getForceMoveCommand((short) 1));
+                    break;
                 case 7://寮哄埗涓婄Щ
+                    commands.add(getForceMoveCommand((short) 3));
+                    break;
                 case 8://寮哄埗涓嬬Щ
-                    commands.add(getForceMoveCommand((short) (assignCommand.getTaskMode() - 4)));
+                    commands.add(getForceMoveCommand((short) 4));
                     break;
                 case 9://鐘舵�佸浣�
                     ShuttleCommand reset = getResetCommand();

--
Gitblit v1.9.1