From eb5eb35a7ef56a01a4c788a8c2efef9fc7b823e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 14:04:54 +0800
Subject: [PATCH] 四向穿梭车线程完善
---
src/main/java/com/zy/asrs/controller/SteController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index ae3b776..caf6d76 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -201,6 +201,63 @@
if (steProtocol == null) {
return R.error("璁惧涓嶅湪绾�");
}
+
+ // 绌挎杞﹀紓甯� -----------
+ vo.setLiftErr(steProtocol.isLiftErr());
+ vo.setInFetchErr(steProtocol.isInFetchErr());
+ vo.setOutFetchErr(steProtocol.isOutFetchErr());
+ vo.setAntiErr(steProtocol.isAntiErr());
+ vo.setLiftSwitchErr(steProtocol.isLiftSwitchErr());
+ vo.setTrackErr(steProtocol.isTrackErr());
+ vo.setTimeoutErr(steProtocol.isTimeoutErr());
+ vo.setConnectErr(steProtocol.isConnectErr());
+ vo.setEmergencyErr(steProtocol.isEmergencyErr());
+ vo.setTaskTypeErr(steProtocol.isTaskTypeErr());
+ vo.setTaskNoErr(steProtocol.isTaskNoErr());
+ vo.setNewTaskErr(steProtocol.isNewTaskErr());
+ vo.setErrTaskErr(steProtocol.isErrTaskErr());
+ vo.setStopErr(steProtocol.isStopErr());
+ vo.setOfflineTaskErr(steProtocol.isOfflineTaskErr());
+ vo.setStartTaskErr(steProtocol.isStartTaskErr());
+ vo.setVoltageTaskErr(steProtocol.isVoltageTaskErr());
+ vo.setDevpErr(steProtocol.isDevpErr());
+
+ // 绌挎杞︽彁绀轰俊鎭� ----------------------
+ vo.setOnline(steProtocol.isOnline());
+ vo.setNotOnTrack(steProtocol.isNotOnTrack());
+ vo.setLowVoltage(steProtocol.isLowVoltage());
+ vo.setElectricityLoss(steProtocol.isElectricityLoss());
+ vo.setForcedTravel(steProtocol.isForcedTravel());
+ vo.setDemoMode(steProtocol.isDemoMode());
+ vo.setBrushConnect(steProtocol.isBrushConnect());
+ vo.setTaskManualForbid(steProtocol.isTaskManualForbid());
+ vo.setOnlineManualForbid(steProtocol.isOnlineManualForbid());
+ vo.setDevpEmergency(steProtocol.isDevpEmergency());
+ vo.setTaskInterrupt(steProtocol.isTaskInterrupt());
+ vo.setTaskClear(steProtocol.isTaskClear());
+ vo.setTaskConfirmTimeout(steProtocol.isTaskConfirmTimeout());
+ vo.setTaskWithCharge(steProtocol.isTaskWithCharge());
+
+ // 浠诲姟淇℃伅 ----------------
+ vo.setPakInTask(steProtocol.isPakInTask());
+ vo.setPakOutTask(steProtocol.isPakOutTask());
+ vo.setPakMoveTask(steProtocol.isPakMoveTask());
+ vo.setGoHpTask(steProtocol.isGoHpTask());
+ vo.setGoOHpTask(steProtocol.isGoOHpTask());
+ vo.setGoHpAvoid(steProtocol.isGoHpAvoid());
+ vo.setGoOHpAvoid(steProtocol.isGoOHpAvoid());
+ vo.setPakInEmpty(steProtocol.isPakInEmpty());
+ vo.setPakInFinish(steProtocol.isPakInFinish());
+ vo.setPakOutEmpty(steProtocol.isPakOutEmpty());
+ vo.setPakOutFinish(steProtocol.isPakOutFinish());
+ vo.setGoHpAvoidFinish(steProtocol.isGoHpAvoidFinish());
+ vo.setGoOHpAvoidFinish(steProtocol.isGoOHpAvoidFinish());
+ vo.setGoHpAvoidErr(steProtocol.isGoHpAvoidErr());
+ vo.setGoOHpAvoidErr(steProtocol.isGoOHpAvoidErr());
+
+ // 鐘舵�佷俊鎭� -------------
+ vo.setAutoMode(steProtocol.isAutoMode());
+ vo.setVoltageLow(steProtocol.isVoltageLow());
break;
}
}
--
Gitblit v1.9.1