From 1edc46cc37adb14e30c80c22491d770bfe9214d1 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期四, 29 六月 2023 11:35:59 +0800 Subject: [PATCH] 优化寻车,出库问题 --- src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java index c26c8a8..b29c880 100644 --- a/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java +++ b/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java @@ -162,70 +162,121 @@ private Boolean pakMk = true; public String getLiftLock$() { + if (this.liftLock == null) { + return "N"; + } return this.liftLock ? "Y" : "N"; } public String getReady$() { + if (this.ready == null) { + return "N"; + } return this.ready ? "Y" : "N"; } public String getNotReady$() { + if (this.notReady == null) { + return "-"; + } return LiftNotReadyType.get((int) this.notReady).desc; } public String getRunning$() { + if (this.running == null) { + return "N"; + } return this.running ? "Y" : "N"; } public String getMode$() { + if (this.mode == null) { + return "N"; + } return this.mode ? "Y" : "N"; } public String getLineFrontHasStock$() { + if (this.lineFrontHasStock == null) { + return "N"; + } return this.lineFrontHasStock ? "Y" : "N"; } public String getForwardRotationFeedback$() { + if (this.forwardRotationFeedback == null) { + return "N"; + } return this.forwardRotationFeedback ? "Y" : "N"; } public String getReverseFeedback$() { + if (this.reverseFeedback == null) { + return "N"; + } return this.reverseFeedback ? "Y" : "N"; } public String getMotorOverload$() { + if (this.motorOverload == null) { + return "N"; + } return this.motorOverload ? "Y" : "N"; } public String getLineEndHasStock$() { + if (this.lineEndHasStock == null) { + return "N"; + } return this.lineEndHasStock ? "Y" : "N"; } public String getInConveyLineCardTrayAlarm$() { + if (this.inConveyLineCardTrayAlarm == null) { + return "N"; + } return this.inConveyLineCardTrayAlarm ? "Y" : "N"; } public String getOutConveyLineCardTrayAlarm$() { + if (this.outConveyLineCardTrayAlarm == null) { + return "N"; + } return this.outConveyLineCardTrayAlarm ? "Y" : "N"; } public String getPlatPositionDeviationAlarm$() { + if (this.platPositionDeviationAlarm == null) { + return "N"; + } return this.platPositionDeviationAlarm ? "Y" : "N"; } public String getPlatTorqueDeviationAlarm$() { + if (this.platTorqueDeviationAlarm == null) { + return "N"; + } return this.platTorqueDeviationAlarm ? "Y" : "N"; } public String getPlatShuttleCheck$() { + if (this.platShuttleCheck == null) { + return "N"; + } return this.platShuttleCheck ? "Y" : "N"; } public String getPakMk$() { + if (this.pakMk == null) { + return "N"; + } return this.pakMk ? "Y" : "N"; } public String getProtocolStatus$() { + if (this.protocolStatus == null) { + return LiftProtocolStatusType.OFFLINE.desc; + } return LiftProtocolStatusType.get(this.protocolStatus).desc; } -- Gitblit v1.9.1