From c64b495fa07b7d381df66590894109fb672c20f0 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 08 五月 2025 14:57:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/RgvThread.java | 22 ++++++++++++++++------
src/main/java/com/zy/core/model/protocol/TaskProtocol.java | 9 +++++++++
2 files changed, 25 insertions(+), 6 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 d25c90e..abe4b8d 100644
--- a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
@@ -35,6 +35,15 @@
}
+
+ 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){
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 0258e1d..d354a5b 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -198,12 +198,22 @@
continue;
}
}
- Thread.sleep(100);
- TaskProtocol issued = new TaskProtocol(taskProtocol);
- write(issued);
- taskProtocol.setIsRunning(4);
- taskProtocolCache.updateTaskProtocol(taskProtocol);
- break;
+ if (taskProtocol.getTargetPosition()<=rgvProtocol.getRgvPos()+50
+ && taskProtocol.getTargetPosition()>=rgvProtocol.getRgvPos()-50){
+ Thread.sleep(100);
+ TaskProtocol issued = new TaskProtocol(taskProtocol);
+ write(issued);
+ taskProtocol.setIsRunning(4);
+ taskProtocolCache.updateTaskProtocol(taskProtocol);
+ break;
+ } else {
+ Thread.sleep(100);
+ TaskProtocol issued = new TaskProtocol(taskProtocol,true);
+ write(issued);
+// taskProtocol.setIsRunning(4);
+// taskProtocolCache.updateTaskProtocol(taskProtocol);
+ break;
+ }
}
}
} catch (Exception e) {
--
Gitblit v1.9.1