From 28ea25cc817e78f1023b8a7c7826441a4acadfc1 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期一, 08 十二月 2025 15:59:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/TaskProtocol.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 a7dee2d..f9caede 100644
--- a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
@@ -11,11 +11,12 @@
private volatile Long taskNo; // 浠诲姟鍙凤紙涓诲睘鎬э級
private volatile Long targetPosition = 0L; // 鐩爣浣嶇疆
private volatile Integer targetPositionStaNo = 0; // 鐩爣浣嶇疆
+ private volatile Integer targetPositionStaNoEnd = 0; // 鏈�缁堢洰鏍囦綅缃�
private volatile Integer targetPositionStaNoPlcId = 1; // 鐩爣浣嶇疆
private volatile int isRunning = 0; // 杩愯鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呮墽琛� 2锛氭墽琛屼腑 3锛氭墽琛屼腑鏂� 4锛氬畬缁�
- private volatile int taskStatus = 0; //浣滀笟妯″紡 1锛氳璧� 2锛氬彇 3锛氭斁 0:鏃�
+ private volatile int taskStatus = 0; //浣滀笟妯″紡 1锛氳璧� 2锛氬彇 3锛氭斁 0:鏃� //zzgt 1:鍙� 2:鏀� 3:搴撲綅杞Щ 4:琛岃蛋
private volatile boolean direction; // 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙� 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 1:鑷繁 2 杞ㄩ亾 true:鑷繁 false:杞ㄩ亾
@@ -32,6 +33,8 @@
public TaskProtocol(TaskProtocol taskProtocol) {
this.taskNo = taskProtocol.getTaskNo();
this.targetPosition = taskProtocol.getTargetPosition();
+ this.targetPositionStaNo = taskProtocol.getTargetPositionStaNo();
+ this.targetPositionStaNoEnd = taskProtocol.getTargetPositionStaNoEnd();
this.taskStatus = taskProtocol.getTaskStatus();
this.direction = taskProtocol.direction;
}
@@ -41,6 +44,8 @@
public TaskProtocol(TaskProtocol taskProtocol, boolean direction) {
this.taskNo = taskProtocol.getTaskNo();
this.targetPosition = taskProtocol.getTargetPosition();
+ this.targetPositionStaNo = taskProtocol.getTargetPositionStaNo();
+ this.targetPositionStaNoEnd = taskProtocol.getTargetPositionStaNoEnd();
this.taskStatus = 1;
this.direction = taskProtocol.direction;
}
@@ -58,4 +63,16 @@
}
return taskNo+"_"+taskStatusStr;
}
+
+ public int getTaskStatus$() {
+ switch (taskStatus){
+ case 1:
+ return 4;
+ case 2:
+ return 1;
+ case 3:
+ return 2;
+ }
+ return taskStatus;
+ }
}
--
Gitblit v1.9.1