From 84988579b77ec4578af30d5c836690beeff3562c Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 22 三月 2024 13:44:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f03b158..c96e8a7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -262,7 +262,7 @@
             }
         }
 
-        OperateResultExOne<byte[]> resultAgvAndPlcOk = siemensS7Net.Read("DB102.0", (short) 30);
+        OperateResultExOne<byte[]> resultAgvAndPlcOk = siemensS7Net.Read("DB132.0", (short) 30);
         if (resultAgvAndPlcOk.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 int sign =(i+2)/2-1;
@@ -274,7 +274,7 @@
                         staProtocol.setSiteId(siteId);
                         station.put(siteId, staProtocol);
                     }
-                    staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6+4));     // 鍏佽鍙栬揣
+                    staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6+4));     // 鍏佽鍙栬揣
                     staProtocol.setAgvTargetPlace((short)0);   // 鍏佽鏀捐揣
                     continue;
                 }
@@ -285,8 +285,18 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6));     // 鍏佽鍙栬揣
-                staProtocol.setAgvTargetPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6 + 2));   // 鍏佽鏀捐揣
+                try{
+                    staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6));     // 鍙栬揣瀹屾垚
+                    if (staProtocol.getAgvTargetPick()!=0){
+                        System.out.println(staProtocol.getAgvTargetPick());
+                    }
+                    staProtocol.setAgvTargetPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6 + 2));   // 鏀捐揣瀹屾垚
+                    if (staProtocol.getAgvTargetPlace()!=0){
+                        System.out.println(staProtocol.getAgvTargetPlace());
+                    }
+                }catch (Exception e){
+                    log.error(""+e);
+                }
             }
         }
 

--
Gitblit v1.9.1