From fdbbac3e711e6be54513cca6fa4ec3a17d293f49 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 四月 2023 14:13:59 +0800
Subject: [PATCH] 四向穿梭车充电逻辑
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 4 ++--
src/main/java/com/zy/asrs/controller/ShuttleController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 2 +-
src/main/webapp/views/shuttle.html | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 4288d5e..369efd4 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -113,7 +113,7 @@
vo.setCurrentOrBeforeCode(shuttleProtocol.getCurrentOrBeforeCode());//褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��
vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
vo.setCodeOffsetY(shuttleProtocol.getCodeOffsetY());//璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�
- vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//褰撳墠鐨勭數鍘嬪��
+ vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage() * 0.1);//褰撳墠鐨勭數鍘嬪��
vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//褰撳墠鐨勬ā鎷熼噺鍊�
vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//褰撳墠鐨勮璧颁己鏈嶉�熷害
diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
index e667541..99302f5 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
@@ -128,7 +128,7 @@
/**
* 褰撳墠鐨勭數鍘嬪��
*/
- private Short currentVoltage;
+ private Double currentVoltage;
/**
* 褰撳墠鐨勬ā鎷熼噺鍊�
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8f5e7b0..c3a8563 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3643,8 +3643,8 @@
} else if (wrkCharge.getWrkSts() == 56) {
//鍏呯數涓�
- //鍒ゆ柇灏忚溅鏄惁鍏呮弧鐢甸噺
- if (shuttleProtocol.getBatteryPower() == 1000) {
+ //鍒ゆ柇灏忚溅鏄惁鍏呮弧鐢甸噺锛屾弧鐢�1000鎴栫數鍘�54V浠ヤ笂
+ if (shuttleProtocol.getBatteryPower() >= 1000 || shuttleProtocol.getCurrentVoltage() >= 540) {
//鍏呮弧锛屾柇寮�鍏呯數
List<ShuttleCommand> commands = new ArrayList<>();
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index ed473bd..43f7994 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -289,10 +289,10 @@
if (!res) {
return res;
} else {
- // 鐢甸噺
+ // 鐢甸噺灏忎簬闃堝�兼垨鐢靛帇灏忎簬48V锛岄渶瑕佽繘琛屽厖鐢�
try {
Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
- return this.getBatteryPower$() < chargeLine;
+ return this.getBatteryPower$() < chargeLine || this.currentVoltage < 480;
} catch (Exception e) {
News.error("fail", e);
return false;
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index ce3a332..a9a6be3 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -611,7 +611,7 @@
setVal(tr.children("td").eq(13), table[i-1].currentOrBeforeCode);
setVal(tr.children("td").eq(14), table[i-1].codeOffsetX);
setVal(tr.children("td").eq(15), table[i-1].codeOffsetY);
- setVal(tr.children("td").eq(16), table[i-1].currentVoltage);
+ setVal(tr.children("td").eq(16), table[i-1].currentVoltage ? table[i-1].currentVoltage + "V" : "");
setVal(tr.children("td").eq(17), table[i-1].currentAnalogValue);
}
} else if (res.code === 403){
--
Gitblit v1.9.1