From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 f50cc2e..cea2f4d 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -41,13 +41,13 @@
@JSONField(serialize = false)
private CrnTaskModeType taskModeType;
- // 婧愪綅缃帓鍙�
+ // 婧愪綅缃垪鍙�
private Short sourcePosX = 0;
- // 婧愪綅缃垪鍙�
+ // 婧愪綅缃眰鍙�
private Short sourcePosY = 0;
- // 婧愪綅缃眰鍙�
+ // 婧愪綅缃帓鍙�
private Short sourcePosZ = 0;
// 婧愮珯
@@ -71,6 +71,25 @@
// 鐩爣宸烽亾
private Short destinationLane = 0;
+ //鑱旀満妯″紡
+ private Short auto = 0;
+
+ //鐢宠瀹屾垚浠诲姟
+ private Short onlineWrk1 = 0;
+ //鐢宠鍙栨秷浠诲姟
+ private Short onlineWrk2 = 0;
+ //娓呴櫎鑱旀満浠诲姟
+ private Short onlineWrk3 = 0;
+ //鎭㈠鑱旀満浠诲姟
+ private Short onlineWrk4 = 0;
+ private Short reset = 0;
+
+ // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+ private Short command = 0;
+
+ //鎸囦护ID
+ private Integer commandId;
+
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
this.taskModeType = CrnTaskModeType.get(taskModeType);
--
Gitblit v1.9.1