From a25037d44427756e6ab9dd0ed1360425d660362a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 15 一月 2025 15:41:42 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/SteThread.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 41ef4d8..483c4e7 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -123,7 +123,7 @@
      */
     private void readStatus(){
         try {
-            OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) 22);
+            OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) 28);
             if (result.IsSuccess) {
                 if (null == steProtocol) {
                     steProtocol = new SteProtocol();
@@ -155,8 +155,8 @@
 
                 boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, 27, 1);
 
-                steProtocol.setChargeStatus(status[0]?(short)1:(short)0);
-                steProtocol.setTrack(status[1]?(short)1:(short)0);
+                steProtocol.setChargeStatus(status2[0]?(short)1:(short)0);
+                steProtocol.setTrack(status2[1]?(short)1:(short)0);
 
 //                steProtocol.setLoad(status2[6]?(short)1:(short)0);
                 steProtocol.setLoad(status2[7]?(short)1:(short)0);
@@ -218,6 +218,8 @@
         }
         command.setSteNo(slave.getId());
         OperateResult result = null;
+        News.error("绌挎杞﹀啓鍏ュ懡浠�"+JSON.toJSONString(command));
+
         // 寮�濮嬩换鍔�
         if (!command.getComplete()) {
             //缁勭粐浠诲姟鍓嶏紝鍏堟竻绌哄啓浠诲姟纭浣嶏紝浠ュ強浠诲姟瀹屾垚纭浣�
@@ -226,7 +228,8 @@
             siemensS7Net.Write("DB100.12", (short) 0);//璧峰鐐逛綅
             siemensS7Net.Write("DB100.14", (short) 0);//鐩殑鐐逛綅
             siemensS7Net.Write("DB100.16.0", false);//浠诲姟寮�濮嬬‘璁や綅
-            siemensS7Net.Write("DB100.16.1", false);//浠诲姟瀹屾垚纭
+            siemensS7Net.Write("DB100.16.1", false);//浠诲姟瀹屾垚纭浣�
+//            siemensS7Net.Write("DB100.18", (short) 0);//纭寲缃愬彿
             // 1.浠诲姟鍙�
             OperateResult result0 = siemensS7Net.Write("DB100.2", command.getTaskNo().shortValue());
             try {
@@ -240,8 +243,9 @@
                 OperateResult result1 = siemensS7Net.Write("DB100.4", command.getTaskMode());
                 OperateResult result2 = siemensS7Net.Write("DB100.12", (short) command.getStartLoad().shortValue());//璧峰鐐逛綅
                 OperateResult result3 = siemensS7Net.Write("DB100.14", (short) command.getEndLoad().shortValue());//鐩殑鐐逛綅
+                OperateResult result4 = siemensS7Net.Write("DB100.18", (short) command.getJarNo());//鐩殑鐐逛綅
                 // 3.纭寮�濮嬩换鍔�
-                if (result0.IsSuccess && result1.IsSuccess && result2.IsSuccess && result3.IsSuccess) {
+                if (result0.IsSuccess && result1.IsSuccess && result2.IsSuccess && result3.IsSuccess && result4.IsSuccess) {
                     result = siemensS7Net.Write("DB100.16.0", true);
 
                     try {

--
Gitblit v1.9.1