From b40ae90237b1ce741dae89aed09047d0dfbffcf1 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 06 六月 2025 16:05:21 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/controller/RgvController.java | 8 +++++++- 1 files changed, 7 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..0e45ca0 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,9 @@ if (rgvCircularShuttleParam.getStatus()==0){ rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc); } + if (rgvCircularShuttleParam.getError()==0){ + rgvCircularShuttleParam.setError$(rgvProtocol.getAlarm$()); + } } } } -- Gitblit v1.9.1