From a5011461e6c32c6c33dff9bfaf8389d0ca2fa997 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 09 五月 2025 14:15:04 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3390bc2..dab59c9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -531,23 +531,24 @@
         }
 
         // 绌烘《鍑哄簱淇″彿
-        OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102", (short) 4);
+        OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102.0", (short) 8);
         if (readCall.IsSuccess){
-            Integer isNeed = siemensS7Net.getByteTransform().TransInt32(result.Content,  0); // IBC瑕佹《淇″彿
-            Integer isFinish = siemensS7Net.getByteTransform().TransInt32(result.Content, 2); // IBC鐏岃瀹屾垚淇″彿
-            Integer weight = siemensS7Net.getByteTransform().TransInt32(result.Content, 4); // IBC鐏岃閲嶉噷
-            Integer isAHalf = siemensS7Net.getByteTransform().TransInt32(result.Content, 6); // IBC鍗婃《鏍囪
-
+            int isNeed = siemensS7Net.getByteTransform().TransInt16(readCall.Content,  0); // IBC瑕佹《淇″彿
+            int Finish = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 2); // IBC鐏岃瀹屾垚淇″彿
+            int weight1 = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 4); // IBC鐏岃閲嶉噷
+            int isAHalf = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 6); // IBC鍗婃《鏍囪
             isCalled = isNeed;
-            isFinish = isFinish;
+            isFinish = Finish;
+            weight = weight1;
+            isHalf = isAHalf;
         }
 
         // 瀹屾垚缃愯淇″彿
-        OperateResultExOne<byte[]> finish = siemensS7Net.Read("DB105.240", (short) 4);
-        if (finish.IsSuccess){
-            short amount =  siemensS7Net.getByteTransform().TransInt16(result.Content,  0);
-//            isCalled = amount;
-        }
+//        OperateResultExOne<byte[]> finish = siemensS7Net.Read("DB105.240", (short) 4);
+//        if (finish.IsSuccess){
+//            short amount =  siemensS7Net.getByteTransform().TransInt16(finish.Content,  0);
+////            isCalled = amount;
+//        }
 
 //        if (isCalled == 1) {
 //            writeIsCalled();
@@ -760,17 +761,18 @@
         int staNoSize = staNos.size();
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
 
-        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*34));
+        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*78));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
 //                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
-                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 2,20, "UTF-8");
                 short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 6);
-                String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+8, 20, "UTF-8");
+                String batch = siemensS7Net.getByteTransform().TransString(result.Content,i * 4+ 8, 20, "UTF-8").trim();
                 short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 28);
                 Integer w1 = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 30);
+                String orderNo = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 34,22, "UTF-8");
+                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 56,22, "UTF-8").trim();
 
 
                 StaProtocol staProtocol = station.get(siteId);
@@ -836,9 +838,23 @@
         }
         ArrayList<Integer> staNos = getWriteStaNo();
         int index = staNos.indexOf(staProtocol.getSiteId());
-        OperateResult write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
-        Thread.sleep(500);
-        OperateResult write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo());    // 鐩爣绔�
+        OperateResult write = null;
+        OperateResult write1 = null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
+            Thread.sleep(200);
+            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+            if(write.IsSuccess && write1.IsSuccess){
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
 
         if (!write.IsSuccess || !write1.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
@@ -862,9 +878,33 @@
         }
         ArrayList<Integer> staNos = getWriteStaNo();
         int index = staNos.indexOf(staProtocol.getSiteId());
-        OperateResult write = siemensS7Net.Write("DB100." + index*10, staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
-        OperateResult write1 = siemensS7Net.Write("DB100." + (index*10+4), staProtocol.getStaNo());    // 鐩爣绔�
-        OperateResult write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr());    // 鐩爣绔�
+
+        OperateResult write = null;
+        OperateResult write1 = null;
+        OperateResult write2 = null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+             write = siemensS7Net.Write("DB100." + index*10, staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
+            Thread.sleep(100);
+             write1 = siemensS7Net.Write("DB100." + (index*10+4), staProtocol.getStaNo());    // 鐩爣绔�
+            Thread.sleep(100);
+             write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr());    // 鐩爣绔�
+
+//            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+
+//            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+
+//            write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr());    // 鐩爣绔�
+            if(write.IsSuccess && write1.IsSuccess && write2.IsSuccess){
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
 
         if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
@@ -880,12 +920,12 @@
     }
 
     private void writeIsCalled() throws InterruptedException {
-        OperateResult write = siemensS7Net.Write("DB102.0" ,  0);    // 宸ヤ綔鍙�
+        OperateResult write = siemensS7Net.Write("DB102.0" ,  (short) 0);    // 宸ヤ綔鍙�
     }
 
     private void writeIsFinish() throws InterruptedException {
-        OperateResult finish = siemensS7Net.Write("DB102.2" ,  0);    // 宸ヤ綔鍙�
-        OperateResult half = siemensS7Net.Write("DB102.6" ,  0);    // 宸ヤ綔鍙�
+        OperateResult finish = siemensS7Net.Write("DB102.2" ,  (short)0);    // 宸ヤ綔鍙�
+        OperateResult half = siemensS7Net.Write("DB102.6" ,  (short)0);    // 宸ヤ綔鍙�
     }
 
     /**

--
Gitblit v1.9.1