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/S7DataSP.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataSP.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataSP.java
index 188b532..75a6e09 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataSP.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataSP.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,32 +13,32 @@
public class S7DataSP {
- @S7Variable(address = "DB19.14", type = EDataType.INT16)
- private Short taskState;
+ @S7Variable(address = "DB19.14", type = EDataType.UINT16)
+ private Integer taskState;
- @S7Variable(address = "DB19.18", type = EDataType.INT16)
- private Short damageCount;
+ @S7Variable(address = "DB19.18", type = EDataType.UINT16)
+ private Integer damageCount;
- @S7Variable(address = "DB19.20", type = EDataType.INT16)
- private Short rawGlassWidth;
+ @S7Variable(address = "DB19.20", type = EDataType.UINT16)
+ private Integer rawGlassWidth;
- @S7Variable(address = "DB19.22", type = EDataType.INT16)
- private Short rawGlassHeight;
+ @S7Variable(address = "DB19.22", type = EDataType.UINT16)
+ private Integer rawGlassHeight;
- @S7Variable(address = "DB19.24", type = EDataType.INT16)
- private Short slot;
+ @S7Variable(address = "DB19.24", type = EDataType.UINT16)
+ private Integer slot;
- @S7Variable(address = "DB19.26", type = EDataType.INT16)
- private Short totalCount;
+ @S7Variable(address = "DB19.26", type = EDataType.UINT16)
+ private Integer totalCount;
- @S7Variable(address = "DB19.28", type = EDataType.INT16)
- private Short finishCount;
+ @S7Variable(address = "DB19.28", type = EDataType.UINT16)
+ private Integer finishCount;
@S7Variable(address = "DB19.16.0", type = EDataType.BOOL)
private Boolean taskRunning;
- @S7Variable(address = "DB19.30", type = EDataType.INT16)
- private Short inkageState;
+ @S7Variable(address = "DB19.30", type = EDataType.UINT16)
+ private Integer inkageState;
}
--
Gitblit v1.8.0