From 8d5d60146de86d91848627e11cfcf65985059c14 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 17 十月 2024 15:47:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 96e7bac..33a715a 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -342,7 +342,8 @@
ringThroughParam.setIndex(rgv.getId());
// ringThroughParam.setIndex(i);
- double[] doubles = Utils.RingThroughXY2(183.0, NumUtils.GetRandomIntInRange(183));
+// double[] doubles = Utils.RingThroughXY2(1737000.0, NumUtils.GetRandomIntInRange(183));
+ double[] doubles = Utils.RingThroughXY2(1737000.0, rgvProtocol.RgvPos.doubleValue());
// double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
ringThroughParam.setValueX(doubles[0]-2.94);
@@ -387,6 +388,9 @@
List<EnergyGatheringRingParam> result = new ArrayList<>();
try{
for (DevpSlave devp : slaveProperties.getDevp()) {
+ if (devp.getId()!=1){
+ break;
+ }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
if (devpThread.isResult()){
if (true){
--
Gitblit v1.9.1