From 20fa3d6b92c1d03365b8472b1a85bd34d03f9b88 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 10:26:55 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
1 files changed, 4 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 c41153e..27e2d7b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -468,8 +468,8 @@
List<Integer> rgvNoM = new ArrayList<>();
List<Integer> rgvNoR = new ArrayList<>();
- Integer wrkMastRunCount = 0;
- Long devperimeter = 0L;
+ int wrkMastRunCount = 0;
+ long devperimeter = 0L;
for (List<List<WrkMast>> wrkMastLists : wrkMastListAll) {
long rgvId = 0;
runRgv:
@@ -506,7 +506,7 @@
if (!rgvNoM.contains(rgvProtocol.getRgvNo())){
rgvNoM.add(rgvProtocol.getRgvNo());
if (wrkMastRunCount == 0){
- devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+1000;
+ devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+10000>perimeter? 10000:basDevpPosition.getPlcPosition()-taskRunPerimeter+10000;
}
wrkMastRunCount++;
break;
@@ -518,7 +518,7 @@
if (!rgvNoM.contains(rgvProtocol.getRgvNo())){
rgvNoM.add(rgvProtocol.getRgvNo());
if (wrkMastRunCount == 0){
- devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+1000;
+ devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+10000>perimeter? 10000:basDevpPosition.getPlcPosition()-taskRunPerimeter+10000;
}
wrkMastRunCount++;
break;
--
Gitblit v1.9.1