From 5ac4d85e8e6a80ada870b5c92eb45897c7815b51 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 13 七月 2023 10:41:08 +0800
Subject: [PATCH] rgv
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 197 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 155 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 49a760b..a63b90b 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,5 +1,6 @@
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;
@@ -12,53 +13,46 @@
@Data
public class CrnProtocol {
+ private Integer crnNo;
+
/**
* 1 = 鎵嬪姩妯″紡
* 2 = 鑷姩妯″紡
* 3 = 鐢佃剳妯″紡
- * 4 = 鎵嬪姩妯″紡鍚姩涓�
- * 5 = 鑷姩妯″紡鍚姩涓�
- * 6 = 鐢佃剳妯″紡鍚姩涓�
*/
- public short mode;
+ public Short mode;
public CrnModeType modeType;
/**
* 1 = 鎬ュ仠
*/
- public short eStop;
+ public Short eStop;
/**
* 寮傚父鐮�
*/
- public short alarm;
+ public Short alarm;
/**
* 浠诲姟鍙�
*/
- public short taskNo;
+ public Short taskNo = 0;
/**
* 鍫嗗灈鏈哄綋鍓嶇姸鎬�
- * 0 = 鏈煡
- * 1 = 绌洪棽
- * 2 = 妫�鏌ヤ换鍔℃暟鎹�
- * 3 = 瀹氫綅鍒板彇璐т綅
- * 7 = 鍙栬揣瀹屾垚
- * 8 = 绛夊緟璋冨害鏌滃厑璁�
- * 9 = 绉诲姩鍒版斁璐т綅缃�
- * 10 = 鏀捐揣涓�
- * 13 = 鎼繍瀹屾垚
- * 14 = 绌鸿浇閬胯
- * 15 = 妫�鏌ヤ换鍔℃暟鎹�
- * 20 = 妫�鏌ユ簮浣嶇疆
- * 21 = 妫�鏌ョ洰鏍囦綅缃�
- * 50 = 绉诲姩浠诲姟
- * 98 = 浠诲姟瀹屾垚锛寃cs鏈‘璁�
- * 99 = 鎶ヨ
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 1锛氬彇璐у畾浣嶄腑
+ * 2锛氬彇璐т腑
+ * 3锛氬彇璐у畬鎴愶紝鏀捐揣瀹氫綅涓�
+ * 4锛氭斁璐т腑
+ * 5锛氬洖鍘熺偣涓�
+ * 6锛氬弽鍘熺偣
+ * 7锛氬簱浣嶇Щ浣�
+ * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ * 99锛氭姤璀�
*/
- public short status;
+ public Short status;
/**
* 鐘舵�佹灇涓�
@@ -68,12 +62,12 @@
/**
* 鍫嗗灈鏈哄綋鍓嶅垪鍙�
*/
- public short bay;
+ public Short bay;
/**
* 鍫嗗灈鏈哄綋鍓嶅眰鍙�
*/
- public short level;
+ public Short level;
/**
* 褰撳墠璐у弶浣嶇疆
@@ -81,16 +75,16 @@
* 1 = 璐у弶鍦ㄥ乏渚�
* 2 = 璐у弶鍦ㄥ彸渚�
*/
- public short forkPos;
+ public Short forkPos;
- private CrnForkPosType forkPosType;
+ public CrnForkPosType forkPosType;
/**
* 褰撳墠杞借揣鍙颁綅缃�
* 0 = 涓嬪畾浣�
* 1 = 涓婂畾浣�
*/
- public short liftPos;
+ public Short liftPos;
public CrnLiftPosType liftPosType;
@@ -99,32 +93,99 @@
* 0 = 鍦ㄥ畾浣�
* 1 = 涓嶅湪瀹氫綅
*/
- public short walkPos;
-
- /**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public short taskFinish;
+ public Short walkPos;
/**
* 杞借揣鍙版湁鐗�
*/
- public short loaded;
+ public Short loaded;
+
+ private Short temp1;
+
+ private CrnTemp1 crnTemp1;
+
+ private Short temp2;
+
+ private Short temp3;
+
+ private Short temp4;
/**
- * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂�
+ * 寮傚父1
*/
- public int xDistance;
+ private boolean[] error1;
+
+ private CrnError1 crnError1;
/**
- * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂�
+ * 寮傚父2
*/
- public int yDistance;
+ private boolean[] error2;
+
+ private CrnError2 crnError2;
/**
- * 鍫嗗灈鏈虹疮璁¤繍琛屾椂闀�
+ * 寮傚父3
*/
- public int duration;
+ private boolean[] error3;
+
+ private CrnError3 crnError3;
+
+ /**
+ * 寮傚父4
+ */
+ private boolean[] error4;
+
+ private CrnError4 crnError4;
+
+ /**
+ * 寮傚父5
+ */
+ private boolean[] error5;
+
+ private CrnError5 crnError5;
+
+ /**
+ * 寮傚父6
+ */
+ private boolean[] error6;
+
+ private CrnError6 crnError6;
+
+ /**
+ * X琛岃蛋绾块�熷害m/min
+ */
+ private Float xSpeed;
+
+ /**
+ * Y琛岃蛋绾块�熷害m/min
+ */
+ private Float ySpeed;
+
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Float zSpeed;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ */
+ public Float xDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
+ */
+ public Float yDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
+ */
+ public Float xDuration;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
+ */
+ public Float yDuration;
public void setMode(Short mode) {
this.mode = mode;
@@ -166,4 +227,56 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
+ public Short getTemp1() {
+ return temp1;
+ }
+
+ public void setTemp1(Short temp1) {
+ this.temp1 = temp1;
+ }
+
+ /**
+ * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+ * I:鍏ュ簱
+ * O:鍑哄簱
+ */
+ private String lastIo = "I";
+
+
+ public BasCrnp toSqlModel(BasCrnp basCrnp){
+ if (alarm!=null) {
+ basCrnp.setCrnErr(alarm.longValue());
+ }
+ basCrnp.setWrkNo(taskNo.intValue());
+ return basCrnp;
+ }
+
+ public void setxSpeed(Short xSpeed) {
+ this.xSpeed = Float.valueOf(xSpeed);
+ }
+
+ public void setySpeed(Short ySpeed) {
+ this.ySpeed = Float.valueOf(ySpeed);
+ }
+
+ public void setzSpeed(Short zSpeed) {
+ this.zSpeed = Float.valueOf(zSpeed);
+ }
+
+ public void setxDistance(Short xDistance) {
+ this.xDistance = Float.valueOf(xDistance);
+ }
+
+ public void setyDistance(Short yDistance) {
+ this.yDistance = Float.valueOf(yDistance);
+ }
+
+ public void setxDuration(Short xDuration) {
+ this.xDuration = Float.valueOf(xDuration);
+ }
+
+ public void setyDuration(Short yDuration) {
+ this.yDuration = Float.valueOf(yDuration);
+ }
+
}
--
Gitblit v1.9.1