From 1e0d3c640d6cfdf8856acf3e50d53cf520784d48 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 22 五月 2023 09:56:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 557a8fb..238dc3e 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -150,7 +150,7 @@
      */
     private void readStatus(){
         try {
-            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 50);
+            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 65);
             if (result.IsSuccess) {
                 if (null == crnProtocol) {
                     crnProtocol = new CrnProtocol();
@@ -170,12 +170,14 @@
                 crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                 crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                 crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
-                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 30));
-                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
-                crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 34));
-                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 36));
-                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 38));
-                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
+                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
+                crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
+                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
+                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
+                crnProtocol.setBarcodeResult(siemensNet.getByteTransform().TransBool(result.Content, 56));
+                crnProtocol.setBarcode(siemensNet.getByteTransform().TransString(result.Content, 58,6,"UTF-8"));
 
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -250,6 +252,8 @@
         array[10] = command.getDestinationStaNo();
         array[11] = command.getCommand();
         OperateResult result = siemensNet.Write("DB100.0", array);
+        OperateResult result2 = siemensNet.Write("DB100.20", command.getBarcode());
+
 
         if (command.getAckFinish() == 0) {
             short commandFinish = 1;

--
Gitblit v1.9.1