From 678f43f99d4fe259c6ce3dabbc2563776c2a25f1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十二月 2020 17:40:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 b7c4bc5..5969aee 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -1,9 +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 com.zy.asrs.entity.BasCrnp;
+import com.zy.core.enums.*;
import lombok.Data;
/**
@@ -93,6 +91,16 @@
public Short walkPos;
/**
+ * 鎷ㄦ寚浣嶇疆
+ * 0 = 涓嶅湪瀹氫綅
+ * 1 = 涓婂畾浣�
+ * 2 = 涓嬪畾浣�
+ */
+ public Short fingerPos;
+
+ public CrnFingerPosType fingerPosType;
+
+ /**
* 鍫嗗灈鏈轰换鍔″畬鎴�
*/
public Short taskFinish;
@@ -106,6 +114,14 @@
* 寮傚父鐮侊紙鏁板�兼樉绀猴級
*/
private Short alarm1;
+
+ private Short temp1;
+
+ private Short temp2;
+
+ private Short temp3;
+
+ private Short temp4;
/**
* 寮傚父1
@@ -224,6 +240,11 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
+ public void setFingerPos(Short type) {
+ this.fingerPos = type;
+ this.fingerPosType = CrnFingerPosType.get(type);
+ }
+
public void setError1(boolean[] error1){
this.error1 = error1;
this.crnError1 = new CrnError1();
@@ -313,4 +334,10 @@
*/
private String lastIo = "I";
+
+ public BasCrnp toSqlModel(BasCrnp basCrnp){
+ basCrnp.setCrnErr(alarm1.longValue());
+ basCrnp.setWrkNo(taskNo.intValue());
+ return basCrnp;
+ }
}
--
Gitblit v1.9.1