From 4747e5dcb4066161b42a7a54cab542949ad5826c Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 29 九月 2025 13:36:00 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 da1eedd..ddfcc52 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褰撳墠鐘舵��
@@ -327,8 +341,6 @@
}
public Integer getRgvPosI2() {
- if (RgvPos == null) return 0;
-
// key: 绔欑偣鍙� value: 鍩哄噯鐗╃悊浣嶇疆
Map<Integer, Integer> posMap = new HashMap<>();
posMap.put(1004, 6534);
@@ -341,7 +353,7 @@
posMap.put(1028, 246724);
posMap.put(1031, 288194);
posMap.put(1035, 315204);
- int tolerance = 50; // 鍏佽璇樊鑼冨洿
+ int tolerance = 200; // 鍏佽璇樊鑼冨洿
for (Map.Entry<Integer, Integer> entry : posMap.entrySet()) {
int site = entry.getKey();
--
Gitblit v1.9.1