From 6ba157825d34078a75fee36cb66ead17327f5b32 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 29 四月 2025 14:32:55 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ac59b57..858c5ba 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -26,6 +26,7 @@
     private Thread thread;
     // 棰戠巼
     private int i = 0;
+    private int k = 0;
     private boolean rgcWrk = true;
 
     /**
@@ -37,7 +38,7 @@
                 try {
 
                     // 闂撮殧
-                    Thread.sleep(500);
+                    Thread.sleep(1000);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -45,18 +46,22 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     //鍒锋柊RGV鍦板浘
                     mainService.refreshRgvMap();
 
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
+
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+//                    mainService.stnToCrnStnPick(3);
+                    mainService.stnToCrnStnPick2();
+
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(1); // 缁勬墭
-                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
                     Thread.sleep(500);
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick(3);
+
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn(4);
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -95,14 +100,14 @@
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 //
                     //瀹屾垚灏忚溅浠诲姟
-                    mainService.rgvCompleteWrkMastSta();
+//                    mainService.rgvCompleteWrkMastSta();
 
 //                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
 //                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
 //                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
 //                    if (rgcWrk){
 //                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-                        mainService.rgvRunWrkMastFullSta();
+//                        mainService.rgvRunWrkMastFullSta();
 //                        rgcWrk = false;
 //                    }else {
 //                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
@@ -111,6 +116,24 @@
 
 
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+                    k++;
+
+                    // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
+                    try{
+                        boolean rgvIoExecuteSign = mainService.rgvRunWrkMastFullSta();
+                        if (rgvIoExecuteSign){
+                            k = 0;
+                        } else if (k>4){
+                            k = 0;
+                            mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+                        }
+                    }catch (Exception e){
+                        log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                    }
+                    //瀹屾垚灏忚溅浠诲姟
+                    mainService.rgvCompleteWrkMastSta();
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1