From a6720987358933753d9b90acda9103003cfb37ee Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 13 六月 2025 17:09:57 +0800
Subject: [PATCH] 更新通讯依赖版本为1.5.4,中空大理片,钢化大理片S7,modbus测试完成代码提交

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataWL.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataWL.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataWL.java
index 0cd82b1..6c4412b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataWL.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataWL.java
@@ -1,6 +1,6 @@
 package com.mes.s7.entity;
 
-import com.github.xingshuangs.iot.protocol.common.enums.EDataType;
+import com.github.xingshuangs.iot.common.enums.EDataType;
 import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -43,13 +43,13 @@
     @S7Variable(address = "DB49.118", type = EDataType.FLOAT32)
     private Float speed;
 
-    @S7Variable(address = "DB49.2", type = EDataType.STRING, count = 20)
+    @S7Variable(address = "DB49.2", type = EDataType.STRING, count = 14)
     private String glassIdIn;
 
-    @S7Variable(address = "DB49.24", type = EDataType.STRING, count = 20)
+    @S7Variable(address = "DB49.24", type = EDataType.STRING, count = 14)
     private String glassIdOut;
 
-    @S7Variable(address = "DB49.94", type = EDataType.STRING, count = 20)
+    @S7Variable(address = "DB49.94", type = EDataType.STRING, count = 14)
     private String glassId;
 
     @S7Variable(address = "DB49.112.0", type = EDataType.BOOL)

--
Gitblit v1.8.0