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 | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 38b1212..839572d 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -73,7 +73,7 @@
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.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//閿欒缂栧彿
}
vo.setPlcOutputStatusIO(shuttleProtocol.getPlcOutputStatusIO());//Plc杈撳嚭鐘舵�両O
if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
@@ -195,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