From 45d7fbba5d02e1f65cab0c328d5deafa3094b2cb Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 09 五月 2025 11:14:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/TaskProtocol.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
index 927d04d..abe4b8d 100644
--- a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
@@ -13,9 +13,9 @@
private volatile int isRunning = 0; // 杩愯鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呮墽琛� 2锛氭墽琛屼腑 3锛氭墽琛屼腑鏂� 4锛氬畬缁�
- private volatile int taskStatus = 0; //浣滀笟妯″紡 0锛氳璧� 1锛氬彇 2锛氭斁
+ private volatile int taskStatus = 0; //浣滀笟妯″紡 1锛氳璧� 2锛氬彇 3锛氭斁 0:鏃�
- private volatile boolean direction; // 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+ private volatile boolean direction; // 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙� 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 1:鑷繁 2 杞ㄩ亾 true:鑷繁 false:杞ㄩ亾
public TaskProtocol(){}
@@ -35,13 +35,24 @@
}
+
+ public TaskProtocol(TaskProtocol taskProtocol,boolean direction) {
+ this.taskNo = taskProtocol.getTaskNo();
+ this.targetPosition = taskProtocol.getTargetPosition();
+ this.taskStatus = 1;
+ this.direction = taskProtocol.direction;
+ }
+
+
public String gettaskNoDirection$(Long taskNo,int taskStatus){
String taskStatusStr = "Walk";
switch (taskStatus){
case 1:
taskStatusStr = "Tack";
+ break;
case 2:
taskStatusStr = "Put";
+ break;
}
return taskNo+"_"+taskStatusStr;
}
--
Gitblit v1.9.1