From 2aaf47ead1a69ccbaf6a0167ae161aafd3622114 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 08:14:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 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 ad60fa8..7bf7df9 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -1,9 +1,6 @@
package com.zy.core.model.command;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.zy.core.enums.CrnTaskModeType;
import lombok.Data;
-
/**
* 鍫嗗灈鏈哄懡浠ゆ姤鏂�
* Created by vincent on 2020/8/11
@@ -12,13 +9,13 @@
public class CrnCommand {
// 鍫嗗灈鏈哄彿
- private Integer crnNo;
+ private Integer crnNo = 0;
// 浠诲姟瀹屾垚纭浣�
- private Short ackFinish;
+ private Short ackFinish = 0;
// 浠诲姟鍙�
- private Short taskNo;
+ private Short taskNo = 0;
/**
* 浠诲姟妯″紡锛�
@@ -29,39 +26,31 @@
* 4 = 绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
* 5 = 鍥炲師鐐� 涓嶇敤鍙�
* 6 = 鍘诲弽鍘熺偣 鐩爣鍙�
- * 7 = 鍧愭爣绉昏 鐩爣鍙�
+ * 7 = 鍧愭爣绉昏 鍙栬揣鍙�
+ * 90 = 璁剧疆鏃堕棿
+ * 99 = 鍙栨秷褰撳墠浠诲姟
*/
- private Short taskMode;
-
- @JSONField(serialize = false)
- private CrnTaskModeType taskModeType;
+ private Short taskMode = 0;
// 婧愪綅缃帓鍙�
- private Short sourcePosX;
+ private Short sourcePosX = 0;
// 婧愪綅缃垪鍙�
- private Short sourcePosY;
+ private Short sourcePosY = 0;
// 婧愪綅缃眰鍙�
- private Short sourcePosZ;
+ private Short sourcePosZ = 0;
// 鐩爣浣嶇疆鎺掑彿
- private Short destinationPosX;
+ private Short destinationPosX = 0;
// 鐩爣浣嶇疆鍒楀彿
- private Short destinationPosY;
+ private Short destinationPosY = 0;
// 鐩爣浣嶇疆灞傚彿
- private Short destinationPosZ;
+ private Short destinationPosZ = 0;
- 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();
- }
+ // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+ private Short command = 0;
}
--
Gitblit v1.9.1