From 9fd5e6fbcb1d8badf1835478d862ac40bfb60f3c Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期三, 10 十二月 2025 16:59:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 5fe0cb4..6c12e13 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -391,7 +391,11 @@
// ringThroughParam.setIndex(i);
// double[] doubles = Utils.RingThroughXY2(perimeter, NumUtils.GetRandomIntInRange(183));
// double[] doubles = Utils.RingThroughXYRgv(perimeter, perimeter-rgvProtocol.RgvPos.doubleValue());
- double[] doubles = Utils.getRgvPosNew(trackEntireLength, rgvProtocol.RgvPos.doubleValue());
+ double v = rgvProtocol.RgvPos.doubleValue() ;
+ if (rgv.getId()>2){
+ v = rgvProtocol.RgvPos.doubleValue() + 1000000.0;
+ }
+ double[] doubles = Utils.getRgvPosNew(trackEntireLength, v);
ringThroughParam.setValueX(doubles[0]);
ringThroughParam.setValueY(doubles[1]);
@@ -445,7 +449,11 @@
// double[] doubles = Utils.RingThroughXYSta(perimeter, perimeter-basDevpPosition.getPlcPosition());
// ringThroughParam.setValueX(doubles[0]>50? doubles[0]+6:doubles[0]-1);
// ringThroughParam.setValueY(doubles[1]>50? doubles[1]+6:doubles[1]-1);
- double[] doubles = Utils.getRgvPosNew(basDevpPosition.getDevNo(),trackEntireLength, basDevpPosition.getPlcPosition());
+ double v = basDevpPosition.getPlcPosition() ;
+ if (basDevpPosition.getDevNo()>200){
+ v = basDevpPosition.getPlcPosition() + 1000000.0;
+ }
+ double[] doubles = Utils.getRgvPosNew(basDevpPosition.getDevNo(),trackEntireLength, v);
ringThroughParam.setValueX(doubles[0]);
ringThroughParam.setValueY(doubles[1]);
result.add(ringThroughParam);
--
Gitblit v1.9.1