From 03cb278f103ad389c049332b9ba7fe7d840ebbe6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 18 十月 2025 17:12:38 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   66 +++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 19 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 895c754..70a9b8a 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -33,12 +33,12 @@
      * 寮傚父鐮�
      */
     public Short alarm;
-
+    public Short alarmTwo;
     /**
      * 浠诲姟鍙�
      */
     public Short taskNo = 0;
-
+    public Short taskNoTwo = 0;
     /**
      * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
      * 0锛氱┖闂诧紝鏃犱换鍔�
@@ -52,23 +52,24 @@
      * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
      * 99锛氭姤璀�
      */
-    public Short status;
+    public Short status = -1;
+    public Short statusTwo = -1;
 
     /**
      * 鐘舵�佹灇涓�
      */
     public CrnStatusType statusType;
-
+    public CrnStatusType statusTypeTwo;
     /**
      * 鍫嗗灈鏈哄綋鍓嶅垪鍙�
      */
     public Short bay;
-
+    public Short bayTwo;
     /**
      * 鍫嗗灈鏈哄綋鍓嶅眰鍙�
      */
     public Short level;
-
+    public Short levelTwo;
     /**
      * 褰撳墠璐у弶浣嶇疆
      * 0 = 璐у弶鍘熶綅
@@ -76,9 +77,11 @@
      * 2 = 璐у弶鍦ㄥ彸渚�
      */
     public Short forkPos;
+    public Short forkPosTwo;
+
 
     public CrnForkPosType forkPosType;
-
+    public CrnForkPosType forkPosTypeTwo;
     /**
      * 褰撳墠杞借揣鍙颁綅缃�
      * 0 = 涓嬪畾浣�
@@ -87,6 +90,7 @@
     public Short liftPos;
 
     public CrnLiftPosType liftPosType;
+    public CrnLiftPosType liftPosTypeTwo;
 
     /**
      * 璧拌鍦ㄥ畾浣�
@@ -94,11 +98,14 @@
      * 1 = 涓嶅湪瀹氫綅
      */
     public Short walkPos;
+    public Short walkPosTwo;
 
     /**
      * 杞借揣鍙版湁鐗�
      */
     public Short loaded;
+    public Short loadedTwo;
+
 
     private Short temp1;
 
@@ -212,6 +219,16 @@
         this.forkPos = CrnForkPosType.get(type).id.shortValue();
     }
 
+    public void setForkPosTwo(Short forkPosTwo) {
+        this.forkPosTwo = forkPosTwo;
+        this.forkPosTypeTwo = CrnForkPosType.get(forkPosTwo);
+    }
+
+    public void setForkPosTwo(CrnForkPosType typeTwo) {
+        this.forkPosTypeTwo = typeTwo;
+        this.forkPosTwo = CrnForkPosType.get(typeTwo).id.shortValue();
+    }
+
     public void setLiftPos(Short liftPos) {
         this.liftPos = liftPos;
         this.liftPosType = CrnLiftPosType.get(liftPos);
@@ -222,9 +239,16 @@
         this.liftPos = CrnLiftPosType.get(type).id.shortValue();
     }
 
+
+
     public void setStatus(Short status){
         this.status = status;
         this.statusType = CrnStatusType.get(status);
+    }
+
+    public void setStatusTwo(Short statusTwo){
+        this.statusTwo = statusTwo;
+        this.statusTypeTwo = CrnStatusType.get(statusTwo);
     }
 
     public void setStatus(CrnStatusType type){
@@ -253,35 +277,39 @@
             basCrnp.setCrnErr(alarm.longValue());
         }
         basCrnp.setWrkNo(taskNo.intValue());
+        basCrnp.setWrkNoTwo(taskNoTwo.intValue());
+        basCrnp.setCrnStatusOne(status.intValue());
+        basCrnp.setCrnStatusTwo(statusTwo.intValue());
         return basCrnp;
     }
 
-    public void setxSpeed(float xSpeed) {
-        this.xSpeed = xSpeed;
+    public void setxSpeed(Float xSpeed) {
+        this.xSpeed = (xSpeed);
     }
 
-    public void setySpeed(float ySpeed) {
-        this.ySpeed = ySpeed;
+    public void setySpeed(Float ySpeed) {
+        this.ySpeed =ySpeed;
     }
 
-    public void setzSpeed(float zSpeed) {
+    public void setzSpeed(Float zSpeed) {
         this.zSpeed = zSpeed;
     }
 
-    public void setxDistance(float xDistance) {
-        this.xDistance = xDistance;
+    public void setxDistance(Float xDistance) {
+        this.xDistance =xDistance;
     }
 
-    public void setyDistance(float yDistance) {
+    public void setyDistance(Float yDistance) {
         this.yDistance = yDistance;
     }
 
-    public void setxDuration(float xDuration) {
-        this.xDuration = xDuration;
+    public void setxDuration(Float xDuration) {
+        this.xDuration =xDuration;
     }
 
-    public void setyDuration(float yDuration) {
-        this.yDuration = yDuration;
+    public void setyDuration(Float yDuration) {
+        this.yDuration = Float.valueOf(yDuration);
     }
 
+
 }

--
Gitblit v1.9.1