From 922a5f471a735a0ea231d30e45312f61d583e58d Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期日, 01 九月 2024 16:12:49 +0800
Subject: [PATCH] 对照协议调整

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   15 +--------------
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |    4 ++--
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a503dab..68662bd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -166,7 +166,6 @@
                     log.info("errmsg: " + errMsg);
 //                        News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
                     MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
-
                     if (!staProtocol.isLoading()) {
                         continue;
                     }
@@ -182,19 +181,7 @@
                 }
 
 
-                // 鑾峰彇鏉$爜鎵弿浠俊鎭�
-                //BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
-                if (barcodeThread == null) {
-                    continue;
-                }
-                // 鑾峰彇鍏ュ簱绔欎俊鎭�
-                //SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
-                //StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
-                if (staProtocol == null) {
-                    continue;
-                } else {
-                    staProtocol = staProtocol.clone();
-                }
+
 
                 //LED
                 //LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 55297e1..e259358 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -356,8 +356,8 @@
                 OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 6, (short) 4);
                 OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index * 6 + 4), (short) 2);
                 if (readResult.IsSuccess && readResult1.IsSuccess) {
-                    short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
-                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 2);
+                    short workNo = (short) siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
                     if (staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)) {
                         //浠诲姟鍛戒护鍐欏叆鎴愬姛
                         log.info("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);

--
Gitblit v1.9.1