From 4cc10691cd2197f72c205723a642a62478c33273 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期二, 31 五月 2022 09:04:22 +0800
Subject: [PATCH] # ycq

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   78 +++++++++++++++++++++++++++++++--------
 1 files changed, 62 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 4164f37..b56dcb0 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;
@@ -11,6 +12,8 @@
  */
 @Data
 public class CrnProtocol {
+
+    private Integer crnNo;
 
     /**
      * 1 = 鎵嬪姩妯″紡
@@ -93,49 +96,76 @@
     public Short walkPos;
 
     /**
-     * 鍫嗗灈鏈轰换鍔″畬鎴�
-     */
-    public Short taskFinish;
-
-    /**
      * 杞借揣鍙版湁鐗�
      */
     public Short loaded;
 
-    /**
-     * 寮傚父鐮侊紙鏁板�兼樉绀猴級
-     */
-    private Short alarm1;
+    private Short 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
@@ -197,6 +227,14 @@
         this.status = CrnStatusType.get(type).id.shortValue();
     }
 
+    public Short getTemp1() {
+        return temp1;
+    }
+
+    public void setTemp1(Short temp1) {
+        this.temp1 = temp1;
+    }
+
     /**
      * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
      *       I:鍏ュ簱
@@ -204,4 +242,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