From 60b3a67586494fefd9501c29a00d35675b1dbdcf Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 十月 2024 16:36:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 9820ee0..84e96c6 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -33,6 +33,7 @@
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -66,6 +67,9 @@
private BasDevpPositionService basDevpPositionService;
@Autowired
private BasCircularShuttleService basCircularShuttleService;
+
+ @Value("${constant-parameters.perimeter}")
+ private Long perimeter;
@PostMapping("/table/rgv/state")
@ManagerAuth(memo = "RGV淇℃伅琛�")
@@ -347,8 +351,8 @@
ringThroughParam.setIndex(rgv.getId());
// ringThroughParam.setIndex(i);
-// double[] doubles = Utils.RingThroughXY2(1737000.0, NumUtils.GetRandomIntInRange(183));
- double[] doubles = Utils.RingThroughXYRgv(1737000.0, 1737000.0-rgvProtocol.RgvPos.doubleValue());
+// double[] doubles = Utils.RingThroughXY2(perimeter, NumUtils.GetRandomIntInRange(183));
+ double[] doubles = Utils.RingThroughXYRgv(perimeter, perimeter-rgvProtocol.RgvPos.doubleValue());
// double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
ringThroughParam.setValueX(doubles[0]-2.94);
@@ -368,7 +372,7 @@
for (BasDevpPosition basDevpPosition : basDevpPositions){
RingThroughParam ringThroughParam = new RingThroughParam();
ringThroughParam.setIndex(basDevpPosition.getDevNo());
- double[] doubles = Utils.RingThroughXYSta(1737000.0, 1737000.0-basDevpPosition.getPlcPosition());
+ 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);
result.add(ringThroughParam);
@@ -455,6 +459,9 @@
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol != null) {
rgvCircularShuttleParam.setPosition(rgvProtocol.getRgvPos());
+ if (rgvCircularShuttleParam.getStatus()==0){
+ rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
+ }
}
}
}
--
Gitblit v1.9.1