From cb1ed8e08ef13de563dc4ece9953ffadd78546ba Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 一月 2021 09:54:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 189 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 147 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 7048559..761a91a 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,10 +1,7 @@
package com.zy.core.model.protocol;
import com.zy.asrs.entity.BasCrnp;
-import com.zy.core.enums.CrnForkPosType;
-import com.zy.core.enums.CrnLiftPosType;
-import com.zy.core.enums.CrnModeType;
-import com.zy.core.enums.CrnStatusType;
+import com.zy.core.enums.*;
import lombok.Data;
/**
@@ -23,14 +20,19 @@
public CrnModeType modeType;
/**
+ * 鍫嗗灈鏈轰换鍔″畬鎴�
+ */
+ public Short taskFinish;
+
+ /**
+ * 鏍￠獙缁撴灉 1琛ㄧず妫�楠屾垚鍔�
+ */
+ public Short valid;
+
+ /**
* 1 = 鎬ュ仠
*/
public Short eStop;
-
- /**
- * 寮傚父鐮�
- */
- public Short alarm;
/**
* 浠诲姟鍙�
@@ -68,6 +70,116 @@
public Short level;
/**
+ * 鍫嗗灈鏈哄綋鍓嶆帓
+ */
+ public Short row;
+
+ /**
+ * 鍫嗗灈鏈哄綋鍓嶅贩閬撳彿
+ */
+ public Short lane;
+
+ /**
+ * 鍫嗗灈鏈洪�氳鐘舵��
+ */
+ public Boolean connStatus;
+
+ /**
+ * 鐢宠鍏ュ簱淇
+ */
+ public Boolean correction;
+
+ /**
+ * 鎵樼洏鍙烽敊
+ */
+ public Boolean tuError;
+
+ /**
+ * 鍙栬揣鏃犵
+ */
+ public Boolean noneError;
+
+ /**
+ * 鍙岄噸鍏ュ簱
+ */
+ public Boolean stockError;
+
+ /**
+ * 浣滀笟鏁版嵁鏃犳晥
+ */
+ public Boolean jobInvalid;
+
+ /**
+ * 绌洪棽鐘舵��
+ */
+ public Boolean idle;
+
+ /**
+ * 鎺у埗鏌滀娇鑳�
+ */
+ public Boolean control;
+
+ /**
+ * 鍋滃噯
+ */
+ public Boolean stopQuasi;
+
+ /**
+ * 杩愯
+ */
+ public Boolean running;
+
+ /**
+ * 鏁呴殰
+ */
+ public Boolean fault;
+
+ /**
+ * 璐у弶涓綅
+ */
+ public Boolean forkHome;
+ /**
+ * 鍗曚几浣嶈揣鍙夊乏浣�
+ */
+ public Boolean forkSingleLeft;
+ /**
+ * 鍗曚几浣嶈揣鍙夊彸浣�
+ */
+ public Boolean forkSingleRight;
+ /**
+ * 鍙屼几浣嶈揣鍙夊乏浣�
+ */
+ public Boolean forkDoubleLeft;
+ /**
+ * 鍙屼几浣嶈揣鍙夊彸浣�
+ */
+ public Boolean forkDoubleRight;
+ /**
+ * 鍗曚几浣嶉珮浣�
+ */
+ public Boolean singleHigh;
+ /**
+ * 鍗曚几浣嶄綆浣�
+ */
+ public Boolean singleLow;
+ /**
+ * 鍙屼几浣嶉珮浣�
+ */
+ public Boolean doubleHigh;
+ /**
+ * 鍙屼几浣嶄綆浣�
+ */
+ public Boolean doubleLow;
+ /**
+ * 绔欏彴楂樹綅
+ */
+ public Boolean platformHigh;
+ /**
+ * 绔欏彴浣庝綅
+ */
+ public Boolean platformLow;
+
+ /**
* 褰撳墠璐у弶浣嶇疆
* 0 = 璐у弶鍘熶綅
* 1 = 璐у弶鍦ㄥ乏渚�
@@ -94,9 +206,14 @@
public Short walkPos;
/**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
+ * 鎷ㄦ寚浣嶇疆
+ * 0 = 涓嶅湪瀹氫綅
+ * 1 = 涓婂畾浣�
+ * 2 = 涓嬪畾浣�
*/
- public Short taskFinish;
+ public Short fingerPos;
+
+ public CrnFingerPosType fingerPosType;
/**
* 杞借揣鍙版湁鐗�
@@ -104,17 +221,24 @@
public Short loaded;
/**
- * 寮傚父鐮侊紙鏁板�兼樉绀猴級
+ * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Short alarm1;
+ private Integer alarm1;
- private Short temp1;
+ /**
+ * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm2;
- private Short temp2;
+ /**
+ * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm3;
- private Short temp3;
-
- private Short temp4;
+ /**
+ * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm4;
/**
* 寮傚父1
@@ -143,20 +267,6 @@
private boolean[] error4;
private CrnError4 crnError4;
-
- /**
- * 寮傚父5
- */
- private boolean[] error5;
-
- private CrnError5 crnError5;
-
- /**
- * 寮傚父6
- */
- private boolean[] error6;
-
- private CrnError6 crnError6;
/**
* X琛岃蛋绾块�熷害m/min
@@ -233,6 +343,11 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
+ public void setFingerPos(Short type) {
+ this.fingerPos = type;
+ this.fingerPosType = CrnFingerPosType.get(type);
+ }
+
public void setError1(boolean[] error1){
this.error1 = error1;
this.crnError1 = new CrnError1();
@@ -303,16 +418,6 @@
this.crnError4.xLooseBrakeTimeout = error4[1];
this.crnError4.yLooseBrakeTimeout = error4[2];
this.crnError4.zLooseBrakeTimeout = error4[3];
- }
-
- public void setError5(boolean[] error5) {
- this.error5 = error5;
- this.crnError5 = new CrnError5();
- }
-
- public void setError6(boolean[] error6) {
- this.error6 = error6;
- this.crnError6 = new CrnError6();
}
/**
--
Gitblit v1.9.1