From 07559603c6ae9a98139716b6443a4a7b6dd66755 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 14 一月 2024 16:24:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ca6aadc..0480680 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -45,16 +45,21 @@
 
                     //鍒濆鍖朢GV鍦板浘
 //                    mainService.initRgvMap();
+                    //鍒锋柊RGV鍦板浘
                     mainService.refreshRgvMap();
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
+                    // 鍏ュ簱  ===>> 鐮佸灈浣嶈幏鍙栫┖鏉挎潯鐮佷俊鎭�
+                    mainService.generateStoreWrkFileFull2LouM(); // 缁勬墭
 //                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖�   1妤兼媶鍨涗綅缃�
+                    mainService.stnToCrnStnPick2();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -83,17 +88,25 @@
                     //鎵ц灏忚溅璐х墿鎼繍浠诲姟
                     mainService.rgvRunWrkMastFullSta();
                     //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
-                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
-                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
-                    mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-
-
+                    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();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute();
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
@@ -123,8 +136,10 @@
                     mainService.stackingCompletionDriveTray();
                     //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�
                     mainService.stackingCompletionDriveTray2();
+                    //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
+                    mainService.stackingCompletionDriveTrayOk2();
                     //璐存爣瀹屾垚缁х画涓嬩竴姝�
-                    mainService.stackingCompletionDriveTray3();
+//                    mainService.stackingCompletionDriveTray3();
 
 
                 } catch (Exception e) {

--
Gitblit v1.9.1