From 924d0d98c49c324669ba9dc5158b2141416447cc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 21 八月 2025 16:26:44 +0800
Subject: [PATCH] #rgv同时下发工位1和工位2任务，标记优先级

---
 src/main/java/com/zy/core/model/command/RgvCommand.java |   92 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/model/command/RgvCommand.java b/src/main/java/com/zy/core/model/command/RgvCommand.java
index 5be8072..d6c6da9 100644
--- a/src/main/java/com/zy/core/model/command/RgvCommand.java
+++ b/src/main/java/com/zy/core/model/command/RgvCommand.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.zy.core.enums.RgvTaskModeType;
+import com.zy.core.enums.RgvTaskStatusType;
 import lombok.Data;
 
 import java.util.Calendar;
@@ -18,10 +19,10 @@
     private Integer rgvNo = 0;
 
     // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
-    private Short ackFinish1 = 0;
+    private Boolean ackFinish1 = true;
 
     // 宸ヤ綅1浠诲姟鍙�
-    private Short taskNo1 = 0;
+    private Integer taskNo1 = 0;
 
     /**
      * 浠诲姟妯″紡锛�
@@ -32,8 +33,16 @@
      */
     private Short taskMode1 = 0;
 
+    /**
+     * 浣滀笟妯″紡
+     */
+    private Short taskStatus1 = 0;
+
     @JSONField(serialize = false)
     private RgvTaskModeType taskModeType1;
+
+    @JSONField(serialize = false)
+    private RgvTaskStatusType taskStatusType1;
 
     /*
     宸ヤ綅1婧愮珯
@@ -45,12 +54,26 @@
      */
     private Short destinationStaNo1 = 0;
 
+    /**
+     * 宸ヤ綅1鐩爣浣嶇疆
+     */
+    private Integer targetPosition1 = 0;
+    /**
+     * RGV鏀捐揣鍚庤揣鐗╄鍘荤殑鐩殑鍦�
+     */
+    private Integer endStaNo1 = 0;
+
+    /**
+     * 鎵ц鏂瑰悜
+     */
+    private Short direction1 = 0;
+
     //////////////////////     宸ヤ綅2瀹氫箟   //////////////////////////////////////////////////
-    // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
-    private Short ackFinish2 = 0;
+    // 宸ヤ綅2浠诲姟瀹屾垚纭浣�
+    private Boolean ackFinish2 = true;
 
     // 宸ヤ綅2浠诲姟鍙�
-    private Short taskNo2 = 0;
+    private Integer taskNo2 = 0;
 
     /**
      * 浠诲姟妯″紡锛�
@@ -61,18 +84,41 @@
      */
     private Short taskMode2 = 0;
 
+    /**
+     * 浣滀笟妯″紡
+     */
+    private Short taskStatus2 = 0;
+
     @JSONField(serialize = false)
     private RgvTaskModeType taskModeType2;
 
+    @JSONField(serialize = false)
+    private RgvTaskStatusType taskStatusType2;
+
     /*
-    宸ヤ綅1婧愮珯
+    宸ヤ綅2婧愮珯
      */
     private Short sourceStaNo2 = 0;
 
     /*
-    宸ヤ綅1鐩爣绔�
+    宸ヤ綅2鐩爣绔�
      */
     private Short destinationStaNo2 = 0;
+
+    /**
+     * 宸ヤ綅2鐩爣浣嶇疆
+     */
+    private Integer targetPosition2 = 0;
+
+    /**
+     * RGV鏀捐揣鍚庤揣鐗╄鍘荤殑鐩殑鍦�
+     */
+    private Integer endStaNo2 = 0;
+
+    /**
+     * 鎵ц鏂瑰悜
+     */
+    private Short direction2 = 0;
     ///////////////////////////////////////////////////////////////////////////////////////
 
     /**
@@ -81,8 +127,18 @@
      * 1 = 宸ヤ綅1浠诲姟纭
      * 2 = 宸ヤ綅2浠诲姟纭
      * 3 = 宸ヤ綅1銆�2浠诲姟鍚屾椂纭
+     * false 鏈‘璁�
+     * true 鎵ц
      */
-    private Short command = 0;
+    private Boolean command = false;
+
+    /**
+     * 鍚屾椂涓嬪彂鏃朵綔涓氶『搴�
+     * 0锛氭棤锛堜笉鍒ゆ柇锛�
+     * 1锛氬伐浣�1鍏堟墽琛�
+     * 2锛氬伐浣�2鍏堟墽琛�
+     */
+    Short wrkTaskPri = 0;
 
     public void setTaskMode1(Short taskMode1){
         this.taskMode1 = taskMode1;
@@ -104,6 +160,26 @@
         this.taskMode2 = RgvTaskModeType.get(type2).id.shortValue();
     }
 
+    public void setTaskStatus1(Short taskStatus1){
+        this.taskStatus1 = taskStatus1;
+        this.taskStatusType1 = RgvTaskStatusType.get(taskStatusType1);
+    }
+
+    public void setTaskStatus1(RgvTaskStatusType type1) {
+        this.taskStatusType1 = type1;
+        this.taskStatus1 = RgvTaskStatusType.get(type1).id.shortValue();
+    }
+
+    public void setTaskStatus2(Short taskStatus2){
+        this.taskStatus2 = taskStatus2;
+        this.taskStatusType2 = RgvTaskStatusType.get(taskStatusType2);
+    }
+
+    public void setTaskStatus2(RgvTaskStatusType type2) {
+        this.taskStatusType2 = type2;
+        this.taskStatus2 = RgvTaskStatusType.get(type2).id.shortValue();
+    }
+
     public static void main(String[] args) {
         Date date = new Date();
         Calendar cal = Calendar.getInstance();

--
Gitblit v1.9.1