From 7b3e75fed1d44d89bd7a06c0e5ed98cddf039c31 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 28 九月 2022 17:23:55 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 776219a..c665daf 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,9 +42,9 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
     public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(101);add(102);add(103);add(104);
-        add(201);add(202);add(203);add(204);
-        add(301);add(302);add(303);add(304);add(305);add(306);
+        add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
+//        add(201);add(202);add(203);add(204);
+//        add(301);add(302);add(303);add(304);add(305);add(306);
     }};
 
     /**
@@ -84,7 +84,7 @@
                         break;
                     //澶嶄綅娴嬭瘯淇″彿
                     case 3:
-                        siemensS7Net.Write("DB100." + (150 + ((int)task.getData()) * 2), 0);
+                        siemensS7Net.Write("DB100." + (150 + (int)task.getData()), 0);
                         break;
                     default:
                         break;
@@ -155,7 +155,7 @@
 //            }
 //        }
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB150.0", (short) (staNoSize*2));
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
         if (result1.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -177,10 +177,11 @@
         }
 
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*8));
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*12));
         if (result2.IsSuccess) {
             for (int i = 0; i < barcodeSize; i++) {
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*12,12, "UTF-8");
+//                String barcode=new String(result2.Content,i*12,12);
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     barcodeThread.setBarcode(barcode);

--
Gitblit v1.9.1