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/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHTwo.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHTwo.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHTwo.java
index ca3233c..2afc86c 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHTwo.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHTwo.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.Data;
@@ -13,16 +13,16 @@
public class S7DataGHTwo {
- @S7Variable(address = "DB110.80", type = EDataType.INT16)
- private Short mesControl;
+ @S7Variable(address = "DB110.32", type = EDataType.UINT16)
+ private Integer f08TemperingLayoutId;
- @S7Variable(address = "DB110.80", type = EDataType.INT16)
- private Short requestMes;
+ @S7Variable(address = "DB110.80", type = EDataType.UINT16)
+ private Integer f09TemperingLayoutId;
@S7Variable(address = "DB110.34", type = EDataType.STRING,count = 10)
- private Short MesReply;
+ private String f08EngineerId;
@S7Variable(address = "DB110.82", type = EDataType.STRING,count = 10)
- private Short From1;
+ private String f09EngineerId;
}
--
Gitblit v1.8.0