From 236b02d3d3d59025697fe9837b70b678ee339c46 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 14 十二月 2023 19:52:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java | 234 ++++++++++++++++++++++------------------------------------
1 files changed, 89 insertions(+), 145 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 3a43152..ad38491 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java
@@ -1,5 +1,6 @@
package com.zy.asrs.domain.vo;
+import com.zy.core.enums.LiftNotReadyType;
import com.zy.core.enums.LiftProtocolStatusType;
import lombok.Data;
@@ -15,209 +16,152 @@
private Short taskNo = 0;
/**
+ * 鍥涘悜绌挎杞﹀彿
+ */
+ private Short shuttleNo = 0;
+
+ /**
* 褰撳墠鎻愬崌鏈虹姸鎬侊紙鍐呴儴鑷垜缁存姢锛�
*/
- private String protocolStatus;
+ private Integer protocolStatus;
/**
- * 鎻愬崌鏈洪攣瀹�
+ * 妯″紡
*/
- private Boolean liftLock;
+ private Boolean model;
/**
- * 浣嶇疆鍒拌揪鍙嶉
+ * 蹇欓棽
*/
- private Short positionArrivalFeedback;
+ private Boolean busy;
/**
- * 鍑嗗灏辩华
- * 灏辩华涓�1锛屾湭灏辩华涓�0
+ * 鏈夋墭鐩�
*/
- private Boolean ready;
+ private Boolean hasTray;
/**
- * 杩愯涓�
- * 杩愯涓负1锛屾湭杩愯涓�0
+ * 鏈夊皬杞�
*/
- private Boolean running;
+ private Boolean hasCar;
/**
- * 鑱旀満/鍗曟満
- * 鑱旀満涓�1锛屽崟鏈轰负0
+ * 璁惧鏁呴殰
*/
- private Boolean mode;
+ private Boolean deviceError;
/**
- * 杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
- * 鏈夎揣涓�1锛屾棤璐т负0锛堝墠绔寚闈犺繎璐ф灦渚э級
+ * 鍓嶈秴闄�
*/
- private Boolean lineFrontHasStock;
+ private Boolean frontOverrun;
/**
- * 杈撻�佺嚎姝ｈ浆鍙嶉
- * 姝ｈ浆杩愯涓�1锛屽惁鍒欎负0
+ * 鍚庤秴闄�
*/
- private Boolean forwardRotationFeedback;
+ private Boolean backOverrun;
/**
- * 杈撻�佺嚎鍙嶈浆鍙嶉
- * 鍙嶈浆杩愯涓�1锛屽惁鍒欎负0
+ * 宸﹁秴闄�
*/
- private Boolean reverseFeedback;
+ private Boolean leftOverrun;
/**
- * 杈撻�佺嚎鐢垫満杩囪浇
- * 杩囪浇涓�0锛屾甯镐负1
+ * 鍙宠秴闄�
*/
- private Boolean motorOverload;
+ private Boolean rightOverrun;
/**
- * 杈撻�佺嚎鏈鍏夌數鏈夎揣
- * 鏈夎揣涓�1锛屾棤璐т负0
+ * 瓒呴珮
*/
- private Boolean lineEndHasStock;
+ private Boolean overHeight;
/**
- * 杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
- * 鎶ヨ涓�1锛屾湭鎶ヨ涓�0
+ * 瓒呴噸
*/
- private Boolean inConveyLineCardTrayAlarm;
+ private Boolean overWeight;
- /**
- * 鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
- * 鎶ヨ涓�1锛屾湭鎶ヨ涓�0
- */
- private Boolean outConveyLineCardTrayAlarm;
-
- /**
- * 骞冲彴浣嶇疆鍋忓樊鎶ヨ
- * 鎶ヨ涓�1锛屾湭鎶ヨ涓�0
- */
- private Boolean platPositionDeviationAlarm;
-
- /**
- * 骞冲彴鎵煩鍋忓樊鎶ヨ
- * 鎶ヨ涓�1锛屾湭鎶ヨ涓�0
- */
- private Boolean platTorqueDeviationAlarm;
-
- /**
- * 骞冲彴鍥涘悜杞︽娴�
- * 鏈夎溅涓�1锛屾棤杞︿负0
- */
- private Boolean platShuttleCheck;
-
- /**
- * 鏈氨缁姸鎬�
- * 1. 涓嶅湪鎸囧畾灞�
- * 2. 鍥涜酱涓嶅悓姝�
- * 3. 骞冲彴鍓嶉檺鍏夌數琚尅鍒帮紙闈犺繎璐ф灦锛�
- * 4. 骞冲彴鍚庨檺鍏夌數琚尅鍒帮紙杩滅璐ф灦锛�
- * 5. 骞冲彴涓婇檺浣嶆姤璀�
- * 6. 骞冲彴涓嬮檺浣嶆姤璀�
- * 7. 鐢垫煖鎬ュ仠鎶ヨ
- * 8. 杈撻�佺嚎鍓嶉檺浣嶈鎸″埌锛堥潬杩戣揣鏋讹級
- * 9. 杈撻�佺嚎鍚庨檺浣嶈鎸″埌锛堣繙绂昏揣鏋讹級
- * 10. 瑙︽懜灞忕揣鎬ュ仠姝㈣鎸変笅
- * 11. 鍥涜酱鍔ㄥ姏绾挎柇绾�
- * 12. 鍗曟満妯″紡
- * 13. 鍥涜酱鎶ヨ
- * 14. 浣嶇疆鍋忓樊杩囧ぇ
- * 15. 鎵煩鍋忓樊杩囧ぇ
- * 16. 杈撻�佺嚎杩囪浇
- * 17. 杩涙彁鍗囨満鍗℃墭鐩�
- * 18. 鍑烘彁鍗囨満鍗℃墭鐩�
- */
- private Short notReady;
-
- /**
- * 浼烘湇1閿欒
- */
- private Short servoError1;
-
- /**
- * 浼烘湇2閿欒
- */
- private Short servoError2;
-
- /**
- * 浼烘湇3閿欒
- */
- private Short servoError3;
-
- /**
- * 浼烘湇4閿欒
- */
- private Short servoError4;
-
- /**
- * 鎻愬崌鏈哄疄闄呴�熷害鍙嶉
- */
- private Short liftActualSpeed;
-
- /**
- * 浣滀笟鏍囪
- */
- private Boolean pakMk = true;
-
- public String getLiftLock$() {
- return this.liftLock ? "Y" : "N";
+ public String getModel$() {
+ if (this.model == null) {
+ return "绂荤嚎";
+ }
+ return this.model ? "鑷姩" : "鎵嬪姩";
}
- public String getReady$() {
- return this.ready ? "Y" : "N";
+ public String getBusy$() {
+ if (this.busy == null) {
+ return "-";
+ }
+ return this.busy ? "蹇欑" : "绌洪棽";
}
- public String getRunning$() {
- return this.running ? "Y" : "N";
+ public String getHasTray$() {
+ if (this.hasTray == null) {
+ return "-";
+ }
+ return this.hasTray ? "Y" : "N";
}
- public String getMode$() {
- return this.mode ? "Y" : "N";
+ public String getHasCar$() {
+ if (this.hasCar == null) {
+ return "N";
+ }
+ return this.hasCar ? "Y" : "N";
}
- public String getLineFrontHasStock$() {
- return this.lineFrontHasStock ? "Y" : "N";
+ public String getDeviceError$() {
+ if (this.deviceError == null) {
+ return "N";
+ }
+ return this.deviceError ? "Y" : "N";
}
- public String getForwardRotationFeedback$() {
- return this.forwardRotationFeedback ? "Y" : "N";
+ public String getFrontOverrun$() {
+ if (this.frontOverrun == null) {
+ return "N";
+ }
+ return this.frontOverrun ? "Y" : "N";
}
- public String getReverseFeedback$() {
- return this.reverseFeedback ? "Y" : "N";
+ public String getBackOverrun$() {
+ if (this.backOverrun == null) {
+ return "N";
+ }
+ return this.backOverrun ? "Y" : "N";
}
- public String getMotorOverload$() {
- return this.motorOverload ? "Y" : "N";
+ public String getLeftOverrun$() {
+ if (this.leftOverrun == null) {
+ return "N";
+ }
+ return this.leftOverrun ? "Y" : "N";
}
- public String getLineEndHasStock$() {
- return this.lineEndHasStock ? "Y" : "N";
+ public String getRightOverrun$() {
+ if (this.rightOverrun == null) {
+ return "N";
+ }
+ return this.rightOverrun ? "Y" : "N";
}
- public String getInConveyLineCardTrayAlarm$() {
- return this.inConveyLineCardTrayAlarm ? "Y" : "N";
+ public String getOverHeight$() {
+ if (this.overHeight == null) {
+ return "N";
+ }
+ return this.overHeight ? "Y" : "N";
}
- public String getOutConveyLineCardTrayAlarm$() {
- return this.outConveyLineCardTrayAlarm ? "Y" : "N";
+ public String getOverWeight$() {
+ if (this.overWeight == null) {
+ return "N";
+ }
+ return this.overWeight ? "Y" : "N";
}
- public String getPlatPositionDeviationAlarm$() {
- return this.platPositionDeviationAlarm ? "Y" : "N";
- }
-
- public String getPlatTorqueDeviationAlarm$() {
- return this.platTorqueDeviationAlarm ? "Y" : "N";
- }
-
- public String getPlatShuttleCheck$() {
- return this.platShuttleCheck ? "Y" : "N";
- }
-
- public String getPakMk$() {
- 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