From 9de7e9ef1f17b55278a21350d193934db158c2db Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 四月 2023 17:06:28 +0800
Subject: [PATCH] 穿梭车状态和提升机状态为空问题
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 4 ++
src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java | 21 ++++++++++
src/main/java/com/zy/asrs/controller/ShuttleController.java | 3 +
src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java | 51 +++++++++++++++++++++++++
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 3 +
src/main/java/com/zy/asrs/controller/LiftController.java | 2 +
6 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index a6c157c..3443596 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -14,6 +14,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.LiftProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LiftSlave;
import com.zy.core.model.Task;
@@ -56,6 +57,7 @@
// 鑾峰彇鎻愬崌鏈轰俊鎭�
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
if (liftThread == null) {
+ vo.setProtocolStatus(LiftProtocolStatusType.OFFLINE.id);//绂荤嚎
continue;
}
LiftProtocol liftProtocol = liftThread.getLiftProtocol();
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index d0bc966..0f428b9 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -144,6 +144,9 @@
if (shuttleProtocol == null) {
continue;
}
+ if (shuttleProtocol.getShuttleNo() == null) {
+ continue;
+ }
vo.setWorkNo(shuttleProtocol.getTaskNo().intValue());//浠诲姟鍙�
if (shuttleProtocol.getTaskNo() > 0) {
diff --git a/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java
index b09be1e..17b006a 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java
@@ -57,30 +57,51 @@
private Boolean outConveyLineCardTrayAlarm;
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";
}
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;
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
index 8b2d22c..4ef529b 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
@@ -210,6 +210,9 @@
}
public String getStatus$() {
+ if (this.status == null) {
+ return ShuttleProtocolStatusType.OFFLINE.desc;
+ }
return ShuttleProtocolStatusType.get(this.status).desc;
}
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index cebf771..e736217 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -277,6 +277,10 @@
// 鏄惁婊¤冻鍏呯數鐘舵��
public Boolean isRequireCharge() {
+ if (this.busyStatusType == null || this.pakMk == null || this.errorCodeType == null || this.taskNo == null) {
+ return false;
+ }
+
boolean res = this.busyStatusType.equals(ShuttleStatusType.IDLE)
&& this.pakMk.equals(true)
&& this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
--
Gitblit v1.9.1