From ee85eb3d354c2012b6975d94d0668300d9b4050e Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 25 十月 2024 14:51:32 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 58940b1..ab11543 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -350,19 +350,19 @@
         boolean staNoFlag = false;
         do {
             if (!wrkNoFlag) {
+                Thread.sleep(180);
                 write = siemensS7Net.Write("DB100." + index * 6, (int) staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-                Thread.sleep(600);
                 if (write.IsSuccess) {
                     OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 6, (short) 4);
                     if (readResult.IsSuccess) {
                         short workNo = (short) siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
                         if (staProtocol.getWorkNo().equals(workNo)) {
                             //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                            log.info("鍐欏叆宸ヤ綔鍙峰懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                            log.info("鍐欏叆宸ヤ綔鍙峰懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), staProtocol.getWorkNo(), workNo, writeCount);
                             wrkNoFlag = true;
                         } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
                             writeCount++;
-                            log.error("鍐欏叆宸ヤ綔鍙峰懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                            log.error("鍐欏叆宸ヤ綔鍙峰懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), staProtocol.getWorkNo(), workNo, writeCount);
                         }
                     } else {
                         writeCount++;
@@ -374,19 +374,19 @@
                 }
             }
             if (!staNoFlag) {
+                Thread.sleep(180);
                 write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo());    // 鐩爣绔�
-                Thread.sleep(600);
                 if (write1.IsSuccess) {
                     OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index * 6 + 4), (short) 2);
                     if (readResult1.IsSuccess) {
                         short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
                         if (staProtocol.getStaNo().equals(staNo)) {
                             //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                            log.info("鍐欏叆鐩爣绔欏懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                            log.info("鍐欏叆鐩爣绔欏懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), staProtocol.getStaNo(), staNo, writeCount);
                             staNoFlag = true;
                         } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
                             writeCount++;
-                            log.error("鍐欏叆鐩爣绔欏懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                            log.error("鍐欏叆鐩爣绔欏懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), staProtocol.getStaNo(), staNo, writeCount);
                         }
                     } else {
                         writeCount++;
@@ -400,7 +400,7 @@
             if (wrkNoFlag && staNoFlag) {
                 break;
             }
-        } while (writeCount < 18);
+        } while (writeCount < 40);
 
         if (!write.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());

--
Gitblit v1.9.1