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 | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index bf121b5..0e45ca0 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -370,11 +370,17 @@
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());
- 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.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);
@@ -462,6 +468,9 @@
if (rgvCircularShuttleParam.getStatus()==0){
rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
}
+ if (rgvCircularShuttleParam.getError()==0){
+ rgvCircularShuttleParam.setError$(rgvProtocol.getAlarm$());
+ }
}
}
}
@@ -473,10 +482,10 @@
@PostMapping("/disable/rgv/status")
// @ManagerAuth(memo = "淇敼RGV鐘舵��")
- public R rgvDisableStatus(@RequestParam Integer rgvId,
+ public R rgvDisableStatus(@RequestParam Integer rgvNo,
@RequestParam Integer status){
- log.info("/disable/rgv/status===銆嬩慨鏀筊GV鐘舵�侊紒锛侊紒rgvId:{},status:{},data:{}",rgvId,status,new Date());
- BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", rgvId));
+ log.info("/disable/rgv/status===銆嬩慨鏀筊GV鐘舵�侊紒锛侊紒rgvNo:{},status:{},data:{}",rgvNo,status,new Date());
+ BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_no", rgvNo));
if (basCircularShuttle == null){
return R.error().add("鏈壘鍒版RGV锛屽紓甯革紒锛侊紒");
}
--
Gitblit v1.9.1