From 6c258de9be7d09a3f9f8d043a6a68bc03f073fc2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 11 八月 2020 10:54:35 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 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 045f98a..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,8 @@
 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;
 
@@ -19,6 +22,8 @@
      */
     public short mode;
 
+    public CrnModeType modeType;
+
     /**
      * 1 = 鎬ュ仠
      */
@@ -32,7 +37,7 @@
     /**
      * 浠诲姟鍙�
      */
-    public short taskNo;
+    public short taskNo = 0;
 
     /**
      * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
@@ -78,12 +83,16 @@
      */
     public short forkPos;
 
+    private CrnForkPosType forkPosType;
+
     /**
      * 褰撳墠杞借揣鍙颁綅缃�
      * 0 = 涓嬪畾浣�
      * 1 = 涓婂畾浣�
      */
     public short liftPos;
+
+    public CrnLiftPosType liftPosType;
 
     /**
      * 璧拌鍦ㄥ畾浣�
@@ -117,6 +126,36 @@
      */
     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);
@@ -127,4 +166,11 @@
         this.status = CrnStatusType.get(type).id.shortValue();
     }
 
+    /**
+     * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+     *       I:鍏ュ簱
+     *       O:鍑哄簱
+     */
+    private String lastIo = "I";
+
 }

--
Gitblit v1.9.1