From 614b7e06c168b9afcf76e10ea08cce54dcd23aca Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 25 十月 2024 16:11:02 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   96 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 89 insertions(+), 7 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..ec27ebb 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 = 鑷姩妯″紡
@@ -38,6 +40,11 @@
     public Short taskNo = 0;
 
     /**
+     * 浠诲姟鍙�
+     */
+    public Short taskNoTwo = 0;
+
+    /**
      * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
      * 0锛氱┖闂诧紝鏃犱换鍔�
      * 1锛氬彇璐у畾浣嶄腑
@@ -51,11 +58,16 @@
      * 99锛氭姤璀�
      */
     public Short status;
-
+    public Short statusTwo;
     /**
      * 鐘舵�佹灇涓�
      */
     public CrnStatusType statusType;
+
+    /**
+     * 鐘舵�佹灇涓�
+     */
+    public CrnStatusType statusTypeTwo;
 
     /**
      * 鍫嗗灈鏈哄綋鍓嶅垪鍙�
@@ -63,9 +75,18 @@
     public Short bay;
 
     /**
+     * 鍫嗗灈鏈哄綋鍓嶅垪鍙�
+     */
+    public Short bayTwo;
+
+    /**
      * 鍫嗗灈鏈哄綋鍓嶅眰鍙�
      */
     public Short level;
+    /**
+     * 鍫嗗灈鏈哄綋鍓嶅眰鍙�
+     */
+    public Short levelTwo;
 
     /**
      * 褰撳墠璐у弶浣嶇疆
@@ -74,6 +95,8 @@
      * 2 = 璐у弶鍦ㄥ彸渚�
      */
     public Short forkPos;
+
+    public Short forkPosTwo;
 
     public CrnForkPosType forkPosType;
 
@@ -84,6 +107,8 @@
      */
     public Short liftPos;
 
+    public Short liftPosTwo;
+
     public CrnLiftPosType liftPosType;
 
     /**
@@ -92,11 +117,21 @@
      * 1 = 涓嶅湪瀹氫綅
      */
     public Short walkPos;
+    /**
+     * 璧拌鍦ㄥ畾浣�
+     * 0 = 鍦ㄥ畾浣�
+     * 1 = 涓嶅湪瀹氫綅
+     */
+    public Short walkPosTwo;
 
     /**
      * 杞借揣鍙版湁鐗�
      */
     public Short loaded;
+    /**
+     * 杞借揣鍙版湁鐗�
+     */
+    public Short loadedTwo;
 
     private Short temp1;
 
@@ -164,6 +199,10 @@
      * Z琛岃蛋绾块�熷害m/min
      */
     private Float zSpeed;
+    /**
+     * Z琛岃蛋绾块�熷害m/min
+     */
+    private Float zSpeedTwo;
 
     /**
      * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
@@ -215,14 +254,24 @@
         this.liftPos = CrnLiftPosType.get(type).id.shortValue();
     }
 
-    public void setStatus(Short status){
+    public void setStatus(Short status) {
         this.status = status;
         this.statusType = CrnStatusType.get(status);
     }
 
-    public void setStatus(CrnStatusType type){
+    public void setStatus(CrnStatusType type) {
         this.statusType = type;
         this.status = CrnStatusType.get(type).id.shortValue();
+    }
+
+    public void setStatusTwo(Short status) {
+        this.statusTwo = status;
+        this.statusTypeTwo = CrnStatusType.get(status);
+    }
+
+    public void setStatusTwo(CrnStatusType type) {
+        this.statusTypeTwo = type;
+        this.statusTwo = CrnStatusType.get(type).id.shortValue();
     }
 
     public Short getTemp1() {
@@ -235,17 +284,50 @@
 
     /**
      * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
-     *       I:鍏ュ簱
-     *       O:鍑哄簱
+     * I:鍏ュ簱
+     * O:鍑哄簱
      */
     private String lastIo = "I";
 
 
-    public BasCrnp toSqlModel(BasCrnp basCrnp){
-        if (alarm!=null) {
+    public BasCrnp toSqlModel(BasCrnp basCrnp) {
+        if (alarm != null) {
             basCrnp.setCrnErr(alarm.longValue());
         }
         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 setzSpeedTwo(Short zSpeedTwo) {
+        this.zSpeedTwo = Float.valueOf(zSpeedTwo);
+    }
+
+    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