From 08d8933d3fe66fb83f1e2e7e4038e62b3c5143e1 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 11:10:43 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/model/protocol/TaskProtocol.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 1e36720..ad8cc4d 100644
--- a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
@@ -7,27 +7,55 @@
*/
@Data
public class TaskProtocol {
+ private volatile String taskNoDirection; // 浠诲姟鍙凤紙涓诲睘鎬э級
private volatile Long taskNo; // 浠诲姟鍙凤紙涓诲睘鎬э級
private volatile Long targetPosition = 0L; // 鐩爣浣嶇疆
- private volatile Long currentPosition = 0L; // 褰撳墠浣嶇疆
+ private volatile Integer targetPositionStaNo = 0; // 鐩爣浣嶇疆
+ private volatile Integer targetPositionStaNoPlcId = 1; // 鐩爣浣嶇疆
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:鍙� 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 1:鑷繁 2 杞ㄩ亾 true:鑷繁 false:杞ㄩ亾
public TaskProtocol(){}
- public TaskProtocol(Long taskNo, Long targetPosition, Long currentPosition, int isRunning, int taskStatus) {
+ public TaskProtocol(Long taskNo, Long targetPosition, int isRunning, int taskStatus, boolean direction) {
this.taskNo = taskNo;
this.targetPosition = targetPosition;
- this.currentPosition = currentPosition;
this.isRunning = isRunning;
this.taskStatus = taskStatus;
+ this.direction = direction;
}
public TaskProtocol(TaskProtocol taskProtocol) {
this.taskNo = taskProtocol.getTaskNo();
this.targetPosition = taskProtocol.getTargetPosition();
this.taskStatus = taskProtocol.getTaskStatus();
+ this.direction = taskProtocol.direction;
+ }
+
+
+
+ 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 2:
+ taskStatusStr = "Tack";
+ break;
+ case 3:
+ taskStatusStr = "Put";
+ break;
+ }
+ return taskNo+"_"+taskStatusStr;
}
}
--
Gitblit v1.9.1