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/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java | 98 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java
index 806b291..3764667 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.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,77 +13,77 @@
public class S7DataCC {
-// @S7Variable(address = "DB1.0", type = EDataType.INT16)
-// private Short request;
+// @S7Variable(address = "DB1.0", type = EDataType.UINT16)
+// private Integer request;
//
-// @S7Variable(address = "DB1.2", type = EDataType.INT16)
-// private Short requestId;
+// @S7Variable(address = "DB1.2", type = EDataType.UINT16)
+// private Integer requestId;
//
-// @S7Variable(address = "DB1.4", type = EDataType.INT16)
-// private Short reportWord;
+// @S7Variable(address = "DB1.4", type = EDataType.UINT16)
+// private Integer reportWord;
//
-// @S7Variable(address = "DB1.6", type = EDataType.INT16)
-// private Short reportId;
+// @S7Variable(address = "DB1.6", type = EDataType.UINT16)
+// private Integer reportId;
//
-// @S7Variable(address = "DB1.8", type = EDataType.INT16)
-// private Short inCar;
+// @S7Variable(address = "DB1.8", type = EDataType.UINT16)
+// private Integer inCar;
//
-// @S7Variable(address = "DB1.10", type = EDataType.INT16)
-// private Short taskWord;
+// @S7Variable(address = "DB1.10", type = EDataType.UINT16)
+// private Integer taskWord;
//
-// @S7Variable(address = "DB1.12", type = EDataType.INT16)
-// private Short taskId;
+// @S7Variable(address = "DB1.12", type = EDataType.UINT16)
+// private Integer taskId;
//
-// @S7Variable(address = "DB1.14", type = EDataType.INT16)
-// private Short startSlot;
+// @S7Variable(address = "DB1.14", type = EDataType.UINT16)
+// private Integer startSlot;
//
-// @S7Variable(address = "DB1.16", type = EDataType.INT16)
-// private Short endSlot;
+// @S7Variable(address = "DB1.16", type = EDataType.UINT16)
+// private Integer endSlot;
//
-// @S7Variable(address = "DB1.18", type = EDataType.INT16)
-// private Short taskSending;
+// @S7Variable(address = "DB1.18", type = EDataType.UINT16)
+// private Integer taskSending;
//
-// @S7Variable(address = "DB1.20", type = EDataType.INT16)
-// private Short confirmation;
+// @S7Variable(address = "DB1.20", type = EDataType.UINT16)
+// private Integer confirmation;
//
-// @S7Variable(address = "DB1.22", type = EDataType.INT16)
-// private Short confirmationId;
+// @S7Variable(address = "DB1.22", type = EDataType.UINT16)
+// private Integer confirmationId;
- @S7Variable(address = "DB38.0", type = EDataType.INT16)
- private Short request;
+ @S7Variable(address = "DB38.0", type = EDataType.UINT16)
+ private Integer request;
- @S7Variable(address = "DB38.2", type = EDataType.INT16)
- private Short requestId;
+ @S7Variable(address = "DB38.2", type = EDataType.UINT16)
+ private Integer requestId;
- @S7Variable(address = "DB38.10", type = EDataType.INT16)
- private Short reportWord;
+ @S7Variable(address = "DB38.10", type = EDataType.UINT16)
+ private Integer reportWord;
- @S7Variable(address = "DB38.12", type = EDataType.INT16)
- private Short reportId;
+ @S7Variable(address = "DB38.12", type = EDataType.UINT16)
+ private Integer reportId;
- @S7Variable(address = "DB38.18", type = EDataType.INT16)
- private Short inCar;
+ @S7Variable(address = "DB38.18", type = EDataType.UINT16)
+ private Integer inCar;
- @S7Variable(address = "DB38.20", type = EDataType.INT16)
- private Short taskWord;
+ @S7Variable(address = "DB38.20", type = EDataType.UINT16)
+ private Integer taskWord;
- @S7Variable(address = "DB38.22", type = EDataType.INT16)
- private Short taskId;
+ @S7Variable(address = "DB38.22", type = EDataType.UINT16)
+ private Integer taskId;
- @S7Variable(address = "DB38.24", type = EDataType.INT16)
- private Short startSlot;
+ @S7Variable(address = "DB38.24", type = EDataType.UINT16)
+ private Integer startSlot;
- @S7Variable(address = "DB38.26", type = EDataType.INT16)
- private Short endSlot;
+ @S7Variable(address = "DB38.26", type = EDataType.UINT16)
+ private Integer endSlot;
- @S7Variable(address = "DB38.28", type = EDataType.INT16)
- private Short taskSending;
+ @S7Variable(address = "DB38.28", type = EDataType.UINT16)
+ private Integer taskSending;
- @S7Variable(address = "DB38.40", type = EDataType.INT16)
- private Short confirmation;
+ @S7Variable(address = "DB38.40", type = EDataType.UINT16)
+ private Integer confirmation;
- @S7Variable(address = "DB38.42", type = EDataType.INT16)
- private Short confirmationId;
+ @S7Variable(address = "DB38.42", type = EDataType.UINT16)
+ private Integer confirmationId;
}
--
Gitblit v1.8.0