From 5989fd098fea045da7a3612d2c9b0da38b2d1d27 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期日, 26 五月 2024 08:32:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a140f77..2cc40ed 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -72,24 +72,31 @@
                     mainService.storeFinishedTwo();
 
                     /************************************RGV璋冨害************************************/
-//                    i++;
-//                    k++;
-//                    if (i<7) {
-//                        // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
-//                        try{
-                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(7);  //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-//                            if (rgvIoExecuteSign){
-//                                k = 0;
-//                            } else if (k>7){
-//                                k = 0;
-//                                mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-//                            }
-//                        }catch (Exception e){
-//                            log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
-//                        }
-//                    }else {
-//                        i = 0;
-//                    }
+                    i++;
+                    k++;
+                    if (i<8) {
+                        // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
+                        if (i == 7) {
+                            try{
+                                boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);  //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
+//                                if (rgvIoExecuteSign){
+//                                    k = 0;
+//                                } else if (k>8){
+//                                    k = 0;
+//                                    mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+//                                }
+                            }catch (Exception e){
+                                log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                            }
+                        }else {
+                            //绌挎鏉�
+//                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);  //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
+
+                        }
+
+                    }else {
+                        i = 0;
+                    }
 //                    //瀹屾垚灏忚溅浠诲姟
                     mainService.rgvCompleteWrkMastSta();
                     /************************************RGV璋冨害************************************/

--
Gitblit v1.9.1