From 5e616b8a04fee67d3830cd78c70841ad03be78b1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 15:54:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/RgvThread.java |    1 +
 src/main/java/com/zy/core/thread/JarThread.java |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 6b8c207..4f1f973 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -122,6 +122,7 @@
                     jarProtocol = new JarProtocol();
                     jarProtocol.setJarNo(slave.getId());
                 }
+                jarProtocol.setJarNo(slave.getId());
                 jarProtocol.setMode(2);//妯″紡
                 jarProtocol.setStatus((short)0);//鐘舵��
                 jarProtocol.setAutoing(true);//鑷姩
@@ -143,6 +144,7 @@
                     jarProtocol = new JarProtocol();
                     jarProtocol.setJarNo(slave.getId());
                 }
+                jarProtocol.setJarNo(slave.getId());
                 if (slave.getId() == 1 || slave.getId() == 3){
                     jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//宸﹂棬鐘舵��  //鍑烘枡闂�
                     jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//鍙抽棬鐘舵��  //杩涙枡闂�
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 3c0703b..ba75be7 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -185,6 +185,7 @@
                     rgvProtocol = new RgvProtocol();
                     rgvProtocol.setRgvNo(slave.getId());
                 }
+                rgvProtocol.setRgvNo(slave.getId());
                 rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                 rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                 rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt16(result.Content, 4));

--
Gitblit v1.9.1