From b0dfde8722e47f044a1f3a234c806e7a414e2325 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 18 八月 2020 12:54:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index b031fb3..ad60fa8 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -1,5 +1,7 @@
package com.zy.core.model.command;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.zy.core.enums.CrnTaskModeType;
import lombok.Data;
/**
@@ -12,9 +14,6 @@
// 鍫嗗灈鏈哄彿
private Integer crnNo;
- // 浠诲姟涓嬪彂纭浣�
- private Short stb;
-
// 浠诲姟瀹屾垚纭浣�
private Short ackFinish;
@@ -24,15 +23,18 @@
/**
* 浠诲姟妯″紡锛�
* 0 = 鏃�
- * 1 = 鍏ュ簱
- * 2 = 鍑哄簱
- * 3 = 搴撲綅绉昏浆
- * 4 = 绔欎綅绉昏浆
- * 5 = 鍥炲師鐐�
- * 6 = 鍘诲弽鍘熺偣
- * 7 = 鍧愭爣绉昏
+ * 1 = 鍏ュ簱 婧愬拰鐩爣閮藉彂
+ * 2 = 鍑哄簱 婧愬拰鐩爣閮藉彂
+ * 3 = 搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂
+ * 4 = 绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
+ * 5 = 鍥炲師鐐� 涓嶇敤鍙�
+ * 6 = 鍘诲弽鍘熺偣 鐩爣鍙�
+ * 7 = 鍧愭爣绉昏 鐩爣鍙�
*/
private Short taskMode;
+
+ @JSONField(serialize = false)
+ private CrnTaskModeType taskModeType;
// 婧愪綅缃帓鍙�
private Short sourcePosX;
@@ -52,4 +54,14 @@
// 鐩爣浣嶇疆灞傚彿
private Short destinationPosZ;
+ public void setTaskMode(Short taskMode){
+ this.taskMode = taskMode;
+ this.taskModeType = CrnTaskModeType.get(taskModeType);
+ }
+
+ public void setTaskMode(CrnTaskModeType type) {
+ this.taskModeType = type;
+ this.taskMode = CrnTaskModeType.get(type).id.shortValue();
+ }
+
}
--
Gitblit v1.9.1