From 32bf433492f540b1392c19757124ebb91d0e74bd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 29 三月 2023 15:55:01 +0800
Subject: [PATCH] 四向车入库分配任务逻辑
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index c9257f4..839572d 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -70,9 +70,15 @@
vo.setBusyStatus(shuttleProtocol.getBusyStatusType().desc); //鍥涘悜绌挎杞︾姸鎬�
vo.setStatus(shuttleProtocol.getProtocolStatusType().desc);//褰撳墠浠诲姟鐘舵��
vo.setCurrentCode(shuttleProtocol.getCurrentCode());//褰撳墠浜岀淮鐮�
- vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() + "掳");//鐢垫睜娓╁害
- vo.setBatteryPower(shuttleProtocol.getBatteryPower$() + "%");//鐢垫睜鐢甸噺
+ vo.setBatteryPower(shuttleProtocol.getBatteryPower$() == null ? "" : shuttleProtocol.getBatteryPower$() + "%");//鐢垫睜鐢甸噺
+ vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() == null ? "" : shuttleProtocol.getBatteryTemp$() + "掳");//鐢垫睜娓╁害
+ if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
+ vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//閿欒缂栧彿
+ }
vo.setPlcOutputStatusIO(shuttleProtocol.getPlcOutputStatusIO());//Plc杈撳嚭鐘舵�両O
+ if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
+ vo.setStatusErrorCode(shuttleProtocol.getStatusErrorCode());//閿欒淇℃伅鐮�
+ }
vo.setPlcInputStatus(shuttleProtocol.getPlcInputStatus());//PLC杈撳叆鐘舵��
vo.setCurrentOrBeforeCode(shuttleProtocol.getCurrentOrBeforeCode());//褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��
vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
@@ -80,15 +86,9 @@
vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//褰撳墠鐨勭數鍘嬪��
vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//褰撳墠鐨勬ā鎷熼噺鍊�
vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
- vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//绉诲姩閫熷害
+ vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//褰撳墠鐨勮璧颁己鏈嶉�熷害
vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad());//褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad());//褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
- if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
- vo.setErrorCode(shuttleProtocol.getErrorCode());//閿欒缂栧彿
- }
- if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
- vo.setStatusErrorCode(shuttleProtocol.getStatusErrorCode());//閿欒淇℃伅鐮�
- }
}
return R.ok().add(list);
}
@@ -124,9 +124,13 @@
if (shuttleProtocol.getProtocolStatusType() != null) {
vo.setStatus(shuttleProtocol.getProtocolStatusType().desc);//鐘舵��
}
+ vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
+ vo.setCodeOffsetY(shuttleProtocol.getCodeOffsetY());//璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�
+ vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//褰撳墠鐨勭數鍘嬪��
+ vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//褰撳墠鐨勬ā鎷熼噺鍊�
vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//褰撳墠鐨勮璧颁己鏈嶉�熷害
- vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad() + "%");//褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
- vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad() + "%");//褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
+ vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad() == null ? "" : shuttleProtocol.getCurrentMoveServoLoad() + "%");//褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
+ vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad() == null ? "" : shuttleProtocol.getCurrentLiftServoLoad() + "%");//褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N"); // 浣滀笟鏍囪
}
@@ -191,23 +195,6 @@
// 绌挎杞﹀紓甯� -----------
// 绌挎杞︽彁绀轰俊鎭� ----------------------
-
- // 浠诲姟淇℃伅 ----------------
- vo.setPakInTask(shuttleProtocol.isPakInTask());
- vo.setPakOutTask(shuttleProtocol.isPakOutTask());
- vo.setPakMoveTask(shuttleProtocol.isPakMoveTask());
- vo.setGoHpTask(shuttleProtocol.isGoHpTask());
- vo.setGoOHpTask(shuttleProtocol.isGoOHpTask());
- vo.setGoHpAvoid(shuttleProtocol.isGoHpAvoid());
- vo.setGoOHpAvoid(shuttleProtocol.isGoOHpAvoid());
- vo.setPakInEmpty(shuttleProtocol.isPakInEmpty());
- vo.setPakInFinish(shuttleProtocol.isPakInFinish());
- vo.setPakOutEmpty(shuttleProtocol.isPakOutEmpty());
- vo.setPakOutFinish(shuttleProtocol.isPakOutFinish());
- vo.setGoHpAvoidFinish(shuttleProtocol.isGoHpAvoidFinish());
- vo.setGoOHpAvoidFinish(shuttleProtocol.isGoOHpAvoidFinish());
- vo.setGoHpAvoidErr(shuttleProtocol.isGoHpAvoidErr());
- vo.setGoOHpAvoidErr(shuttleProtocol.isGoOHpAvoidErr());
// 鐘舵�佷俊鎭� -------------
--
Gitblit v1.9.1