From 78b52c20a27a02466c8af9c0c8222b9f2f3ff20c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 18 一月 2024 19:59:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 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..af2dee1 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -13,6 +13,8 @@
 @Data
 public class CrnProtocol {
 
+    private Integer crnNo;
+
     /**
      * 1 = 鎵嬪姩妯″紡
      * 2 = 鑷姩妯″紡
@@ -94,19 +96,9 @@
     public Short walkPos;
 
     /**
-     * 鍫嗗灈鏈轰换鍔″畬鎴�
-     */
-    public Short taskFinish;
-
-    /**
      * 杞借揣鍙版湁鐗�
      */
     public Short loaded;
-
-    /**
-     * 寮傚父鐮侊紙鏁板�兼樉绀猴級
-     */
-    private Short alarm1;
 
     private Short temp1;
 
@@ -195,6 +187,11 @@
      */
     public Float yDuration;
 
+    /**
+     * 鍫嗗灈鏈烘墍鍦ㄥ贩閬�
+     */
+    private Integer crnLane = 1;
+
     public void setMode(Short mode) {
         this.mode = mode;
         this.modeType = CrnModeType.get(mode);
@@ -258,4 +255,33 @@
         basCrnp.setWrkNo(taskNo.intValue());
         return basCrnp;
     }
+
+    public void setxSpeed(float xSpeed) {
+        this.xSpeed = xSpeed;
+    }
+
+    public void setySpeed(float ySpeed) {
+        this.ySpeed = ySpeed;
+    }
+
+    public void setzSpeed(float zSpeed) {
+        this.zSpeed = zSpeed;
+    }
+
+    public void setxDistance(float xDistance) {
+        this.xDistance = xDistance;
+    }
+
+    public void setyDistance(float yDistance) {
+        this.yDistance = yDistance;
+    }
+
+    public void setxDuration(float xDuration) {
+        this.xDuration = xDuration;
+    }
+
+    public void setyDuration(float yDuration) {
+        this.yDuration = yDuration;
+    }
+
 }

--
Gitblit v1.9.1