From c239509e6dabc82639aaab9e48cc4faf8b41fe80 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 16:31:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 20 +++++++++++++++++++-
1 files changed, 19 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 9ad1e2f..a1fad69 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -370,8 +370,11 @@
List<RingThroughParam> result = new ArrayList<>();
List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
for (BasDevpPosition basDevpPosition : basDevpPositions){
+ if (basDevpPosition.getDevNo() == 134){
+ continue;
+ }
RingThroughParam ringThroughParam = new RingThroughParam();
- ringThroughParam.setIndex(basDevpPosition.getDevNo()-100);
+ 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);
@@ -465,6 +468,21 @@
if (rgvCircularShuttleParam.getStatus()==0){
rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
}
+ if (rgvProtocol.getAlarmList().isEmpty()){
+ rgvCircularShuttleParam.setError(0);
+ rgvCircularShuttleParam.setError$("-");
+ } else {
+ StringBuilder alarmList = new StringBuilder();
+ for (Integer alarm : rgvProtocol.getAlarmList()){
+ BasRgvErr rgvErr = basRgvErrMapper.selectById(alarm);
+ alarmList.append((rgvErr==null || rgvErr.getErrName()==null)? "鏈煡寮傚父:"+alarm:rgvErr.getErrName());
+ if (alarm.equals(rgvProtocol.getAlarmList().get(rgvProtocol.getAlarmList().size() - 1))){
+ break;
+ }
+ alarmList.append("---");
+ }
+ rgvCircularShuttleParam.setError$(alarmList.toString());
+ }
}
}
}
--
Gitblit v1.9.1