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 | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 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 eb177fa..a0bfe6d 100644 --- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java @@ -26,6 +26,17 @@ public RgvModeType modeType; + private transient Long loadingStartTime; + + /** + * 鎵ц浼樺厛绾� + * 0:涓嶅垽鏂� + * 1锛氬伐浣�1鍏堟墽琛� + * 2锛氬伐浣�2鍏堟墽琛� + */ + public Short wrkTaskPri; + + /** * RGV褰撳墠鐘舵�佸伐浣�1 * 0锛氱┖闂诧紝鏃犱换鍔� @@ -296,12 +307,16 @@ public Integer getRgvPosI(){ //闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃� Map<Short,Integer> map = new HashMap<>(); - map.put((short) 1,100);map.put((short) 2,101); - map.put((short) 3,106);map.put((short) 4,107); - map.put((short) 5,112);map.put((short) 6,113); - map.put((short) 7,124); map.put((short) 8,119); - map.put((short) 9,149);map.put((short) 10,153); - map.put((short) 11,157);map.put((short) 12,161); + 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 map.get(RgvPos); -- Gitblit v1.9.1