From 9124f768917bc1e4120330f339f8407505e0b52a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 07 一月 2025 10:47:24 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 26 ++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
2 files changed, 27 insertions(+), 1 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 ec47558..c13e95d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4384,7 +4384,7 @@
rgvCommand.setTaskNo1((short)32222); // 宸ヤ綅1宸ヤ綔鍙�
rgvCommand.setTaskMode1(RgvTaskModeType.X_MOVE); // 宸ヤ綅1浠诲姟妯″紡: 鍥炲師鐐�
//basRgvMap.getLockStartRoute().shortValue()
- rgvCommand.setSourceStaNo1( (short)107);
+ rgvCommand.setSourceStaNo1( (short)105);
rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
//step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔� step=9锛屽洖鍘熺偣 9999浠诲姟鍙�
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 27d50c9..c5a97a5 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -47,6 +47,32 @@
}};
+ // 姝ｅ簭
+ public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE1 = new ArrayList<Integer>() {{
+ add(101);add(102);add(104);add(122);add(105);add(107);add(118);add(108);
+ }};
+ // 鍙嶅簭
+ public static final List<Integer> TRACK_POSITION_REVERSE_SEQUENCE2 = new ArrayList<Integer>() {{
+ add(117);add(116);add(171);add(1142);add(114);add(123);add(113);add(121);add(111);add(120);add(110);
+ }};
+
+ public static Integer getEndRoute(Integer endRoute,Integer rgvNo){
+ if (rgvNo == 1){
+ if (TRACK_POSITION_POSITIVE_SEQUENCE1.contains(endRoute)){
+ return endRoute;
+ } else {
+ return 108;
+ }
+ } else if (rgvNo == 2){
+ if (TRACK_POSITION_REVERSE_SEQUENCE2.contains(endRoute)){
+ return endRoute;
+ } else {
+ return 110;
+ }
+ }
+ return endRoute;
+ }
+
// 姝ｅ簭
public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE = new ArrayList<Integer>() {{
add(101);add(102);add(104);add(122);add(105);add(107);add(118);add(108);add(119);add(110);add(120);add(111);add(121);add(113);add(123);add(114);add(1142);add(171);add(116);add(117);
--
Gitblit v1.9.1