From fb5b2e35fd234d8f8068c690df1bcbf956e05880 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 03 十一月 2020 09:35:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 157 insertions(+), 16 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 00d6b1c..5969aee 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,9 +1,7 @@
package com.zy.core.model.protocol;
-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.asrs.entity.BasCrnp;
+import com.zy.core.enums.*;
import lombok.Data;
/**
@@ -74,7 +72,7 @@
*/
public Short forkPos;
- private CrnForkPosType forkPosType;
+ public CrnForkPosType forkPosType;
/**
* 褰撳墠杞借揣鍙颁綅缃�
@@ -93,6 +91,16 @@
public Short walkPos;
/**
+ * 鎷ㄦ寚浣嶇疆
+ * 0 = 涓嶅湪瀹氫綅
+ * 1 = 涓婂畾浣�
+ * 2 = 涓嬪畾浣�
+ */
+ public Short fingerPos;
+
+ public CrnFingerPosType fingerPosType;
+
+ /**
* 鍫嗗灈鏈轰换鍔″畬鎴�
*/
public Short taskFinish;
@@ -107,50 +115,90 @@
*/
private Short alarm1;
+ private Short temp1;
+
+ private Short temp2;
+
+ private Short temp3;
+
+ private Short temp4;
+
/**
* 寮傚父1
*/
- private Short error1;
+ private boolean[] error1;
+
+ private CrnError1 crnError1;
/**
* 寮傚父2
*/
- private Short error2;
+ private boolean[] error2;
+
+ private CrnError2 crnError2;
/**
- * 淇濈暀
+ * 寮傚父3
*/
- private Short temp1;
+ 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 Short xSpeed;
+ private Float xSpeed;
/**
* Y琛岃蛋绾块�熷害m/min
*/
- private Short ySpeed;
+ private Float ySpeed;
/**
* Z琛岃蛋绾块�熷害m/min
*/
- private Short zSpeed;
+ private Float zSpeed;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
*/
- public Integer xDistance;
+ public Float xDistance;
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
*/
- public Integer yDistance;
+ public Float yDistance;
/**
- * 鍫嗗灈鏈虹疮璁¤繍琛屾椂闀縣
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
*/
- public Integer duration;
+ public Float xDuration;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
+ */
+ public Float yDuration;
public void setMode(Short mode) {
this.mode = mode;
@@ -192,6 +240,93 @@
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();
+ this.crnError1.remoteStop = error1[0];
+ this.crnError1.mainStop = error1[1];
+ this.crnError1.controlStop = error1[2];
+ this.crnError1.xCoverErr = error1[3];
+ this.crnError1.yCoverErr = error1[4];
+ this.crnError1.zCoverErr = error1[5];
+ this.crnError1.laserErr = error1[6];
+ this.crnError1.barcodeErr = error1[7];
+ this.crnError1.xFrontLimitErr = error1[8];
+ this.crnError1.xBackLimitErr = error1[9];
+ this.crnError1.yUpLimitErr = error1[10];
+ this.crnError1.yDownLimitErr = error1[11];
+ this.crnError1.zLeftLimitErr = error1[12];
+ this.crnError1.zRightLimitErr = error1[13];
+ this.crnError1.leftOverWidthErr1 = error1[14];
+ this.crnError1.leftOverWidthErr2 = error1[15];
+ }
+
+ public void setError2(boolean[] error2){
+ this.error2 = error2;
+ this.crnError2 = new CrnError2();
+ this.crnError2.leftOverLenErr1 = error2[0];
+ this.crnError2.leftOverLenErr2 = error2[1];
+ this.crnError2.leftOverHighErr = error2[2];
+ this.crnError2.rightOverWidthErr1 = error2[3];
+ this.crnError2.rightOverWidthErr2 = error2[4];
+ this.crnError2.rightOverLenErr1 = error2[5];
+ this.crnError2.rightOverLenErr2 = error2[6];
+ this.crnError2.rightOverHighErr = error2[7];
+ this.crnError2.leftLooseRopeErr = error2[8];
+ this.crnError2.rightLooseRopeErr = error2[9];
+ this.crnError2.frontDoorErr = error2[10];
+ this.crnError2.backDoorErr = error2[11];
+ this.crnError2.startupErr = error2[12];
+ this.crnError2.xFrontLocaUpErr = error2[13];
+ this.crnError2.xFrontLocaDownErr = error2[14];
+ this.crnError2.xBackLocaUpErr = error2[15];
+ }
+
+ public void setError3(boolean[] error3) {
+ this.error3 = error3;
+ this.crnError3 = new CrnError3();
+ this.crnError3.xBackLocaDownErr = error3[0];
+ this.crnError3.yUpLocaUpErr = error3[1];
+ this.crnError3.yUpLocaDownErr = error3[2];
+ this.crnError3.yDownLocaUpErr = error3[3];
+ this.crnError3.yDownLocaDownErr = error3[4];
+ this.crnError3.zLeftLocaUpErr = error3[5];
+ this.crnError3.zLeftLocaDownErr = error3[6];
+ this.crnError3.zRightLocaUpErr = error3[7];
+ this.crnError3.zRightLocaDownErr = error3[8];
+ this.crnError3.leftTakeNoneErr = error3[9];
+ this.crnError3.rightTakeNoneErr = error3[10];
+ this.crnError3.leftTakeThenLoadErr = error3[11];
+ this.crnError3.rightTakeThenLoadErr = error3[12];
+ this.crnError3.leftPutAndLoadErr = error3[13];
+ this.crnError3.rightPutAndLoadErr = error3[14];
+ this.crnError3.leftPutThenNoneErr = error3[15];
+ }
+
+ public void setError4(boolean[] error4) {
+ this.error4 = error4;
+ this.crnError4 = new CrnError4();
+ this.crnError4.rightPutThenNoneErr = error4[0];
+ 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();
+ }
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
@@ -199,4 +334,10 @@
*/
private String lastIo = "I";
+
+ public BasCrnp toSqlModel(BasCrnp basCrnp){
+ basCrnp.setCrnErr(alarm1.longValue());
+ basCrnp.setWrkNo(taskNo.intValue());
+ return basCrnp;
+ }
}
--
Gitblit v1.9.1