From 05bd172d550f1b6b963fcb23ef21d79e2a43d757 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 10 六月 2025 13:59:34 +0800
Subject: [PATCH] 更新S7通讯程序

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java |   35 +++++++++++++++++++++++++----------
 1 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java
index 82f327e..73315dc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java
@@ -13,25 +13,40 @@
 public class S7DataMB {
 
 
-    @S7Variable(address = "DB19.6", type = EDataType.FLOAT32)
+    @S7Variable(address = "DB323.6", type = EDataType.FLOAT32)
     private Float speed;
 
-    @S7Variable(address = "DB49.10", type = EDataType.INT32)
-    private Integer width;
-
-    @S7Variable(address = "DB49.2", type = EDataType.INT32)
+    @S7Variable(address = "DB324.2", type = EDataType.INT32)
     private Integer toEdingId;
 
-    @S7Variable(address = "DB49.6", type = EDataType.INT32)
+    @S7Variable(address = "DB324.6", type = EDataType.INT32)
     private Integer glassId;
 
-    @S7Variable(address = "DB49.14", type = EDataType.INT32)
+    @S7Variable(address = "DB324.10", type = EDataType.INT32)
+    private Integer width;
+
+    @S7Variable(address = "DB324.14", type = EDataType.INT32)
     private Integer height;
 
-    @S7Variable(address = "DB49.18", type = EDataType.INT16)
-    private Short thickness;
+    @S7Variable(address = "DB324.18", type = EDataType.UINT16)
+    private Integer thickness;
 
-    @S7Variable(address = "DB49.0.3", type = EDataType.BOOL)
+    @S7Variable(address = "DB324.0.3", type = EDataType.BOOL)
     private Boolean mesControl;
 
+//    @S7Variable(address = "DB49.126", type = EDataType.INT32)
+//    private Integer toEdingId;
+//
+//    @S7Variable(address = "DB49.130", type = EDataType.INT32)
+//    private Integer glassId;
+//
+//    @S7Variable(address = "DB49.134", type = EDataType.INT32)
+//    private Integer width;
+//
+//    @S7Variable(address = "DB49.138", type = EDataType.INT32)
+//    private Integer height;
+//
+//    @S7Variable(address = "DB49.142", type = EDataType.UINT16)
+//    private Short thickness;
+
 }

--
Gitblit v1.8.0