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/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java |   96 ++++++++++++++++++++++++------------------------
 1 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java
index 806b291..2db8d03 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java
@@ -13,77 +13,77 @@
 public class S7DataCC {
 
 
-//    @S7Variable(address = "DB1.0", type = EDataType.INT16)
-//    private Short request;
+//    @S7Variable(address = "DB1.0", type = EDataType.UINT16)
+//    private Integer request;
 //
-//    @S7Variable(address = "DB1.2", type = EDataType.INT16)
-//    private Short requestId;
+//    @S7Variable(address = "DB1.2", type = EDataType.UINT16)
+//    private Integer requestId;
 //
-//    @S7Variable(address = "DB1.4", type = EDataType.INT16)
-//    private Short reportWord;
+//    @S7Variable(address = "DB1.4", type = EDataType.UINT16)
+//    private Integer reportWord;
 //
-//    @S7Variable(address = "DB1.6", type = EDataType.INT16)
-//    private Short reportId;
+//    @S7Variable(address = "DB1.6", type = EDataType.UINT16)
+//    private Integer reportId;
 //
-//    @S7Variable(address = "DB1.8", type = EDataType.INT16)
-//    private Short inCar;
+//    @S7Variable(address = "DB1.8", type = EDataType.UINT16)
+//    private Integer inCar;
 //
-//    @S7Variable(address = "DB1.10", type = EDataType.INT16)
-//    private Short taskWord;
+//    @S7Variable(address = "DB1.10", type = EDataType.UINT16)
+//    private Integer taskWord;
 //
-//    @S7Variable(address = "DB1.12", type = EDataType.INT16)
-//    private Short taskId;
+//    @S7Variable(address = "DB1.12", type = EDataType.UINT16)
+//    private Integer taskId;
 //
-//    @S7Variable(address = "DB1.14", type = EDataType.INT16)
-//    private Short startSlot;
+//    @S7Variable(address = "DB1.14", type = EDataType.UINT16)
+//    private Integer startSlot;
 //
-//    @S7Variable(address = "DB1.16", type = EDataType.INT16)
-//    private Short endSlot;
+//    @S7Variable(address = "DB1.16", type = EDataType.UINT16)
+//    private Integer endSlot;
 //
-//    @S7Variable(address = "DB1.18", type = EDataType.INT16)
-//    private Short taskSending;
+//    @S7Variable(address = "DB1.18", type = EDataType.UINT16)
+//    private Integer taskSending;
 //
-//    @S7Variable(address = "DB1.20", type = EDataType.INT16)
-//    private Short confirmation;
+//    @S7Variable(address = "DB1.20", type = EDataType.UINT16)
+//    private Integer confirmation;
 //
-//    @S7Variable(address = "DB1.22", type = EDataType.INT16)
-//    private Short confirmationId;
+//    @S7Variable(address = "DB1.22", type = EDataType.UINT16)
+//    private Integer confirmationId;
 
-    @S7Variable(address = "DB38.0", type = EDataType.INT16)
-    private Short request;
+    @S7Variable(address = "DB38.0", type = EDataType.UINT16)
+    private Integer request;
 
-    @S7Variable(address = "DB38.2", type = EDataType.INT16)
-    private Short requestId;
+    @S7Variable(address = "DB38.2", type = EDataType.UINT16)
+    private Integer requestId;
 
-    @S7Variable(address = "DB38.10", type = EDataType.INT16)
-    private Short reportWord;
+    @S7Variable(address = "DB38.10", type = EDataType.UINT16)
+    private Integer reportWord;
 
-    @S7Variable(address = "DB38.12", type = EDataType.INT16)
-    private Short reportId;
+    @S7Variable(address = "DB38.12", type = EDataType.UINT16)
+    private Integer reportId;
 
-    @S7Variable(address = "DB38.18", type = EDataType.INT16)
-    private Short inCar;
+    @S7Variable(address = "DB38.18", type = EDataType.UINT16)
+    private Integer inCar;
 
-    @S7Variable(address = "DB38.20", type = EDataType.INT16)
-    private Short taskWord;
+    @S7Variable(address = "DB38.20", type = EDataType.UINT16)
+    private Integer taskWord;
 
-    @S7Variable(address = "DB38.22", type = EDataType.INT16)
-    private Short taskId;
+    @S7Variable(address = "DB38.22", type = EDataType.UINT16)
+    private Integer taskId;
 
-    @S7Variable(address = "DB38.24", type = EDataType.INT16)
-    private Short startSlot;
+    @S7Variable(address = "DB38.24", type = EDataType.UINT16)
+    private Integer startSlot;
 
-    @S7Variable(address = "DB38.26", type = EDataType.INT16)
-    private Short endSlot;
+    @S7Variable(address = "DB38.26", type = EDataType.UINT16)
+    private Integer endSlot;
 
-    @S7Variable(address = "DB38.28", type = EDataType.INT16)
-    private Short taskSending;
+    @S7Variable(address = "DB38.28", type = EDataType.UINT16)
+    private Integer taskSending;
 
-    @S7Variable(address = "DB38.40", type = EDataType.INT16)
-    private Short confirmation;
+    @S7Variable(address = "DB38.40", type = EDataType.UINT16)
+    private Integer confirmation;
 
-    @S7Variable(address = "DB38.42", type = EDataType.INT16)
-    private Short confirmationId;
+    @S7Variable(address = "DB38.42", type = EDataType.UINT16)
+    private Integer confirmationId;
 
 
 }

--
Gitblit v1.8.0