From d7765b799489db445388e528044ab3b2bd2e649e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 12 六月 2025 08:22:57 +0800
Subject: [PATCH] 钢化模块modbus和S7改造
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java
index 1e4b80c..b796381 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java
@@ -16,82 +16,82 @@
@S7Variable(address = "DB3.8", type = EDataType.BOOL)
private Boolean mesControl;
- @S7Variable(address = "DB19.4", type = EDataType.INT16)
- private Short requestMes;
+ @S7Variable(address = "DB19.4", type = EDataType.UINT16)
+ private Integer requestMes;
- @S7Variable(address = "DB19.6", type = EDataType.INT16)
- private Short mesReply;
+ @S7Variable(address = "DB19.6", type = EDataType.UINT16)
+ private Integer mesReply;
- @S7Variable(address = "DB19.308", type = EDataType.INT16)
- private Short from1;
+ @S7Variable(address = "DB19.308", type = EDataType.UINT16)
+ private Integer from1;
- @S7Variable(address = "DB19.310", type = EDataType.INT16)
- private Short from2;
+ @S7Variable(address = "DB19.310", type = EDataType.UINT16)
+ private Integer from2;
- @S7Variable(address = "DB19.312", type = EDataType.INT16)
- private Short from3;
+ @S7Variable(address = "DB19.312", type = EDataType.UINT16)
+ private Integer from3;
- @S7Variable(address = "DB19.314", type = EDataType.INT16)
- private Short from4;
+ @S7Variable(address = "DB19.314", type = EDataType.UINT16)
+ private Integer from4;
- @S7Variable(address = "DB19.316", type = EDataType.INT16)
- private Short from5;
+ @S7Variable(address = "DB19.316", type = EDataType.UINT16)
+ private Integer from5;
- @S7Variable(address = "DB19.318", type = EDataType.INT16)
- private Short from6;
+ @S7Variable(address = "DB19.318", type = EDataType.UINT16)
+ private Integer from6;
- @S7Variable(address = "DB19.320", type = EDataType.INT16)
- private Short to1;
+ @S7Variable(address = "DB19.320", type = EDataType.UINT16)
+ private Integer to1;
- @S7Variable(address = "DB19.322", type = EDataType.INT16)
- private Short to2;
+ @S7Variable(address = "DB19.322", type = EDataType.UINT16)
+ private Integer to2;
- @S7Variable(address = "DB19.324", type = EDataType.INT16)
- private Short to3;
+ @S7Variable(address = "DB19.324", type = EDataType.UINT16)
+ private Integer to3;
- @S7Variable(address = "DB19.326", type = EDataType.INT16)
- private Short to4;
+ @S7Variable(address = "DB19.326", type = EDataType.UINT16)
+ private Integer to4;
- @S7Variable(address = "DB19.328", type = EDataType.INT16)
- private Short to5;
+ @S7Variable(address = "DB19.328", type = EDataType.UINT16)
+ private Integer to5;
- @S7Variable(address = "DB19.330", type = EDataType.INT16)
- private Short to6;
+ @S7Variable(address = "DB19.330", type = EDataType.UINT16)
+ private Integer to6;
- @S7Variable(address = "DB19.332", type = EDataType.INT16)
- private Short state1;
+ @S7Variable(address = "DB19.332", type = EDataType.UINT16)
+ private Integer state1;
- @S7Variable(address = "DB19.334", type = EDataType.INT16)
- private Short state2;
+ @S7Variable(address = "DB19.334", type = EDataType.UINT16)
+ private Integer state2;
- @S7Variable(address = "DB19.336", type = EDataType.INT16)
- private Short state3;
+ @S7Variable(address = "DB19.336", type = EDataType.UINT16)
+ private Integer state3;
- @S7Variable(address = "DB19.338", type = EDataType.INT16)
- private Short state4;
+ @S7Variable(address = "DB19.338", type = EDataType.UINT16)
+ private Integer state4;
- @S7Variable(address = "DB19.340", type = EDataType.INT16)
- private Short state5;
+ @S7Variable(address = "DB19.340", type = EDataType.UINT16)
+ private Integer state5;
- @S7Variable(address = "DB19.342", type = EDataType.INT16)
- private Short state6;
+ @S7Variable(address = "DB19.342", type = EDataType.UINT16)
+ private Integer state6;
- @S7Variable(address = "DB19.176", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB19.176", type = EDataType.STRING, count = 20)
private String id1;
- @S7Variable(address = "DB19.198", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB19.198", type = EDataType.STRING, count = 20)
private String id2;
- @S7Variable(address = "DB19.220", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB19.220", type = EDataType.STRING, count = 20)
private String id3;
- @S7Variable(address = "DB19.242", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB19.242", type = EDataType.STRING, count = 20)
private String id4;
- @S7Variable(address = "DB19.264", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB19.264", type = EDataType.STRING, count = 20)
private String id5;
- @S7Variable(address = "DB19.286", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB19.286", type = EDataType.STRING, count = 20)
private String id6;
--
Gitblit v1.8.0