From 5180133179d3589a1c64cdf0a1431990b80f1bc2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 01 三月 2025 16:30:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 08ca18c..9ad1e2f 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -371,10 +371,13 @@
List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
for (BasDevpPosition basDevpPosition : basDevpPositions){
RingThroughParam ringThroughParam = new RingThroughParam();
- ringThroughParam.setIndex(basDevpPosition.getDevNo());
- 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);
+ ringThroughParam.setIndex(basDevpPosition.getDevNo()-100);
+// 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(),perimeter, basDevpPosition.getPlcPosition());
+ ringThroughParam.setValueX(doubles[0]);
+ ringThroughParam.setValueY(doubles[1]);
result.add(ringThroughParam);
}
return R.ok().add(result);
--
Gitblit v1.9.1