From 9cfd47f152a8d0dcd825cf9202ddd389b0c4a325 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 19 一月 2024 18:09:12 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 960da5e..b0a2fd5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -71,7 +71,7 @@
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 3;
+    private int barcodeSize = 5;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -119,6 +119,10 @@
                         break;
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
+//                        write3((StaProtocol)task.getData());
+//                        Thread.sleep(400);
+//                        write4((StaProtocol)task.getData());
+//                        Thread.sleep(400);
                         write((StaProtocol)task.getData());
                         break;
                     // 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚  缁欒緭閫佺嚎鍐欎换鍔″畬鎴�
@@ -128,6 +132,13 @@
                     // 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚  缁欒緭閫佺嚎鍐欎换鍔″畬鎴愬浣�
                     case 4:
                         write4((StaProtocol)task.getData());
+                        break;
+                    case 5:
+                        write3((StaProtocol)task.getData());
+                        Thread.sleep(400);
+                        write4((StaProtocol)task.getData());
+                        Thread.sleep(400);
+                        write((StaProtocol)task.getData());
                         break;
                     default:
                         break;
@@ -236,10 +247,10 @@
 
         //鏉$爜鎵弿鍣�
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.288",(short)(barcodeSize*10));
-        if (result2.IsSuccess) {
-            for (int i = 0; i < barcodeSize; i++) {
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*10,6, "UTF-8");
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8));
+        if (result2.IsSuccess && staNoSize==staNos2.size()) {
+            for (int i = 0; i < barcodeSize; i++) {  //1:217  2:221  3:null 4:215  5:219
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     barcodeThread.setBarcode(barcode);
@@ -250,7 +261,7 @@
         //RGV灏忚溅
         Thread.sleep(200);
         OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
-        if (result3.IsSuccess) {
+        if (result3.IsSuccess && staNoSize==staNos2.size()) {
             Integer siteId = 16;
             StaProtocol staProtocol = station.get(siteId);
             if (null == staProtocol) {

--
Gitblit v1.9.1