From ceb33d7020bcc1620d43cdcb9d1ea51a17c81a0d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 16 十月 2024 13:20:34 +0800
Subject: [PATCH] 整理三方接口

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 124dc9e..23ff938 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -209,6 +209,29 @@
                 }
             }
         }
+
+        Thread.sleep(200);
+        OperateResultExOne<byte[]> resultError = siemensS7Net.Read("DB101.800", (short) (8));
+        if (resultError.IsSuccess && staNoSize==staNos2.size()) {
+            ArrayList<Integer> staNoError = new ArrayList<Integer>() {{ add(217);add(221); }};
+            for (int i = 0; i < staNoError.size(); i++) {
+                Integer siteId = staNoError.get(i); // 绔欑偣缂栧彿
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i*4 + 2, 1);
+                staProtocol.setFrontErr(status[0]);// 鍓嶈秴闄�
+                staProtocol.setBackErr(status[1]);// 鍚庤秴闄�
+                staProtocol.setHighErr(status[2]);// 楂樿秴闄�
+                staProtocol.setLeftErr(status[3]);// 宸﹁秴闄�
+                staProtocol.setRightErr(status[4]);// 鍙宠秴闄�
+                staProtocol.setWeightErr(status[5]); // 瓒呴噸
+                staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
+            }
+        }
 //        Thread.sleep(200);
 //        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
 //        if (result0.IsSuccess) {
@@ -374,6 +397,9 @@
             case 135:
                 index=5;
                 break;
+            case 147:
+                index=6;
+                break;
             default:
                 return;
         }
@@ -384,7 +410,16 @@
         do {
             write = siemensS7Net.Write("DB100.600." + index, true);    // 浠诲姟瀹屾垚
             if(write.IsSuccess){
-                writeCount=6;
+                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.600." + index, (short) 1);
+                if(readResult.IsSuccess){
+                    boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readResult.Content, 0, 1);
+                    if (booleans[0]){
+                        writeCount=6;
+                    }else {
+                        writeCount++;
+                        log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                    }
+                }
             }else {
                 writeCount++;
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -429,6 +464,9 @@
             case 135:
                 index=5;
                 break;
+            case 147:
+                index=6;
+                break;
             default:
                 return;
         }

--
Gitblit v1.9.1