Junjie
2023-03-29 32bf433492f540b1392c19757124ebb91d0e74bd
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输出状态IO
            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());
                // 状态信息 -------------