From fb02f04ec63f00398e343e4b43eda00cce75c56e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 八月 2020 14:18:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 5 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 4164f37..13c51ed 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -110,12 +110,16 @@
     /**
      * 寮傚父1
      */
-    private Short error1;
+    private boolean[] error1;
+
+    private CrnError1 crnError1;
 
     /**
      * 寮傚父2
      */
-    private Short error2;
+    private boolean[] error2;
+
+    private CrnError2 crnError2;
 
     /**
      * 淇濈暀
@@ -125,17 +129,17 @@
     /**
      * 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
@@ -197,6 +201,48 @@
         this.status = CrnStatusType.get(type).id.shortValue();
     }
 
+    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];
+    }
+
+    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];
+    }
+
     /**
      * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
      *       I:鍏ュ簱

--
Gitblit v1.9.1