From a5fd6b72f8342f0228321849b04c822feba2d2a0 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期三, 02 七月 2025 09:42:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs
---
src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java | 71 +++--------------------------------
1 files changed, 7 insertions(+), 64 deletions(-)
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..a981a72 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java
@@ -1,6 +1,9 @@
package com.zy.asrs.domain.vo;
+import com.zy.core.model.protocol.ForkLiftStaProtocol;
import lombok.Data;
+
+import java.util.List;
@Data
public class LiftMsgTableVo {
@@ -15,73 +18,13 @@
private String pakMk = "-";
/**
- * 杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
- * 鏈夎揣涓�1锛屾棤璐т负0锛堝墠绔寚闈犺繎璐ф灦渚э級
+ * 绔欑偣淇℃伅
*/
- private Boolean lineFrontHasStock;
+ private List<ForkLiftStaProtocol> forkLiftStaProtocols;
/**
- * 杈撻�佺嚎姝ｈ浆鍙嶉
- * 姝ｈ浆杩愯涓�1锛屽惁鍒欎负0
+ * 绌挎杞﹀彿
*/
- private Boolean forwardRotationFeedback;
-
- /**
- * 杈撻�佺嚎鍙嶈浆鍙嶉
- * 鍙嶈浆杩愯涓�1锛屽惁鍒欎负0
- */
- private Boolean reverseFeedback;
-
- /**
- * 杈撻�佺嚎鐢垫満杩囪浇
- * 杩囪浇涓�0锛屾甯镐负1
- */
- private Boolean motorOverload;
-
- /**
- * 杈撻�佺嚎鏈鍏夌數鏈夎揣
- * 鏈夎揣涓�1锛屾棤璐т负0
- */
- private Boolean lineEndHasStock;
-
- /**
- * 杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
- * 鎶ヨ涓�1锛屾湭鎶ヨ涓�0
- */
- private Boolean inConveyLineCardTrayAlarm;
-
- /**
- * 鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
- * 鎶ヨ涓�1锛屾湭鎶ヨ涓�0
- */
- private Boolean outConveyLineCardTrayAlarm;
-
- public String getLineFrontHasStock$() {
- return this.lineFrontHasStock ? "Y" : "N";
- }
-
- public String getForwardRotationFeedback$() {
- return this.forwardRotationFeedback ? "Y" : "N";
- }
-
- public String getReverseFeedback$() {
- return this.reverseFeedback ? "Y" : "N";
- }
-
- public String getMotorOverload$() {
- return this.motorOverload ? "Y" : "N";
- }
-
- public String getLineEndHasStock$() {
- return this.lineEndHasStock ? "Y" : "N";
- }
-
- public String getInConveyLineCardTrayAlarm$() {
- return this.inConveyLineCardTrayAlarm ? "Y" : "N";
- }
-
- public String getOutConveyLineCardTrayAlarm$() {
- return this.outConveyLineCardTrayAlarm ? "Y" : "N";
- }
+ private Integer shuttleNo;
}
--
Gitblit v1.9.1