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/enums/ShuttleRunDirection.java | 8 ++++----
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++-------
src/main/java/com/zy/core/thread/ShuttleThread.java | 10 ++++++++--
src/main/java/com/zy/core/enums/ShuttleTaskModeType.java | 4 ++--
src/main/webapp/views/shuttle.html | 4 ++--
6 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index cc23c9a..e462e8a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -640,13 +640,13 @@
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(rackInStn.getStaNo());
- StaProtocol staProtocol105 = devpThread.getStation().get(105);
- staProtocol105.setWorkNo((short) 752);
- staProtocol105.setStaNo((short) 100);
-
- StaProtocol staProtocol106 = devpThread.getStation().get(106);
- staProtocol106.setWorkNo((short) 753);
- staProtocol106.setStaNo((short) 100);
+// StaProtocol staProtocol105 = devpThread.getStation().get(105);
+// staProtocol105.setWorkNo((short) 752);
+// staProtocol105.setStaNo((short) 100);
+//
+// StaProtocol staProtocol106 = devpThread.getStation().get(106);
+// staProtocol106.setWorkNo((short) 753);
+// staProtocol106.setStaNo((short) 100);
if (staProtocol == null) {
continue;
diff --git a/src/main/java/com/zy/core/enums/ShuttleRunDirection.java b/src/main/java/com/zy/core/enums/ShuttleRunDirection.java
index e8051b3..94524d6 100644
--- a/src/main/java/com/zy/core/enums/ShuttleRunDirection.java
+++ b/src/main/java/com/zy/core/enums/ShuttleRunDirection.java
@@ -5,10 +5,10 @@
*/
public enum ShuttleRunDirection {
- TOP((short)1, "璐х墿鏂瑰悜+"),
- BOTTOM((short)2, "璐х墿鏂瑰悜-"),
- LEFT((short)4, "杩囬亾鏂瑰悜+"),
- RIGHT((short)3, "杩囬亾鏂瑰悜-"),
+ TOP((short)2, "璐х墿鏂瑰悜+"),
+ BOTTOM((short)1, "璐х墿鏂瑰悜-"),
+ LEFT((short)3, "杩囬亾鏂瑰悜-"),
+ RIGHT((short)4, "杩囬亾鏂瑰悜+"),
;
public Short id;
diff --git a/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java b/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java
index b7fece6..13ca473 100644
--- a/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java
@@ -12,8 +12,8 @@
MOVE_TOP(7, "鍓嶇Щ"),
MOVE_BOTTOM(8, "鍚庣Щ"),
RESET(9, "鐘舵�佸浣�"),
- SEARCH_LEFT(10, "姝ｆ柟鍚�(宸�)瀵诲簱浣�"),
- SEARCH_RIGHT(11, "璐熸柟鍚�(鍙�)瀵诲簱浣�"),
+ SEARCH_LEFT(10, "姝ｆ柟鍚�(鍙�)瀵诲簱浣�"),
+ SEARCH_RIGHT(11, "璐熸柟鍚�(宸�)瀵诲簱浣�"),
SEARCH_TOP(12, "璐熸柟鍚�(鍓�)瀵诲簱浣�"),
SEARCH_BOTTOM(13, "璐熸柟鍚�(鍚�)瀵诲簱浣�"),
MOVE_LOC_NO(14, "绉诲姩鍒扮洰鏍囧簱浣�"),
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index e736217..b264d65 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -54,7 +54,7 @@
private String sourceLocNo;
/**
- * 鐩爣搴撲綅
+ * 鐩爣搴撲綅f
*/
private String locNo;
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();
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index 8a1c18d..f76e3fa 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -138,8 +138,8 @@
<button class="item" onclick="shuttleOperator(7)">鍚庣Щ</button>
<button class="item" onclick="shuttleOperator(8)">鍓嶇Щ</button>
<button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
- <button class="item" onclick="shuttleOperator(10)">姝ｆ柟鍚�(宸�)瀵诲簱浣�</button>
- <button class="item" onclick="shuttleOperator(11)">璐熸柟鍚�(鍙�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(10)">姝ｆ柟鍚�(鍙�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(11)">璐熸柟鍚�(宸�)瀵诲簱浣�</button>
<button class="item" onclick="shuttleOperator(12)">姝ｆ柟鍚�(鍓�)瀵诲簱浣�</button>
<button class="item" onclick="shuttleOperator(13)">璐熸柟鍚�(鍚�)瀵诲簱浣�</button>
<button class="item" onclick="shuttleOperator(15)">鍏呯數寮�鍏�</button>
--
Gitblit v1.9.1