From fc86a263ca2ffdb0e701261ff3b1e730b2065542 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 14 八月 2025 11:18:32 +0800
Subject: [PATCH] #RGV协议修改，rgv预调度，任务下发

---
 src/main/java/com/zy/core/model/protocol/RgvProtocol.java |  123 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 106 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index 1241c1d..eb177fa 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -5,6 +5,7 @@
 import com.zy.core.enums.RgvStatusType;
 import lombok.Data;
 
+import javax.swing.*;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -14,7 +15,7 @@
 @Data
 public class RgvProtocol implements Cloneable{
 
-    private Integer RgvNo;
+    private short RgvNo;
 
     /**
      * 1 = 鎵嬪姩妯″紡
@@ -26,12 +27,13 @@
     public RgvModeType modeType;
 
     /**
-     * RGV褰撳墠鐘舵��
+     * RGV褰撳墠鐘舵�佸伐浣�1
      * 0锛氱┖闂诧紝鏃犱换鍔�
      * 1锛氫綔涓氫腑
      * 2锛氭姤璀�
      */
     public Short status;
+
 
     /**
      * 鐘舵�佹灇涓�
@@ -41,7 +43,7 @@
     /**
      * 宸ヤ綅1浠诲姟鍙�
      */
-    public Short taskNo1 = 0;
+    public Integer taskNo1 = 0;
 
     /**
      * RGV宸ヤ綅1褰撳墠鐘舵��
@@ -60,12 +62,18 @@
     /**
      * 宸ヤ綅1鏈夌墿
      */
-    public Short loaded1;
+    public Boolean loaded1;
 
     /**
      * RGV褰撳墠浣嶇疆
      */
-    public Short RgvPos;
+    public Integer RgvPos;
+
+    /**
+     * RGV褰撳墠鐩殑浣嶇疆
+     */
+    public Integer RgvPosDestination;
+
 
     /**
      * 璧拌鍦ㄥ畾浣�
@@ -74,11 +82,46 @@
      */
     public Short walkPos;
 
+    /**
+     * 鎬ュ仠
+     */
+    public Boolean err1;
+
+    /**
+     * 鏈夌墿鏃犺祫鏂�
+     */
+    public Boolean err2;
+
+    /**
+     * 鏈夎祫鏂欐棤鐗�
+     */
+    public Boolean err3;
+
+    /**
+     * 鍛戒护閿欒璧拌鑱旇皟鍐茬獊
+     */
+    public Boolean err4;
+
+    /**
+     * 鐩爣涓鸿秴杩囪璧版瀬闄�
+     */
+    public Boolean err5;
+
+    /**
+     *  鍙橀鍣ㄥ紓甯�
+     */
+    public Boolean err6;
+
+    /**
+     * 鍏夌數寮傚父
+     */
+    public Boolean err7;
+
     //////////////////////     宸ヤ綅2瀹氫箟   //////////////////////////////////////////////////
     /**
      * 宸ヤ綅2浠诲姟鍙�
      */
-    public Short taskNo2 = 0;
+    public Integer taskNo2 = 0;
 
     /**
      * RGV宸ヤ綅2褰撳墠鐘舵��
@@ -97,7 +140,44 @@
     /**
      * 宸ヤ綅2鏈夌墿
      */
-    public Short loaded2;
+    public Boolean loaded2;
+
+//    /**
+//     * 鎬ュ仠
+//     */
+//    public Boolean err21;
+//
+//    /**
+//     * 鏈夌墿鏃犺祫鏂�
+//     */
+//    public Boolean err22;
+//
+//    /**
+//     * 鏈夎祫鏂欐棤鐗�
+//     */
+//    public Boolean err23;
+//
+//    /**
+//     * 鍛戒护閿欒璧拌鑱旇皟鍐茬獊
+//     */
+//    public Boolean err24;
+//
+//    /**
+//     * 鐩爣涓鸿秴杩囪璧版瀬闄�
+//     */
+//    public Boolean err25;
+//
+//    /**
+//     *  鍙橀鍣ㄥ紓甯�
+//     */
+//    public Boolean err26;
+//
+//    /**
+//     * 鍏夌數寮傚父
+//     */
+//    public Boolean err27;
+
+
     ///////////////////////////////////////////////////////////////////////////////////////
 
     /**
@@ -165,15 +245,24 @@
         this.status1 = RgvStatusType.get(type1).id.shortValue();
     }
 
-//    public void setStatus2(Short status2){
-//        this.status2 = status2;
-//        this.statusType2 = RgvStatusType.get(status2);
-//    }
-//
-//    public void setStatus2(RgvStatusType type2){
-//        this.statusType2 = type2;
-//        this.status2 = RgvStatusType.get(type2).id.shortValue();
-//    }
+    public void setStatus2(Short status2){
+        this.status2 = status2;
+        this.statusType2 = RgvStatusType.get(status2);
+    }
+
+    public void setStatus2(RgvStatusType type2){
+        this.statusType2 = type2;
+        this.status2 = RgvStatusType.get(type2).id.shortValue();
+    }
+
+    public boolean isLoaded1ing() {
+        return Boolean.TRUE.equals(this.loaded1);
+    }
+
+    public boolean isLoaded2ing() {
+        return Boolean.TRUE.equals(this.loaded2);
+    }
+
 
     /**
      * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
@@ -188,7 +277,7 @@
             basRgv.setRgvErr(alarm.longValue());
         }
         basRgv.setWrkNo1(taskNo1.intValue());
-//        basRgv.setWrkNo2(taskNo2.intValue());
+        basRgv.setWrkNo2(taskNo2.intValue());
         return basRgv;
     }
 

--
Gitblit v1.9.1