From 9e5f9371ed18a317eb5fcbbd94bc174837e561a3 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 26 六月 2024 19:35:43 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3850d4e..76c9777 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -292,6 +292,7 @@
                 staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
             }
         }
+
         if (slave.getId()==2){
             Thread.sleep(200);
             int[] staNosRgv = {623,624,625,626};
@@ -305,21 +306,26 @@
                         staProtocol.setSiteId(siteId);
                         station.put(siteId, staProtocol);
                     }
-                    staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));     // 灏忚溅鐩爣浣�
+                    try{
+                        staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 0));     // 灏忚溅鐩爣浣�
 
-                    staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 2));   // 鐩爣绔�
+                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));   // 鐩爣绔�
 
-                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, 4, 1);
-                    staProtocol.setRGV1(status[0]);  // 鑷姩
-                    staProtocol.setRGV2(status[1]);  // 鏈夌墿
-                    staProtocol.setRGV3(status[2]); // 鍙叆
-                    staProtocol.setRGV4(status[3]);//
-                    staProtocol.setRGV5(status[4]);  //
-                    staProtocol.setRGV6(status[5]);  // 婊℃墭鐩�
+                        boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
+                        staProtocol.setRGV1(status[0]);  // 鑷姩
+                        staProtocol.setRGV2(status[1]);  // 鏈夌墿
+                        staProtocol.setRGV3(status[2]); // 鍙叆
+                        staProtocol.setRGV4(status[3]);//
+                        staProtocol.setRGV5(status[4]);  //
+                        staProtocol.setRGV6(status[5]);  // 婊℃墭鐩�
+                    }catch (Exception e){
+                        System.out.println(e.getMessage());
+                    }
                 }
             }
         }
 
+
         //鏉$爜鎵弿鍣�
         Thread.sleep(200);
         OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8));

--
Gitblit v1.9.1