From 49cd991d855e1367f06e95a951af992f04724783 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 05 六月 2025 20:51:36 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 06ab983..0cf1887 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -493,6 +493,9 @@
if (basDevpPosition.getPlcPosition()-rgvProtocol.getRgvPos()>taskRunPerimeter){
if (!rgvNoM.contains(rgvProtocol.getRgvNo())){
rgvNoM.add(rgvProtocol.getRgvNo());
+ if (wrkMastRunCount == 0){
+ devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+1000;
+ }
wrkMastRunCount++;
break;
}
@@ -502,6 +505,9 @@
if (rgvProtocol.getRgvPos()+ perimeter -basDevpPosition.getPlcPosition()>taskRunPerimeter){
if (!rgvNoM.contains(rgvProtocol.getRgvNo())){
rgvNoM.add(rgvProtocol.getRgvNo());
+ if (wrkMastRunCount == 0){
+ devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+1000;
+ }
wrkMastRunCount++;
break;
}
@@ -578,7 +584,7 @@
if (rgvProtocol == null) {
continue;
}
-
+ wrkMastRunCount--;
if (rgvProtocol != null
&& rgvProtocol.modeType == RgvModeType.AUTO
&& rgvProtocol.getStatusType() == RgvStatusType.IDLE
@@ -588,7 +594,6 @@
log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护");
break;
}
- wrkMastRunCount--;
}
}
} catch (Exception e){
--
Gitblit v1.9.1