From b7e0039880d9f6e71230dbf9c13538de4f8135b8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 10 六月 2023 19:23:26 +0800
Subject: [PATCH] 输送线条码读取bug、出入库模式信号、链条控制信号
---
src/main/java/com/zy/core/model/command/LiftCommand.java | 28 +++++++++++++---------------
1 files changed, 13 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..fa97400 100644
--- a/src/main/java/com/zy/core/model/command/LiftCommand.java
+++ b/src/main/java/com/zy/core/model/command/LiftCommand.java
@@ -12,22 +12,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,19 +35,24 @@
private Short speed;
/**
- * 浜屽眰楂樺害璁惧畾
+ * 浜屽眰楂樺害璁惧畾(鎻愬崌鏈轰笌杈撻�佺嚎骞冲眰)
*/
private Short height2;
/**
- * 涓夊眰楂樺害璁惧畾
+ * 涓夊眰楂樺害璁惧畾(瀹為檯鐨勪簩灞�)
*/
private Short height3;
/**
- * 鍥涘眰楂樺害璁惧畾
+ * 鍥涘眰楂樺害璁惧畾(瀹為檯鐨勪笁灞�)
*/
private Short height4;
+
+ /**
+ * 浜斿眰楂樺害璁惧畾(瀹為檯鐨勫洓灞�)
+ */
+ private Short height5;
/**
* 鎻愬崌鏈洪攣瀹�
@@ -65,6 +60,9 @@
private Boolean liftLock;
public Short getLiftLockShortValue() {
+ if (liftLock == null) {
+ return (short) 0;
+ }
return liftLock ? (short) 1 : (short) 0;
}
--
Gitblit v1.9.1