From 242bbccea6fd21c130f639cf7b9c6aa95d41fe44 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 16 一月 2024 11:12:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 91eb879..491999c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -45,15 +45,21 @@
//鍒濆鍖朢GV鍦板浘
// mainService.initRgvMap();
+ //鍒锋柊RGV鍦板浘
+ mainService.refreshRgvMap();
// 婕旂ず
- mainService.crnDemoOfLocMove1();
+// mainService.crnDemoOfLocMove1();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
+ // 鍏ュ簱 ===>> 鐮佸灈浣嶈幏鍙栫┖鏉挎潯鐮佷俊鎭�
+ mainService.generateStoreWrkFileFull2LouM(); // 缁勬墭
mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick();
+ // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃�
+ mainService.stnToCrnStnPick2();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -66,10 +72,10 @@
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
// //缁戝畾灏忚溅鏂规硶
- mainService.rgvBindSte();
- mainService.rgvBindSte2();
-// // 鍏ュ嚭搴� ===>> RGV鍏ュ嚭搴撲綔涓氫笅鍙�
- mainService.rgvIoExecute();
+// mainService.rgvBindSte();
+// mainService.rgvBindSte2();
+//// // 鍏ュ嚭搴� ===>> RGV鍏ュ嚭搴撲綔涓氫笅鍙�
+// mainService.rgvIoExecute();
// // RGV鍏ュ簱 ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
// mainService.rgvFinished();
// // 鍏ュ嚭搴� ===>> RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
@@ -77,15 +83,30 @@
// // 鍑哄簱 ===>> RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
// mainService.rgvOutDStnToOutStn();
-
-
-
+ //瀹屾垚灏忚溅浠诲姟
+ mainService.rgvCompleteWrkMastSta();
+ //鎵ц灏忚溅璐х墿鎼繍浠诲姟
+ mainService.rgvRunWrkMastFullSta();
+ //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
+ mainService.rgvRunWrkMastEmptyStaPut();//鏀�//鎷嗙洏
+ mainService.rgvRunWrkMastEmptyStaPutFull();//婊℃斁
+ mainService.rgvRunWrkMastEmptyStaTake();//鍙栧彔鐩�
+ mainService.rgvRunWrkMastEmptyStaTakeFull();////婊″彇
+ i++;
+ if (i > 3) {
+ mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+ i = 0;
+ }
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
// 寮傚父淇℃伅璁板綍
mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� 2妤�
mainService.storeEmptyPlt();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
+ mainService.storeEmptyPlt2();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
+ mainService.storeEmptyPlt3();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
@@ -115,8 +136,10 @@
mainService.stackingCompletionDriveTray();
//鎷嗗灈瀹屾垚缁х画涓嬩竴姝�
mainService.stackingCompletionDriveTray2();
+ //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
+ mainService.stackingCompletionDriveTrayOk2();
//璐存爣瀹屾垚缁х画涓嬩竴姝�
- mainService.stackingCompletionDriveTray3();
+// mainService.stackingCompletionDriveTray3();
} catch (Exception e) {
--
Gitblit v1.9.1