From 507397970e1186f9b7c10c8252168ebc7fb7b38b Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期日, 13 七月 2025 16:00:01 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/MainProcess.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 39eccda..cc878e0 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -47,8 +47,6 @@
 
                     //鍒濆鍖朢GV鍦板浘
 //                    mainService.initRgvMap();
-                    //鍒锋柊RGV鍦板浘
-                    mainService.refreshRgvMap();
                     // 婕旂ず
 //                    mainService.crnDemoOfLocMove1();
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
@@ -63,7 +61,7 @@
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖�   1妤兼媶鍨涗綅缃�
                     mainService.stnToCrnStnPick2();
                     // 2妤�212鍛煎彨绌烘澘
-                    mainService.stnToCrnStnPick3Auto(i);
+//                    mainService.stnToCrnStnPick3Auto(i);
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -72,6 +70,10 @@
 //                    mainService.crnIoWrkMast();
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
+
+
+                    //鍒锋柊RGV鍦板浘
+                    mainService.refreshRgvMap();
 
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////
                     i++;
@@ -88,6 +90,9 @@
                             }
                         }catch (Exception e){
                             log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                        }
+                        if (i==6) {
+                            i = 0;
                         }
                     }else {
                         i = 0;
@@ -132,11 +137,12 @@
 //                    mainService.stackingCompletionDriveTray3();
                     //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�  杩愯閫斾腑鑷姩閬胯绌烘澘
                     mainService.stackingCompletionDriveTray4();
-                    //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
-                    mainService.stackingCompletionDriveTrayOk2();
+                    //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�2==3搴熷純
+//                    mainService.stackingCompletionDriveTrayOk2();
                     //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
                     mainService.stackingCompletionDriveTrayOk3();
 
+                    mainService.armNoStartTwoLo();
                     mainService.armNoCleanUpTwoLo();
 
 

--
Gitblit v1.9.1