From 8478a159d79bf9ca5da04ab18562f2d7cdddb05c Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 25 九月 2025 17:06:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/RgvCommand.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/RgvCommand.java b/src/main/java/com/zy/core/model/command/RgvCommand.java
index 7ea6cbd..c1c5f12 100644
--- a/src/main/java/com/zy/core/model/command/RgvCommand.java
+++ b/src/main/java/com/zy/core/model/command/RgvCommand.java
@@ -22,7 +22,7 @@
private Boolean ackFinish1 = true;
// 宸ヤ綅1浠诲姟鍙�
- private Integer taskNo1 = 0;
+ private Integer taskNo = 0;
/**
* 浠诲姟妯″紡锛�
@@ -35,14 +35,18 @@
/**
* 浣滀笟妯″紡
+ * 0 绌洪棽
+ * 1 琛岃蛋
+ * 2 鍙栬揣
+ * 3 鏀捐揣
*/
- private Short taskStatus1 = 0;
+ private Short taskStatus = 0;
@JSONField(serialize = false)
private RgvTaskModeType taskModeType1;
@JSONField(serialize = false)
- private RgvTaskStatusType taskStatusType1;
+ private RgvTaskStatusType taskStatusType;
/*
宸ヤ綅1婧愮珯
@@ -55,9 +59,9 @@
private Short destinationStaNo1 = 0;
/**
- * 宸ヤ綅1鐩爣浣嶇疆
+ * 宸ヤ綅鐩爣浣嶇疆
*/
- private Integer targetPosition1 = 0;
+ private Integer targetPosition = 0;
/**
* RGV鏀捐揣鍚庤揣鐗╄鍘荤殑鐩殑鍦�
*/
@@ -135,10 +139,10 @@
/**
* 鍚屾椂涓嬪彂鏃朵綔涓氶『搴�
* 0锛氭棤锛堜笉鍒ゆ柇锛�
- * 1锛氬伐浣�1鍏堟墽琛�
- * 2锛氬伐浣�2鍏堟墽琛�
+ * 1锛氬伐浣�1鎵ц
+ * 2锛氬伐浣�2鎵ц
*/
- Short wrkTaskPri = 0;
+ Integer wrkTaskPri = 0;
Short wrkTaskMove1 = 0;
Short wrkTaskMove2 = 0;
@@ -163,14 +167,14 @@
this.taskMode2 = RgvTaskModeType.get(type2).id.shortValue();
}
- public void setTaskStatus1(Short taskStatus1){
- this.taskStatus1 = taskStatus1;
- this.taskStatusType1 = RgvTaskStatusType.get(taskStatusType1);
+ public void setTaskStatus(Short taskStatus){
+ this.taskStatus = taskStatus;
+ this.taskStatusType = RgvTaskStatusType.get(taskStatusType);
}
- public void setTaskStatus1(RgvTaskStatusType type1) {
- this.taskStatusType1 = type1;
- this.taskStatus1 = RgvTaskStatusType.get(type1).id.shortValue();
+ public void setTaskStatus(RgvTaskStatusType type) {
+ this.taskStatusType = type;
+ this.taskStatus = RgvTaskStatusType.get(type).id.shortValue();
}
public void setTaskStatus2(Short taskStatus2){
--
Gitblit v1.9.1