From abb914f4761cedcfc89eb3dcdd2cf377490d09bc Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 14:41:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 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 6e317ff..7eeef65 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -18,9 +18,9 @@
* 2 = 鑷姩妯″紡
* 3 = 鐢佃剳妯″紡
*/
- public Short mode;
+ public Short mode = -1;
- public RgvModeType modeType;
+ public RgvModeType modeType = RgvModeType.NONE;
/**
* RGV褰撳墠鐘舵��
@@ -28,27 +28,32 @@
* 1锛氫綔涓氫腑
* 2锛氭姤璀�
*/
- public Short status;
+ public Short status = -1;
/**
* 鐘舵�佹灇涓�
*/
- public RgvStatusType statusType;
+ public RgvStatusType statusType = RgvStatusType.NONE;
/**
* 浠诲姟鍙�
*/
- public Short taskNo = 0;
+ public Long taskNo = 0L;
/**
- * 宸ヤ綅1鏈夌墿
+ * 鏈夌墿
*/
- public Short loaded;//0 鏃犵墿锛�1 鏈夌墿
+ public Short loaded = -1;//0 鏃犵墿锛�1 鏈夌墿
/**
* RGV褰撳墠浣嶇疆
*/
- public Long RgvPos;
+ public Long RgvPos = 0L;
+
+ /**
+ * RGV鐩殑浣嶇疆
+ */
+ public Long RgvPosDestination = 0L;
/**
* 璧拌鍦ㄥ畾浣�
@@ -76,6 +81,21 @@
* 绱璧拌鏃堕暱h
*/
public Float xDuration;
+
+ /**
+ * 杞﹁韩
+ */
+ public Long carBodyJiaoMing = 2000L;
+
+ /**
+ * 杞﹁韩
+ */
+ public Long carBodyKunPeng = 15000L;
+
+ /**
+ * 鏄惁鍚敤
+ */
+ public boolean statusEnable;//0\1\2
public void setMode(Short mode) {
this.mode = mode;
@@ -105,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);
}
@@ -115,12 +143,6 @@
public void setxDuration(Short xDuration) {
this.xDuration = Float.valueOf(xDuration);
- }
-
- public Integer getRgvPosI(){
- //闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
- if (RgvPos==null) return 0;
- return RgvPos.intValue();
}
}
--
Gitblit v1.9.1