From f93bbaf146851e3befe0696c48bbce2023624d2a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 10 八月 2020 17:02:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 63a2a49..1baf7b3 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,5 +1,9 @@
package com.zy.core.model.protocol;
+import com.zy.core.enums.CrnForkPosType;
+import com.zy.core.enums.CrnLiftPosType;
+import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.CrnStatusType;
import lombok.Data;
/**
@@ -18,6 +22,8 @@
*/
public short mode;
+ public CrnModeType modeType;
+
/**
* 1 = 鎬ュ仠
*/
@@ -31,7 +37,7 @@
/**
* 浠诲姟鍙�
*/
- public short taskNo;
+ public short taskNo = 0;
/**
* 鍫嗗灈鏈哄綋鍓嶇姸鎬�
@@ -55,6 +61,11 @@
public short status;
/**
+ * 鐘舵�佹灇涓�
+ */
+ public CrnStatusType statusType;
+
+ /**
* 鍫嗗灈鏈哄綋鍓嶅垪鍙�
*/
public short bay;
@@ -72,12 +83,16 @@
*/
public short forkPos;
+ private CrnForkPosType forkPosType;
+
/**
* 褰撳墠杞借揣鍙颁綅缃�
* 0 = 涓嬪畾浣�
* 1 = 涓婂畾浣�
*/
public short liftPos;
+
+ public CrnLiftPosType liftPosType;
/**
* 璧拌鍦ㄥ畾浣�
@@ -111,4 +126,51 @@
*/
public int duration;
+ public void setMode(Short mode) {
+ this.mode = mode;
+ this.modeType = CrnModeType.get(mode);
+ }
+
+ public void setMode(CrnModeType type) {
+ this.modeType = type;
+ this.mode = CrnModeType.get(type).id.shortValue();
+ }
+
+ public void setForkPos(Short forkPos) {
+ this.forkPos = forkPos;
+ this.forkPosType = CrnForkPosType.get(forkPos);
+ }
+
+ public void setForkPos(CrnForkPosType type) {
+ this.forkPosType = type;
+ this.forkPos = CrnForkPosType.get(type).id.shortValue();
+ }
+
+ public void setLiftPos(Short liftPos) {
+ this.liftPos = liftPos;
+ this.liftPosType = CrnLiftPosType.get(liftPos);
+ }
+
+ public void setLiftPos(CrnLiftPosType type) {
+ this.liftPosType = type;
+ this.liftPos = CrnLiftPosType.get(type).id.shortValue();
+ }
+
+ public void setStatus(Short status){
+ this.status = status;
+ this.statusType = CrnStatusType.get(status);
+ }
+
+ public void setStatus(CrnStatusType type){
+ this.statusType = type;
+ this.status = CrnStatusType.get(type).id.shortValue();
+ }
+
+ /**
+ * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+ * I:鍏ュ簱
+ * O:鍑哄簱
+ */
+ private String lastIo = "I";
+
}
--
Gitblit v1.9.1