From d26899642291dbc0cb8b97f7fb175411b53a2895 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 14:56:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 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 761a91a..baa789a 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -54,6 +54,8 @@
      */
     public Short status;
 
+    public Short alarm = 0;
+
     /**
      * 鐘舵�佹灇涓�
      */
@@ -185,25 +187,25 @@
      * 1 = 璐у弶鍦ㄥ乏渚�
      * 2 = 璐у弶鍦ㄥ彸渚�
      */
-    public Short forkPos;
+    public Short forkPos = -1;
 
-    public CrnForkPosType forkPosType;
+    public CrnForkPosType forkPosType = CrnForkPosType.NONE;
 
     /**
      * 褰撳墠杞借揣鍙颁綅缃�
      * 0 = 涓嬪畾浣�
      * 1 = 涓婂畾浣�
      */
-    public Short liftPos;
+    public Short liftPos = -1;
 
-    public CrnLiftPosType liftPosType;
+    public CrnLiftPosType liftPosType = CrnLiftPosType.ERROR;
 
     /**
      * 璧拌鍦ㄥ畾浣�
      * 0 = 鍦ㄥ畾浣�
      * 1 = 涓嶅湪瀹氫綅
      */
-    public Short walkPos;
+    public Short walkPos = 0;
 
     /**
      * 鎷ㄦ寚浣嶇疆
@@ -223,22 +225,22 @@
     /**
      * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
      */
-    private Integer alarm1;
+    private Integer alarm1 = 0;
 
     /**
      * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
      */
-    private Integer alarm2;
+    private Integer alarm2 = 0;;
 
     /**
      * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
      */
-    private Integer alarm3;
+    private Integer alarm3 = 0;;
 
     /**
      * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
      */
-    private Integer alarm4;
+    private Integer alarm4 = 0;;
 
     /**
      * 寮傚父1
@@ -271,37 +273,40 @@
     /**
      * X琛岃蛋绾块�熷害m/min
      */
-    private Float xSpeed;
+    private Float xSpeed = 0F;
 
     /**
      * Y琛岃蛋绾块�熷害m/min
      */
-    private Float ySpeed;
+    private Float ySpeed = 0F;
 
     /**
      * Z琛岃蛋绾块�熷害m/min
      */
-    private Float zSpeed;
+    private Float zSpeed = 0F;
 
     /**
      * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
      */
-    public Float xDistance;
+    public Float xDistance = 0F;
 
     /**
      * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
      */
-    public Float yDistance;
+    public Float yDistance = 0F;
 
     /**
      * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
      */
-    public Float xDuration;
+    public Float xDuration = 0F;
 
-    /**
+    /**w
      * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
      */
-    public Float yDuration;
+    public Float yDuration = 0F;
+
+    //鎸囦护ID
+    private Integer commandId;
 
     public void setMode(Short mode) {
         this.mode = mode;
@@ -429,7 +434,7 @@
 
 
     public BasCrnp toSqlModel(BasCrnp basCrnp){
-        basCrnp.setCrnErr(alarm1.longValue());
+        basCrnp.setCrnErr(alarm.longValue());
         basCrnp.setWrkNo(taskNo.intValue());
         return basCrnp;
     }

--
Gitblit v1.9.1