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/protocol/RgvProtocol.java | 143 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 134 insertions(+), 9 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 d952086..a0bfe6d 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -5,13 +5,17 @@
import com.zy.core.enums.RgvStatusType;
import lombok.Data;
+import javax.swing.*;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Created by vincent on 2020/8/7
*/
@Data
-public class RgvProtocol {
+public class RgvProtocol implements Cloneable{
- private Integer RgvNo;
+ private short RgvNo;
/**
* 1 = 鎵嬪姩妯″紡
@@ -22,13 +26,25 @@
public RgvModeType modeType;
+ private transient Long loadingStartTime;
+
/**
- * RGV褰撳墠鐘舵��
+ * 鎵ц浼樺厛绾�
+ * 0:涓嶅垽鏂�
+ * 1锛氬伐浣�1鍏堟墽琛�
+ * 2锛氬伐浣�2鍏堟墽琛�
+ */
+ public Short wrkTaskPri;
+
+
+ /**
+ * RGV褰撳墠鐘舵�佸伐浣�1
* 0锛氱┖闂诧紝鏃犱换鍔�
* 1锛氫綔涓氫腑
* 2锛氭姤璀�
*/
public Short status;
+
/**
* 鐘舵�佹灇涓�
@@ -38,7 +54,7 @@
/**
* 宸ヤ綅1浠诲姟鍙�
*/
- public Short taskNo1 = 0;
+ public Integer taskNo1 = 0;
/**
* RGV宸ヤ綅1褰撳墠鐘舵��
@@ -57,12 +73,18 @@
/**
* 宸ヤ綅1鏈夌墿
*/
- public Short loaded1;
+ public Boolean loaded1;
/**
* RGV褰撳墠浣嶇疆
*/
- public Short RgvPos;
+ public Integer RgvPos;
+
+ /**
+ * RGV褰撳墠鐩殑浣嶇疆
+ */
+ public Integer RgvPosDestination;
+
/**
* 璧拌鍦ㄥ畾浣�
@@ -71,11 +93,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褰撳墠鐘舵��
@@ -94,7 +151,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;
+
+
///////////////////////////////////////////////////////////////////////////////////////
/**
@@ -172,6 +266,15 @@
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);
+ }
+
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
@@ -203,8 +306,30 @@
public Integer getRgvPosI(){
//闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
+ Map<Short,Integer> map = new HashMap<>();
+ map.put((short) 1,1004);map.put((short) 2,1007);
+ map.put((short) 3,1010);map.put((short) 4,1014);
+ map.put((short) 5,1018);map.put((short) 6,1021);
+ map.put((short) 7,1024); map.put((short) 8,1028);
+ map.put((short) 9,1031);map.put((short) 10,1035);
+ map.put((short) 11,2003);map.put((short) 12,2006);
+ map.put((short) 13,2009);map.put((short) 14,2012);
+ map.put((short) 15,2015);map.put((short) 16,2018);
+ map.put((short) 17,2021);map.put((short) 18,2024);
+ map.put((short) 19,2027);map.put((short) 20,2030);
if (RgvPos==null) return 0;
- return RgvPos.intValue();
+
+ return map.get(RgvPos);
+ }
+
+ @Override
+ public RgvProtocol clone() {
+ try {
+ return (RgvProtocol) super.clone();
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ }
+ return null;
}
}
--
Gitblit v1.9.1