From a00400cf9f975a7dbccf3436cf3b57c1fb476597 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 15 十月 2025 09:15:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index b957509..c7d06a2 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -59,6 +59,10 @@
* 宸ヤ綅1浠诲姟鍙�
*/
public Integer taskNo1 = 0;
+ /**
+ * 宸ヤ綅1鐩爣绔�
+ */
+ public Integer staNo1 = 0;
/**
* RGV宸ヤ綅1褰撳墠鐘舵��
@@ -98,12 +102,12 @@
public Short walkPos;
/**
- * 鎬ュ仠
+ * 鎬ュ仠瑙﹀彂
*/
public Boolean err1;
/**
- * 鏈夌墿鏃犺祫鏂�
+ *
*/
public Boolean err2;
@@ -132,11 +136,21 @@
*/
public Boolean err7;
+ public Boolean err8;
+ public Boolean err9;
+ public Boolean err10;
+ public Boolean err11;
+ public Boolean err12;
+
////////////////////// 宸ヤ綅2瀹氫箟 //////////////////////////////////////////////////
/**
* 宸ヤ綅2浠诲姟鍙�
*/
public Integer taskNo2 = 0;
+ /**
+ * 宸ヤ綅1鐩爣绔�
+ */
+ public Integer staNo2 = 0;
/**
* RGV宸ヤ綅2褰撳墠鐘舵��
@@ -338,7 +352,18 @@
posMap.put(1024, 219684);
posMap.put(1028, 246724);
posMap.put(1031, 288194);
- posMap.put(1035, 315204);
+ posMap.put(2003, 314954);
+ posMap.put(2006, 288094);
+ posMap.put(2009, 246574);
+ posMap.put(2012, 219584);
+ posMap.put(2015, 177934);
+ posMap.put(2018, 138126);
+ posMap.put(2021, 102124);
+ posMap.put(2024, 75174);
+ posMap.put(2027, 33748);
+ posMap.put(2030, 6449);
+
+
int tolerance = 200; // 鍏佽璇樊鑼冨洿
for (Map.Entry<Integer, Integer> entry : posMap.entrySet()) {
--
Gitblit v1.9.1