From 37dbd9b1e1d47c46a0ad590155d941ddffbd825a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 10 八月 2020 13:10:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   15 ++++++++++++++-
 1 files changed, 14 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 1c2e3d9..ef9d7a0 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,6 +1,7 @@
 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;
@@ -36,7 +37,7 @@
     /**
      * 浠诲姟鍙�
      */
-    public short taskNo;
+    public short taskNo = 0;
 
     /**
      * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
@@ -91,6 +92,8 @@
      */
     public short liftPos;
 
+    public CrnLiftPosType liftPosType;
+
     /**
      * 璧拌鍦ㄥ畾浣�
      * 0 = 鍦ㄥ畾浣�
@@ -143,6 +146,16 @@
         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);

--
Gitblit v1.9.1