From 4375f7c1ccd8d6b7b3cfb4f641a3ce84b0907594 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 21 四月 2025 16:36:53 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/MainProcess.java |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 6add849..227e183 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;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -46,7 +47,7 @@
                     // 婕旂ず
 //                    mainService.crnDemoOfLocMove1();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-//                    mainService.generateStoreWrkFile(); // 缁勬墭
+                    mainService.generateStoreWrkFile(); // 缁勬墭
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -56,20 +57,28 @@
 
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
-                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-//                    mainService.storeEmptyPlt();
 
-//                    mainService.outOfDevp();
 
-                    // 鍏朵粬  ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
                     i++;
-                    if (i > 1) {
-//                        mainService.ioConvert();
+                    k++;
+                    if (i<7) {
+                        // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
+                        try{
+                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+                            if (rgvIoExecuteSign){
+                                k = 0;
+                            } else if (k>7){
+                                k = 0;
+                                mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+                            }
+                        }catch (Exception e){
+                            log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                        }
+                    }else {
                         i = 0;
                     }
-
-                    //鑷姩娲惧彂浠诲姟
-                    mainService.autoDistribute();
+                    //瀹屾垚灏忚溅浠诲姟
+                    mainService.rgvCompleteWrkMastSta();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1