From 38adbef1ec9ffdde88026d3ab469d8e907daed6f Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期五, 12 七月 2024 22:54:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   76 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 1 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 147eef5..4ae14ea 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 = 鑷姩妯″紡
@@ -31,14 +33,17 @@
      * 寮傚父鐮�
      */
     public Short alarm;
+    public Short alarmTwo;
 
     /**
      * 浠诲姟鍙�
      */
     public Short taskNo = 0;
+    public Short taskNoTwo = 0;
 
     /**
      * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
+     * -1锛氭湭鐭�
      * 0锛氱┖闂诧紝鏃犱换鍔�
      * 1锛氬彇璐у畾浣嶄腑
      * 2锛氬彇璐т腑
@@ -49,23 +54,29 @@
      * 7锛氬簱浣嶇Щ浣�
      * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
      * 99锛氭姤璀�
+     * 100锛氬叾浠�100
+     * 101锛氭湭鐭�101
      */
-    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;
 
     /**
      * 褰撳墠璐у弶浣嶇疆
@@ -74,8 +85,10 @@
      * 2 = 璐у弶鍦ㄥ彸渚�
      */
     public Short forkPos;
+    public Short forkPosTwo;
 
     public CrnForkPosType forkPosType;
+    public CrnForkPosType forkPosTypeTwo;
 
     /**
      * 褰撳墠杞借揣鍙颁綅缃�
@@ -83,8 +96,10 @@
      * 1 = 涓婂畾浣�
      */
     public Short liftPos;
+    public Short liftPosTwo;
 
     public CrnLiftPosType liftPosType;
+    public CrnLiftPosType liftPosTypeTwo;
 
     /**
      * 璧拌鍦ㄥ畾浣�
@@ -92,11 +107,13 @@
      * 1 = 涓嶅湪瀹氫綅
      */
     public Short walkPos;
+    public Short walkPosTwo;
 
     /**
      * 杞借揣鍙版湁鐗�
      */
     public Short loaded;
+    public Short loadedTwo;
 
     private Short temp1;
 
@@ -205,6 +222,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);
@@ -215,9 +242,24 @@
         this.liftPos = CrnLiftPosType.get(type).id.shortValue();
     }
 
+    public void setLiftPosTwo(Short liftPosTwo) {
+        this.liftPosTwo = liftPosTwo;
+        this.liftPosTypeTwo = CrnLiftPosType.get(liftPosTwo);
+    }
+
+    public void setLiftPosTwo(CrnLiftPosType typeTwo) {
+        this.liftPosTypeTwo = typeTwo;
+        this.liftPosTwo = CrnLiftPosType.get(typeTwo).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){
@@ -246,6 +288,38 @@
             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(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