From 48302c5c7f85bfdd52dfd071d7a9ef8628d87667 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 三月 2024 16:45:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    3 +++
 src/main/java/com/zy/core/MainProcess.java                  |   26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 650ff5a..cf585c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5464,6 +5464,9 @@
      * 灏忚溅鍦板浘鏇存柊  鏇存柊閿�
      * */
     public synchronized boolean rgvMapUpdate(BasRgvMap basRgvMapCurrent,Integer staStart,Integer staEnd){
+        if (true){
+            return true;
+        }
 
 //        List<Integer> integers = RouteUtils.RouteMapCurrentFar(basRgvMapCurrent.getNowRoute(),staStart,staEnd, basRgvMapCurrent.getLockStartRoute());
         //鏇存柊褰撳墠灏忚溅閿�
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 0cea60c..104120c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -82,26 +82,26 @@
                     mainService.storeFinishedTwo();
 
 //                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-//                    i++;
-//                    k++;
-//                    if (i<7) {
-//                        // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
-//                        try{
-//                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+                    i++;
+                    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;
-//                    }
+                        }catch (Exception e){
+                            log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                        }
+                    }else {
+                        i = 0;
+                    }
 //                    //瀹屾垚灏忚溅浠诲姟
-//                    mainService.rgvCompleteWrkMastSta();
+                    mainService.rgvCompleteWrkMastSta();
 //                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 
 //                    // 寮傚父淇℃伅璁板綍

--
Gitblit v1.9.1