From 8e7c727183f83bb734238e97b64a11ba5588c9c1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 05 一月 2024 17:45:33 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 4eb37f7..11e0670 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -183,7 +183,7 @@
                     station.put(siteId, staProtocol);
                 }
                 staProtocol.setStaNo( siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 ));   // 鐩爣绔�
-                Thread.sleep(300);
+//                Thread.sleep(300);
                 staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8));     // 宸ヤ綔鍙�
 
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8+6, 2);
@@ -203,8 +203,8 @@
         }
 
         //鏉$爜鎵弿鍣�
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.40",(short)(barcodeSize*10));
+//        Thread.sleep(200);
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*10));
         if (result2.IsSuccess) {
             for (int i = 0; i < barcodeSize; i++) {
                 String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
@@ -216,7 +216,7 @@
 
         }
         //RGV灏忚溅
-        Thread.sleep(200);
+//        Thread.sleep(200);
         OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
         if (result3.IsSuccess) {
             Integer siteId = 16;
@@ -232,7 +232,6 @@
         /**
          * 姣嶆墭鐩樺嚭搴�
          */
-        Thread.sleep(200);
         OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.172",(short)2);
         if (result4.IsSuccess) {
             Integer siteId = 12;
@@ -286,16 +285,18 @@
             return;
         }
         int index = staNos.indexOf(staProtocol.getSiteId());
-        short[] array = new short[2];
-        array[0] = staProtocol.getWorkNo();
-        array[1] = staProtocol.getStaNo();
-        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
+//        int[] array = new int[2];
+//        array[0] = staProtocol.getWorkNo();
+//        array[1] = staProtocol.getStaNo();
+        OperateResult write1 = siemensS7Net.Write("DB100." + (index*6+4),staProtocol.getStaNo());
+        OperateResult write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue());
+
 
 //        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
 //        Thread.sleep(500);
 //        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
 
-        if (!write.IsSuccess) {
+        if (!write.IsSuccess && !write1.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
             if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
                 staProtocol.setPakMk(true);

--
Gitblit v1.9.1