From 2d12d97174a5f6cc03ad6cd1e04444400bb99b1a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 02 九月 2020 09:21:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 101 insertions(+), 12 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..c2f073a 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;
@@ -74,7 +75,7 @@
*/
public Short forkPos;
- private CrnForkPosType forkPosType;
+ public CrnForkPosType forkPosType;
/**
* 褰撳墠杞借揣鍙颁綅缃�
@@ -107,50 +108,92 @@
*/
private Short alarm1;
+ private boolean[] temp1;
+
+ private CrnTemp1 crnTemp1;
+
+ 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 +235,44 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
+ public void setError1(boolean[] error1){
+ this.error1 = error1;
+ this.crnError1 = new CrnError1();
+ this.crnError1.walkOverspeedErr = error1[1];
+ this.crnError1.walkOverspeedRangeErr = error1[2];
+ this.crnError1.walkSpeedOffsetErr = error1[3];
+ this.crnError1.walkLocationOffsetErr = error1[4];
+ this.crnError1.walkDiastimeterErr = error1[5];
+ this.crnError1.walkOutsideErr = error1[6];
+ this.crnError1.walkLimitSwitchErr = error1[7];
+ this.crnError1.walkBrakeErr = error1[8];
+ this.crnError1.walkDiastimeterFau = error1[9];
+ this.crnError1.liftOverSpeedErr = error1[10];
+ this.crnError1.liftOverspeedRangeErr = error1[11];
+ this.crnError1.liftSpeedOffsetErr = error1[12];
+ this.crnError1.liftLocationOffsetErr = error1[13];
+ this.crnError1.liftDiastimeterErr = error1[14];
+ this.crnError1.liftOutsideErr = error1[15];
+ }
+
+
+ public void setTemp1(boolean[] temp1) {
+ this.temp1 = temp1;
+ this.crnTemp1 = new CrnTemp1();
+ this.crnTemp1.liftLimitSwitchErr = temp1[0];
+ this.crnTemp1.liftBrakeErr = temp1[1];
+ this.crnTemp1.liftDiastimeterFau = temp1[2];
+ this.crnTemp1.stop = temp1[3];
+ this.crnTemp1.warn = temp1[4];
+ this.crnTemp1.overHighErr = temp1[5];
+ this.crnTemp1.leftOverWidthErr = temp1[6];
+ this.crnTemp1.rightOverWidthErr = temp1[7];
+ this.crnTemp1.leftOverLenErr = temp1[8];
+ this.crnTemp1.rightOverLenErr = temp1[9];
+ this.crnTemp1.pakinThenLoadedErr = temp1[10];
+ this.crnTemp1.pakOutThenNoneErr = temp1[11];
+ }
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
@@ -199,4 +280,12 @@
*/
private String lastIo = "I";
+
+ public BasCrnp toSqlModel(BasCrnp basCrnp){
+ if (alarm!=null) {
+ basCrnp.setCrnErr(alarm.longValue());
+ }
+ basCrnp.setWrkNo(taskNo.intValue());
+ return basCrnp;
+ }
}
--
Gitblit v1.9.1