From 9c671cac749d45ac37b81a1df732024f4016a238 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 26 六月 2025 10:56:15 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d6f126c..ff764dd 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -197,6 +197,7 @@
         }
     }
 
+
     @Override
     public boolean connect() {
         boolean result = false;
@@ -316,6 +317,12 @@
                     }
                     StaProtocol staProtocol = station.get(barcodeSite2.get(i));
                     if (staProtocol != null) {
+                        while (iterator.hasNext()) {
+                            String next = iterator.next();
+                            if (next.length() < 7 || next.length() > 10 || !next.matches("[0-9]*")) {
+                                iterator.remove();
+                            }
+                        }
                         staProtocol.setMatIdList(barcodeList);
                     }
                 }
@@ -541,11 +548,12 @@
         //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
         boolean writeFlag = false;
         while (writeCount < 5) {
-            OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-            OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo());    // 鐩爣绔�
             if (!Cools.isEmpty(staProtocol.getHeight()) && heightAddress != null) {
-                OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));    // 鐩爣绔�
-                log.info("鍐欏叆楂樺害鍦板潃锛歿},{}", heightAddress,  writeResult3);
+                OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
+                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
+                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
+                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
+                log.info("鍐欏叆楂樺害鍦板潃锛歿},{}", heightAddress, writeResult3);
                 if (!writeResult3.IsSuccess) {
                     //fangzhi xierukushibai,jiu duoxiejici,meixunhuan
                     writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
@@ -554,6 +562,8 @@
                     }
                 }
             }
+            OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo());    // 鐩爣绔�
             if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
                 Thread.sleep(200);
                 OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 4, (short) 2);

--
Gitblit v1.9.1