src/main/java/com/zy/asrs/controller/ShuttleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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())) { src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -1,5 +1,6 @@ package com.zy.core.model.protocol; import com.zy.core.enums.ShuttleErrorCodeType; import com.zy.core.enums.ShuttleProtocolStatusType; import com.zy.core.enums.ShuttleStatusType; import com.zy.core.model.command.ShuttleAssignCommand; @@ -80,6 +81,11 @@ * 错误编号 */ private Short errorCode; /** * 错误编号枚举 */ private ShuttleErrorCodeType errorCodeType; /** * Plc输出状态IO @@ -258,4 +264,20 @@ this.protocolStatusType = status; } /** * 设置错误编号 */ public void setErrorCode(Short errorCode) { this.errorCode = errorCode; this.errorCodeType = ShuttleErrorCodeType.get(errorCode.intValue()); } /** * 设置错误编号 */ public void setErrorCode(ShuttleErrorCodeType type) { this.errorCode = type.id.shortValue(); this.errorCodeType = type; } }