From 7e68f81b38116bba40e70620c563168fcde66a37 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期五, 05 十二月 2025 09:18:38 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   65 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 10 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 a47b9c0..aed7e20 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -7,11 +7,16 @@
 import com.zy.core.enums.CrnStatusType;
 import lombok.Data;
 
+import java.util.ArrayList;
+
 /**
  * Created by vincent on 2020/8/7
  */
 @Data
 public class CrnProtocol {
+
+    private Integer crnNo;
+    private Integer laneNo;
 
     /**
      * 1 = 鎵嬪姩妯″紡
@@ -21,6 +26,11 @@
     public Short mode;
 
     public CrnModeType modeType;
+
+    /**
+     * 鍫嗗灈鏈轰换鍔″畬鎴�
+     */
+    public Short taskFinish;
 
     /**
      * 1 = 鎬ュ仠
@@ -56,6 +66,11 @@
      * 鐘舵�佹灇涓�
      */
     public CrnStatusType statusType;
+
+    /**
+     * 鏁呴殰
+     */
+    public Boolean fault;
 
     /**
      * 鍫嗗灈鏈哄綋鍓嶅垪鍙�
@@ -94,19 +109,9 @@
     public Short walkPos;
 
     /**
-     * 鍫嗗灈鏈轰换鍔″畬鎴�
-     */
-    public Short taskFinish;
-
-    /**
      * 杞借揣鍙版湁鐗�
      */
     public Short loaded;
-
-    /**
-     * 寮傚父鐮侊紙鏁板�兼樉绀猴級
-     */
-    private Short alarm1;
 
     private Short temp1;
 
@@ -194,6 +199,17 @@
      * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
      */
     public Float yDuration;
+    public String errCrn;
+
+
+    public Integer locMastDemoCount;//娴嬭瘯搴撲綅鏁伴噺
+    public ArrayList<String> locMastDemoListF;//娴嬭瘯搴撲綅鍒楄〃
+    public ArrayList<String> locMastDemoListE;//娴嬭瘯搴撲綅鍒楄〃
+    public ArrayList<String> locMastDemoList;//娴嬭瘯搴撲綅鍒楄〃
+    public ArrayList<String[]> locMastDemoListSign;//娴嬭瘯搴撲綅鍒楄〃
+    public Integer staOutDemo;//娴嬭瘯搴撲綅鍑哄簱绔�
+    public Integer staIntDemo;//娴嬭瘯搴撲綅鍏ュ簱绔�
+    public boolean signIntOut;//娴嬭瘯搴撲綅鍏ュ簱绔�
 
     public void setMode(Short mode) {
         this.mode = mode;
@@ -258,4 +274,33 @@
         basCrnp.setWrkNo(taskNo.intValue());
         return basCrnp;
     }
+
+    public void setxSpeed(Short xSpeed) {
+        this.xSpeed = Float.valueOf(xSpeed);
+    }
+
+    public void setySpeed(Short ySpeed) {
+        this.ySpeed = Float.valueOf(ySpeed);
+    }
+
+    public void setzSpeed(Short zSpeed) {
+        this.zSpeed = Float.valueOf(zSpeed);
+    }
+
+    public void setxDistance(Short xDistance) {
+        this.xDistance = Float.valueOf(xDistance);
+    }
+
+    public void setyDistance(Short yDistance) {
+        this.yDistance = Float.valueOf(yDistance);
+    }
+
+    public void setxDuration(Short xDuration) {
+        this.xDuration = Float.valueOf(xDuration);
+    }
+
+    public void setyDuration(Short yDuration) {
+        this.yDuration = Float.valueOf(yDuration);
+    }
+
 }

--
Gitblit v1.9.1