From ab18ecb1c25613535c2047467cf8c14d3b41b047 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 五月 2024 15:46:58 +0800
Subject: [PATCH] #空桶入库完成
---
src/main/java/com/zy/core/model/command/RgvCommand.java | 78 ++++++++++++++-------------------------
1 files changed, 28 insertions(+), 50 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 e4079e2..1472669 100644
--- a/src/main/java/com/zy/core/model/command/RgvCommand.java
+++ b/src/main/java/com/zy/core/model/command/RgvCommand.java
@@ -13,40 +13,17 @@
// RGV缂栧彿
private Integer rgvNo = 0;
- // 浠诲姟瀹屾垚纭浣�
- private boolean ackFinish = false;
-
- //**************宸ヤ綅1**************
-
- // 宸ヤ綅1宸ヤ綔鍙�
- private Integer taskNo1 = 0;
-
- /**
- * 浠诲姟妯″紡锛�
- * 0 = 鏃�
- * 1 = 鍙栬揣
- * 2 = 鏀捐揣
- * 3 = 鍙栨斁璐�
- * 4 = 绉诲姩(鍙戝伐浣�1浠诲姟鍗冲彲)
- */
- private Short taskMode1 = 0;
-
- @JSONField(serialize = false)
- private RgvTaskModeType taskModeType1;
-
// 宸ヤ綅1婧愮珯
private Short sourceStaNo1 = 0;
// 宸ヤ綅1鐩爣绔�
private Short destinationStaNo1 = 0;
- //**************宸ヤ綅1**************
+ // 宸ヤ綅2婧愮珯
+ private Short sourceStaNo2 = 0;
-
- //**************宸ヤ綅2**************
-
- // 宸ヤ綅2宸ヤ綔鍙�
- private Short taskNo2 = 0;
+ // 宸ヤ綅2鐩爣绔�
+ private Short destinationStaNo2 = 0;
/**
* 浠诲姟妯″紡锛�
@@ -56,40 +33,41 @@
* 3 = 鍙栨斁璐�
* 4 = 绉诲姩(鍙戝伐浣�1浠诲姟鍗冲彲)
*/
- private Short taskMode2 = 0;
+ private Short taskMode = 0;
+
+ // 宸ヤ綅1宸ヤ綔鍙�
+ private Integer taskNo1 = 0;
+ // 宸ヤ綅2宸ヤ綔鍙�
+ private Integer taskNo2 = 0;
+
+ // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+ private boolean command = false;
+
+
+ // 浠诲姟瀹屾垚纭浣�
+ private boolean ackFinish1 = false;
+
+ // 浠诲姟瀹屾垚纭浣�
+ private boolean ackFinish2 = false;
@JSONField(serialize = false)
- private RgvTaskModeType taskModeType2;
+ private RgvTaskModeType taskModeType;
- // 宸ヤ綅1婧愮珯
- private Short sourceStaNo2 = 0;
-
- // 宸ヤ綅1鐩爣绔�
- private Short destinationStaNo2 = 0;
//**************宸ヤ綅2**************
- // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
- private Short command = 0;
- public void setTaskMode1(Short taskMode){
- this.taskMode1 = taskMode;
- this.taskModeType1 = RgvTaskModeType.get(taskMode);
+
+ public void setTaskMode(Short taskMode){
+ this.taskMode = taskMode;
+ this.taskModeType = RgvTaskModeType.get(taskMode);
}
- public void setTaskMode1(RgvTaskModeType type) {
- this.taskModeType1 = type;
- this.taskMode1 = RgvTaskModeType.get(type).id;
+ public void setTaskMode(RgvTaskModeType type) {
+ this.taskModeType = type;
+ this.taskMode = RgvTaskModeType.get(type).id.shortValue();
}
- public void setTaskMode2(Short taskMode){
- this.taskMode2 = taskMode;
- this.taskModeType2 = RgvTaskModeType.get(taskMode);
- }
- public void setTaskMode2(RgvTaskModeType type) {
- this.taskModeType2 = type;
- this.taskMode2 = RgvTaskModeType.get(type).id;
- }
}
--
Gitblit v1.9.1