From 48020b340d4bce51660fa5b412085e4d4cd769f1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 18 七月 2023 17:03:32 +0800
Subject: [PATCH] #完善路径工具类

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 46291f8..37e50e7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -647,7 +647,7 @@
                             continue;
                         }
                         //琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
-                        RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), true);
+                        RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
 
                         //  鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
                         RgvCommand rgvCommand = new RgvCommand();
@@ -693,7 +693,7 @@
                             continue;
                         }
                         //琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
-                        RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), true);
+                        RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
 
                         //  鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
                         RgvCommand rgvCommand = new RgvCommand();
@@ -736,7 +736,7 @@
                             continue;
                         }
                         //琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
-                        RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), true);
+                        RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
 
                         //  鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
                         RgvCommand rgvCommand = new RgvCommand();
@@ -782,7 +782,7 @@
                             continue;
                         }
                         //琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
-                        RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), true);
+                        RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
 
                         //  鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
                         RgvCommand rgvCommand = new RgvCommand();
@@ -811,6 +811,10 @@
         }
     }
 
+    private boolean rgvIoExecuteWrk2To3() {
+        return false;
+    }
+
     /**
      * 鍥炲師鐐癸紝鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
      */

--
Gitblit v1.9.1