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 | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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 2cd1e27..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,9 +1,11 @@
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;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* @Author : zhoush
@@ -12,40 +14,42 @@
*/
@Data
@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class S7DataWL {
- @S7Variable(address = "DB49.0", type = EDataType.INT16)
- private Short taskRunning;
+ @S7Variable(address = "DB49.0", type = EDataType.UINT16)
+ private Integer taskRunning;
- @S7Variable(address = "DB49.46", type = EDataType.INT16)
- private Short currentCell;
+ @S7Variable(address = "DB49.46", type = EDataType.UINT16)
+ private Integer currentCell;
- @S7Variable(address = "DB49.48", type = EDataType.INT16)
- private Short startCell;
+ @S7Variable(address = "DB49.48", type = EDataType.UINT16)
+ private Integer startCell;
- @S7Variable(address = "DB49.50", type = EDataType.INT16)
- private Short endCell;
+ @S7Variable(address = "DB49.50", type = EDataType.UINT16)
+ private Integer endCell;
- @S7Variable(address = "DB49.52", type = EDataType.INT16)
- private Short TaskState;
+ @S7Variable(address = "DB49.52", type = EDataType.UINT16)
+ private Integer TaskState;
- @S7Variable(address = "DB49.116", type = EDataType.INT16)
- private Short inPlace;
+ @S7Variable(address = "DB49.116", type = EDataType.UINT16)
+ private Integer inPlace;
- @S7Variable(address = "DB49.124", type = EDataType.INT16)
- private Short slotState;
+ @S7Variable(address = "DB49.124", type = EDataType.UINT16)
+ private Integer slotState;
@S7Variable(address = "DB49.118", type = EDataType.FLOAT32)
private Float speed;
- @S7Variable(address = "DB49.2", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB49.2", type = EDataType.STRING, count = 14)
private String glassIdIn;
- @S7Variable(address = "DB49.24", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB49.24", type = EDataType.STRING, count = 14)
private String glassIdOut;
- @S7Variable(address = "DB49.94", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB49.94", type = EDataType.STRING, count = 14)
private String glassId;
@S7Variable(address = "DB49.112.0", type = EDataType.BOOL)
--
Gitblit v1.8.0