From 6c265faa61e5cf0ea8a0c4fce81355a52e211de0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 21 十一月 2023 16:08:46 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 16f7ab0..ca6aadc 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -45,13 +45,14 @@
 
                     //鍒濆鍖朢GV鍦板浘
 //                    mainService.initRgvMap();
+                    mainService.refreshRgvMap();
                     // 婕旂ず
                     mainService.crnDemoOfLocMove1();
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
@@ -66,10 +67,10 @@
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 
 //                    //缁戝畾灏忚溅鏂规硶
-                    mainService.rgvBindSte();
-                    mainService.rgvBindSte2();
-//                    // 鍏ュ嚭搴�  ===>>  RGV鍏ュ嚭搴撲綔涓氫笅鍙�
-                    mainService.rgvIoExecute();
+//                    mainService.rgvBindSte();
+//                    mainService.rgvBindSte2();
+////                    // 鍏ュ嚭搴�  ===>>  RGV鍏ュ嚭搴撲綔涓氫笅鍙�
+//                    mainService.rgvIoExecute();
 //                    // RGV鍏ュ簱  ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
 //                    mainService.rgvFinished();
 //                    // 鍏ュ嚭搴�  ===>>  RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
@@ -84,6 +85,7 @@
                     //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
                     mainService.rgvRunWrkMastEmptyStaPut();//鏀�
                     mainService.rgvRunWrkMastEmptyStaTake();//鍙�
+                    mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
 
 
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////

--
Gitblit v1.9.1