From db093d853136fa7809eb1c5e512656bfb8980d15 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 05 四月 2024 19:13:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 59 ++++++++++++++++++-----------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +-
2 files changed, 38 insertions(+), 25 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 48de892..47b2ce4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4236,7 +4236,7 @@
rgvCommand.setTaskNo1((short)32222); // 宸ヤ綅1宸ヤ綔鍙�
rgvCommand.setTaskMode1(RgvTaskModeType.X_MOVE); // 宸ヤ綅1浠诲姟妯″紡: 鍥炲師鐐�
//basRgvMap.getLockStartRoute().shortValue()
- rgvCommand.setSourceStaNo1(rgvRunSta[0].shortValue());
+ rgvCommand.setSourceStaNo1(rgvRunSta[1].shortValue());
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浠诲姟鍙�
@@ -4258,7 +4258,7 @@
rgvCommand.setAckFinish2((short) 0); // 宸ヤ綅2浠诲姟瀹屾垚纭浣�
rgvCommand.setTaskNo2((short)32222); // 宸ヤ綅2宸ヤ綔鍙�
rgvCommand.setTaskMode2(RgvTaskModeType.X_MOVE); // 宸ヤ綅2浠诲姟妯″紡: 鍥炲師鐐�
- rgvCommand.setSourceStaNo2(rgvRunSta[1].shortValue());
+ rgvCommand.setSourceStaNo2(rgvRunSta[0].shortValue());
rgvCommand.setCommand((short) 2); //宸ヤ綅2浠诲姟纭
if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(5, 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 f3b76fc..ea72548 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -421,35 +421,48 @@
int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(b);
int ic = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(c);
int id = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(d);
- if (id==0){
- if (ia>ib){
- if (ia>ic){
- return a;
- }else {
- return c;
- }
+ if (id == 0){
+ if (ib>ic){
+ return b;
}else {
- if (ib>ic){
- return b;
- }else {
- return c;
- }
+ return c;
}
}else {
- if (ia<ib){
- if (ia<ic){
- return a;
- }else {
- return c;
- }
+ if (ib<ic){
+ return b;
}else {
- if (ib<ic){
- return b;
- }else {
- return c;
- }
+ return c;
}
}
+// if (id==0){
+// if (ia>ib){
+// if (ia>ic){
+// return a;
+// }else {
+// return c;
+// }
+// }else {
+// if (ib>ic){
+// return b;
+// }else {
+// return c;
+// }
+// }
+// }else {
+// if (ia<ib){
+// if (ia<ic){
+// return a;
+// }else {
+// return c;
+// }
+// }else {
+// if (ib<ic){
+// return b;
+// }else {
+// return c;
+// }
+// }
+// }
}
/*
--
Gitblit v1.9.1