From fffbf0c777f1189c7eed623b15660dbcbe50d2a1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 13:29:03 +0800
Subject: [PATCH] 库位移转
---
src/main/java/com/zy/core/model/command/LiftCommand.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/LiftCommand.java b/src/main/java/com/zy/core/model/command/LiftCommand.java
index bb1d3d0..040910c 100644
--- a/src/main/java/com/zy/core/model/command/LiftCommand.java
+++ b/src/main/java/com/zy/core/model/command/LiftCommand.java
@@ -1,5 +1,6 @@
package com.zy.core.model.command;
+import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
@@ -12,22 +13,12 @@
/**
* 鎻愬崌鏈哄彿
*/
- private Integer liftNo = 0;
+ private Short liftNo = 0;
/**
* 浠诲姟鍙�
*/
- private Integer taskNo = 0;
-
- /**
- * 浣滀笟绫诲瀷
- */
- private Short taskMode = 0;
-
- /**
- * 浠诲姟纭 false锛氭湭纭 true锛氬凡纭
- */
- private Boolean complete = Boolean.FALSE;
+ private Short taskNo = 0;
/**
* 寮�濮嬭繍琛�
@@ -45,26 +36,59 @@
private Short speed;
/**
- * 浜屽眰楂樺害璁惧畾
+ * 浜屽眰楂樺害璁惧畾(鎻愬崌鏈轰笌杈撻�佺嚎骞冲眰)
*/
private Short height2;
/**
- * 涓夊眰楂樺害璁惧畾
+ * 涓夊眰楂樺害璁惧畾(瀹為檯鐨勪簩灞�)
*/
private Short height3;
/**
- * 鍥涘眰楂樺害璁惧畾
+ * 鍥涘眰楂樺害璁惧畾(瀹為檯鐨勪笁灞�)
*/
private Short height4;
+
+ /**
+ * 浜斿眰楂樺害璁惧畾(瀹為檯鐨勫洓灞�)
+ */
+ private Short height5;
/**
* 鎻愬崌鏈洪攣瀹�
*/
private Boolean liftLock;
+ /**
+ * 鎿嶄綔杈撻�佺珯鐐瑰彿
+ */
+ private Short operaStaNo;
+
+ /**
+ * 杈撻�佺嚎鑱斿姩杞姩鏂瑰悜锛�0锛氬仠姝㈣浆鍔紝1锛氭鍚戣浆鍔紝2锛氬弽鍚戣浆鍔�
+ */
+ private Integer rotationDire;
+
+ /**
+ * 杈撻�佺嚎ID
+ */
+ private Integer devpId;
+
+ /**
+ * 鐩爣绔�
+ */
+ private Short staNo;
+
+ /**
+ * 鍛戒护鏄惁瀹屾垚,榛樿false鏈畬鎴�
+ */
+ private Boolean complete = false;
+
public Short getLiftLockShortValue() {
+ if (liftLock == null) {
+ return (short) 0;
+ }
return liftLock ? (short) 1 : (short) 0;
}
--
Gitblit v1.9.1