From 05bd172d550f1b6b963fcb23ef21d79e2a43d757 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 10 六月 2025 13:59:34 +0800
Subject: [PATCH] 更新S7通讯程序

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataWL.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 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 a1033b7..0cd82b1 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
@@ -19,37 +19,37 @@
 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 = 20)
     private String glassIdIn;
 
-    @S7Variable(address = "DB49.24", type = EDataType.STRING, count = 22)
+    @S7Variable(address = "DB49.24", type = EDataType.STRING, count = 20)
     private String glassIdOut;
 
-    @S7Variable(address = "DB49.94", type = EDataType.STRING, count = 22)
+    @S7Variable(address = "DB49.94", type = EDataType.STRING, count = 20)
     private String glassId;
 
     @S7Variable(address = "DB49.112.0", type = EDataType.BOOL)

--
Gitblit v1.8.0