From 6c679ea7d1acdd67c7c2d4c7302b6420bd3fbcd5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 22 五月 2025 13:09:03 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 902050f..7eeef65 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -38,17 +38,22 @@
/**
* 浠诲姟鍙�
*/
- public Short taskNo = 0;
+ public Long taskNo = 0L;
/**
* 鏈夌墿
*/
- public Short loaded;//0 鏃犵墿锛�1 鏈夌墿
+ public Short loaded = -1;//0 鏃犵墿锛�1 鏈夌墿
/**
* RGV褰撳墠浣嶇疆
*/
public Long RgvPos = 0L;
+
+ /**
+ * RGV鐩殑浣嶇疆
+ */
+ public Long RgvPosDestination = 0L;
/**
* 璧拌鍦ㄥ畾浣�
@@ -78,14 +83,14 @@
public Float xDuration;
/**
- * 鏄惁閬胯
+ * 杞﹁韩
*/
- public Short Avoid;//0\1\2
+ public Long carBodyJiaoMing = 2000L;
/**
- * 閬胯鐩殑鍦�
+ * 杞﹁韩
*/
- public Short AvoidingTheDestination;
+ public Long carBodyKunPeng = 15000L;
/**
* 鏄惁鍚敤
@@ -120,6 +125,14 @@
return basRgv;
}
+ public long getRgvPosDestinationOrPos(boolean sign){
+ if (!sign){
+ return RgvPosDestination>RgvPos? RgvPosDestination:RgvPos;
+ } else {
+ return RgvPosDestination<RgvPos? RgvPosDestination:RgvPos;
+ }
+ }
+
public void setxSpeed(Short xSpeed) {
this.xSpeed = Float.valueOf(xSpeed);
}
--
Gitblit v1.9.1