From 67809d68cadd1ae3e6f697a92030201dbdf947ce Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 09 五月 2025 16:24:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/RgvThread.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 0258e1d..80b7140 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -114,7 +114,7 @@
                 OperateResultExOne<byte[]> result = siemensNet.Read("DB100.12", (short) 1);
                 boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, 0, 1);
                 if (status[0]){
-                    OperateResult result4 = siemensNet.Write("DB100.12.0", true);
+                    OperateResult result4 = siemensNet.Write("DB100.12.0", false);
                 }
             } catch (Exception e) {
                 log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛�" + e.getMessage());
@@ -198,12 +198,23 @@
                                 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);
+                            taskProtocolCache.removeTaskProtocol(taskProtocol.getTaskNoDirection());
+                            break;
+                        } else {
+                            Thread.sleep(100);
+                            TaskProtocol issued = new TaskProtocol(taskProtocol,true);
+                            write(issued);
+//                            taskProtocol.setIsRunning(4);
+//                            taskProtocolCache.updateTaskProtocol(taskProtocol);
+                            break;
+                        }
                     }
                 }
             } catch (Exception e) {
@@ -531,6 +542,8 @@
 //        convertRow(command);
 //        taskProtocol.setRgvNo(slave.getId());
         Long[] array = new Long[11];
+        OperateResult result41 = siemensNet.Write("DB100.12.0", false);
+
 //        array[0] = taskProtocol.getAckFinish1();
 //        array[1] = taskProtocol.getTaskNo();
 //        array[2] = taskProtocol.getTaskMode();

--
Gitblit v1.9.1