From a3d44470b704e81d4f66399bed2f37529ddb31be Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 25 十二月 2025 13:53:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java |   93 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java b/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java
index a13ee7a..f2ecb14 100644
--- a/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java
@@ -1,10 +1,13 @@
 package com.zy.core.model.protocol;
 
-import com.zy.core.enums.CrnForkPosType;
-import com.zy.core.enums.CrnLiftPosType;
-import com.zy.core.enums.CrnModeType;
-import com.zy.core.enums.CrnStatusType;
+import com.zy.core.enums.DualCrnForkPosType;
+import com.zy.core.enums.DualCrnLiftPosType;
+import com.zy.core.enums.DualCrnModeType;
+import com.zy.core.enums.DualCrnStatusType;
+
 import lombok.Data;
+
+import java.util.Map;
 
 @Data
 public class DualCrnProtocol {
@@ -18,7 +21,7 @@
      */
     public Integer mode;
 
-    public CrnModeType modeType;
+    public DualCrnModeType modeType;
 
     /**
      * 寮傚父鐮�
@@ -58,12 +61,12 @@
     /**
      * 宸ヤ綅1鐘舵�佹灇涓�
      */
-    public CrnStatusType statusType;
+    public DualCrnStatusType statusType;
 
     /**
      * 宸ヤ綅2鐘舵�佹灇涓�
      */
-    public CrnStatusType statusTypeTwo;
+    public DualCrnStatusType statusTypeTwo;
 
     /**
      * 宸ヤ綅1鍫嗗灈鏈哄綋鍓嶅垪鍙�
@@ -101,9 +104,9 @@
      */
     public Integer forkPosTwo;
 
-    public CrnForkPosType forkPosType;
+    public DualCrnForkPosType forkPosType;
 
-    public CrnForkPosType forkPosTypeTwo;
+    public DualCrnForkPosType forkPosTypeTwo;
 
     /**
      * 褰撳墠杞借揣鍙颁綅缃�
@@ -114,9 +117,9 @@
 
     public Integer liftPosTwo;
 
-    public CrnLiftPosType liftPosType;
+    public DualCrnLiftPosType liftPosType;
 
-    public CrnLiftPosType liftPosTypeTwo;
+    public DualCrnLiftPosType liftPosTypeTwo;
 
     /**
      * 璧拌鍦ㄥ畾浣�
@@ -133,6 +136,15 @@
     public Integer loaded;
 
     public Integer loadedTwo;
+
+    /**
+     * 浠诲姟鎺ユ敹鐘舵��
+     * 0 = 鏈帴鏀�
+     * 1 = 宸叉帴鏀�
+     */
+    public Integer taskReceive;
+
+    public Integer taskReceiveTwo;
 
     private Integer temp1;
 
@@ -199,44 +211,79 @@
      */
     private Long lastCommandTime = System.currentTimeMillis();
 
+    /**
+     * 鎵╁睍鏁版嵁
+     */
+    private Map<String, Object> extend;
+
     public void setMode(Integer mode) {
         this.mode = mode;
-        this.modeType = CrnModeType.get(mode);
+        this.modeType = DualCrnModeType.get(mode);
     }
 
-    public void setMode(CrnModeType type) {
+    public void setMode(DualCrnModeType type) {
         this.modeType = type;
-        this.mode = CrnModeType.get(type).id;
+        this.mode = DualCrnModeType.get(type).id;
     }
 
     public void setForkPos(Integer forkPos) {
         this.forkPos = forkPos;
-        this.forkPosType = CrnForkPosType.get(forkPos);
+        this.forkPosType = DualCrnForkPosType.get(forkPos);
     }
 
-    public void setForkPos(CrnForkPosType type) {
+    public void setForkPosTwo(Integer forkPosTwo) {
+        this.forkPosTwo = forkPosTwo;
+        this.forkPosTypeTwo = DualCrnForkPosType.get(forkPosTwo);
+    }
+
+    public void setForkPos(DualCrnForkPosType type) {
         this.forkPosType = type;
-        this.forkPos = CrnForkPosType.get(type).id;
+        this.forkPos = DualCrnForkPosType.get(type).id;
+    }
+
+    public void setForkPosTwo(DualCrnForkPosType type) {
+        this.forkPosTypeTwo = type;
+        this.forkPosTwo = DualCrnForkPosType.get(type).id;
     }
 
     public void setLiftPos(Integer liftPos) {
         this.liftPos = liftPos;
-        this.liftPosType = CrnLiftPosType.get(liftPos);
+        this.liftPosType = DualCrnLiftPosType.get(liftPos);
     }
 
-    public void setLiftPos(CrnLiftPosType type) {
+    public void setLiftPosTwo(Integer liftPosTwo) {
+        this.liftPosTwo = liftPosTwo;
+        this.liftPosTypeTwo = DualCrnLiftPosType.get(liftPosTwo);
+    }
+
+    public void setLiftPos(DualCrnLiftPosType type) {
         this.liftPosType = type;
-        this.liftPos = CrnLiftPosType.get(type).id;
+        this.liftPos = DualCrnLiftPosType.get(type).id;
+    }
+
+    public void setLiftPosTwo(DualCrnLiftPosType type) {
+        this.liftPosTypeTwo = type;
+        this.liftPosTwo = DualCrnLiftPosType.get(type).id;
     }
 
     public void setStatus(Integer status){
         this.status = status;
-        this.statusType = CrnStatusType.get(status);
+        this.statusType = DualCrnStatusType.get(status);
     }
 
-    public void setStatus(CrnStatusType type){
+    public void setStatus(DualCrnStatusType type){
         this.statusType = type;
-        this.status = CrnStatusType.get(type).id;
+        this.status = DualCrnStatusType.get(type).id;
+    }
+
+    public void setStatusTwo(Integer statusTwo){
+        this.statusTwo = statusTwo;
+        this.statusTypeTwo = DualCrnStatusType.get(statusTwo);
+    }
+
+    public void setStatusTwo(DualCrnStatusType type){
+        this.statusTypeTwo = type;
+        this.statusTwo = DualCrnStatusType.get(type).id;
     }
 
 }

--
Gitblit v1.9.1