From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
index b2f6827..1fcdedf 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
@@ -88,6 +88,22 @@
                 }
             }
             jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
+
+            //杩涚墖鑱旀満
+            ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
+            jsonObject.append("inkageEntity", inkageEntity.getValue());
+            //杩涚墖璇锋眰
+            ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
+            jsonObject.append("requestEntity", requestEntity.getValue());
+            //鍚姩鍛戒护
+            ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
+            jsonObject.append("mesReplyEntity", mesReplyEntity.getValue());
+            //鍑虹墖鑱旀満
+            ReadWriteEntity outInkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
+            jsonObject.append("outInkageEntity", outInkageEntity.getValue());
+            //鍑虹墖璇锋眰
+            ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
+            jsonObject.append("outRequestEntity", outRequestEntity.getValue());
         }catch(Exception e){
             //todo:涓嶅仛浠诲姟澶勭悊
         }

--
Gitblit v1.8.0