From 982bc1e3eb588021b2f73dfb04bfc78beb462db7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 10 六月 2025 14:25:19 +0800
Subject: [PATCH] 添加引入,修改S7类short为int

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 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 188b532..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,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