From b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 十一月 2025 08:53:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/s7/entity/S7DataCC.java | 37 -------------------------------------
1 files changed, 0 insertions(+), 37 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 3764667..45e58f1 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
@@ -12,43 +12,6 @@
@Data
public class S7DataCC {
-
-// @S7Variable(address = "DB1.0", type = EDataType.UINT16)
-// private Integer request;
-//
-// @S7Variable(address = "DB1.2", type = EDataType.UINT16)
-// private Integer requestId;
-//
-// @S7Variable(address = "DB1.4", type = EDataType.UINT16)
-// private Integer reportWord;
-//
-// @S7Variable(address = "DB1.6", type = EDataType.UINT16)
-// private Integer reportId;
-//
-// @S7Variable(address = "DB1.8", type = EDataType.UINT16)
-// private Integer inCar;
-//
-// @S7Variable(address = "DB1.10", type = EDataType.UINT16)
-// private Integer taskWord;
-//
-// @S7Variable(address = "DB1.12", type = EDataType.UINT16)
-// private Integer taskId;
-//
-// @S7Variable(address = "DB1.14", type = EDataType.UINT16)
-// private Integer startSlot;
-//
-// @S7Variable(address = "DB1.16", type = EDataType.UINT16)
-// private Integer endSlot;
-//
-// @S7Variable(address = "DB1.18", type = EDataType.UINT16)
-// private Integer taskSending;
-//
-// @S7Variable(address = "DB1.20", type = EDataType.UINT16)
-// private Integer confirmation;
-//
-// @S7Variable(address = "DB1.22", type = EDataType.UINT16)
-// private Integer confirmationId;
-
@S7Variable(address = "DB38.0", type = EDataType.UINT16)
private Integer request;
--
Gitblit v1.8.0