From 6e7005a9c8f0e9c21f2d3a4d77a779381e859ac3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 11 四月 2026 10:35:09 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java
index 4953878..2bf07fa 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java
@@ -5,10 +5,11 @@
* 绔欑偣鐘舵�佸瓧娈垫灇涓撅紙瀵瑰簲 搂2.1锛�
*/
public enum StationStatusField {
+ ALL("DB100", 0, 12),
TASK_NUMBER("DB100", 0, 4), // 浠诲姟鍙凤紝鍋忕Щ0锛�4瀛楄妭
- FINAL_TARGET("DB100", 4, 2), // 鏈�缁堢洰鏍囩珯锛屽亸绉�4锛�2瀛楄妭
+ FINAL_TARGET("DB100", 4, 2), // 鏈�缁堢洰鏍囩珯锛屽亸绉�4锛�2瀛楄妭
STATUS_WORD("DB100", 6, 2), // 鐘舵�佸瓧锛屽亸绉�6锛�2瀛楄妭
- TASK_WRITABLE("DB100", 8, 2); // 浠诲姟鍙啓鍖猴紝鍋忕Щ8锛�2瀛楄妭
+ TASK_WRITABLE("DB100", 8, 2); // 浠诲姟鍙啓鍖猴紝鍋忕Щ8锛�2瀛楄妭
private final String addressPattern;
private final int offset;
@@ -22,15 +23,14 @@
/**
* 鏍规嵁 DB 鍧楃紪鍙峰拰绔欑偣鍋忕Щ鐢熸垚鍏蜂綋鍦板潃
- * @param dbBlock DB鍧楃紪鍙�
- * @param stationBaseOffset 绔欑偣鍩哄潃鍋忕Щ锛堢珯鐐瑰彿*绔欑偣闀垮害锛�
- * @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.DBD0"
+ *
+ * @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.D0"
*/
- public String buildAddress(int dbBlock, int stationBaseOffset) {
- int finalOffset = stationBaseOffset + offset;
- return String.format(addressPattern, dbBlock, finalOffset);
+ public String buildAddress() {
+ return addressPattern + PlcConstant.ADDRESS_CONCATENATION + offset;
}
+
public String getAddressPattern() {
return addressPattern;
}
--
Gitblit v1.9.1