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/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
index 4bde154..f3be3ab 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
@@ -13,31 +13,31 @@
 public class S7DataSP {
 
 
-    @S7Variable(address = "DB19.14", type = EDataType.INT16)
+    @S7Variable(address = "DB19.14", type = EDataType.UINT16)
     private Integer taskState;
 
-    @S7Variable(address = "DB19.18", type = EDataType.INT16)
+    @S7Variable(address = "DB19.18", type = EDataType.UINT16)
     private Integer damageCount;
 
-    @S7Variable(address = "DB19.20", type = EDataType.INT16)
+    @S7Variable(address = "DB19.20", type = EDataType.UINT16)
     private Integer rawGlassWidth;
 
-    @S7Variable(address = "DB19.22", type = EDataType.INT16)
+    @S7Variable(address = "DB19.22", type = EDataType.UINT16)
     private Integer rawGlassHeight;
 
-    @S7Variable(address = "DB19.24", type = EDataType.INT16)
+    @S7Variable(address = "DB19.24", type = EDataType.UINT16)
     private Integer slot;
 
-    @S7Variable(address = "DB19.26", type = EDataType.INT16)
+    @S7Variable(address = "DB19.26", type = EDataType.UINT16)
     private Integer totalCount;
 
-    @S7Variable(address = "DB19.28", type = EDataType.INT16)
+    @S7Variable(address = "DB19.28", type = EDataType.UINT16)
     private Integer finishCount;
 
-    @S7Variable(address = "DB19.x16.0", type = EDataType.BOOL)
-    private Integer taskRunning;
+    @S7Variable(address = "DB19.16.0", type = EDataType.BOOL)
+    private Boolean taskRunning;
 
-    @S7Variable(address = "DB19.30", type = EDataType.INT16)
+    @S7Variable(address = "DB19.30", type = EDataType.UINT16)
     private Integer inkageState;
 
 

--
Gitblit v1.8.0