From 7181328e9948c183b9ee7b9baebee6488c05c6c4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 02 九月 2020 11:08:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 103 ++++++++++++++++++++++++---------------------------
1 files changed, 49 insertions(+), 54 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 3fbc73c..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;
@@ -106,6 +107,16 @@
* 寮傚父鐮侊紙鏁板�兼樉绀猴級
*/
private Short alarm1;
+
+ private boolean[] temp1;
+
+ private CrnTemp1 crnTemp1;
+
+ private Short temp2;
+
+ private Short temp3;
+
+ private Short temp4;
/**
* 寮傚父1
@@ -227,63 +238,39 @@
public void setError1(boolean[] error1){
this.error1 = error1;
this.crnError1 = new CrnError1();
- this.crnError1.stop = error1[0];
- this.crnError1.xCoverErr = error1[1];
- this.crnError1.yCoverErr = error1[2];
- this.crnError1.zCoverErr = error1[3];
- this.crnError1.rangeErr = error1[4];
- this.crnError1.barcodeErr = error1[5];
- this.crnError1.xFrontLimitErr = error1[6];
- this.crnError1.xBackLimitErr = error1[7];
- this.crnError1.yUpLimitErr = error1[8];
- this.crnError1.yDownLimitErr = error1[9];
- this.crnError1.zLeftLimitErr = error1[10];
- this.crnError1.zRightLimitErr = error1[11];
- this.crnError1.xLocationUpErr = error1[12];
- this.crnError1.xLocationDownErr = error1[13];
- this.crnError1.yLocationUpErr = error1[14];
- this.crnError1.yLocationDownErr = error1[15];
+ 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 setError2(boolean[] error2){
- this.error2 = error2;
- this.crnError2 = new CrnError2();
- this.crnError2.zLocationUpErr = error2[0];
- this.crnError2.zLocationDownErr = error2[1];
- this.crnError2.wcsCommandErr = error2[2];
- this.crnError2.leftWidthLimitErr = error2[3];
- this.crnError2.rightWidthLimitErr = error2[4];
- this.crnError2.leftLengthLimitErr = error2[5];
- this.crnError2.rightLengthLimitErr = error2[6];
- this.crnError2.highLimitErr = error2[7];
- this.crnError2.leftTakeNoneErr = error2[8];
- this.crnError2.rightTakeNoneErr = error2[9];
- this.crnError2.leftPutLoadErr = error2[10];
- this.crnError2.rightPutLoadErr = error2[11];
- this.crnError2.startErr = error2[12];
- this.crnError2.looseRopeErr = error2[13];
- this.crnError2.safeDoorSwitchErr = error2[14];
- this.crnError2.none = error2[15];
- }
- public void setError3(boolean[] error3) {
- this.error3 = error3;
- this.crnError3 = new CrnError3();
- }
-
- public void setError4(boolean[] error4) {
- this.error4 = error4;
- this.crnError4 = new CrnError4();
- }
-
- public void setError5(boolean[] error5) {
- this.error5 = error5;
- this.crnError5 = new CrnError5();
- }
-
- public void setError6(boolean[] error6) {
- this.error6 = error6;
- this.crnError6 = new CrnError6();
+ 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];
}
/**
@@ -293,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