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/DeviceField.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java
index 3039913..85791dd 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java
@@ -8,7 +8,7 @@
     // 鎵爜鍣細姣忕珯鐐�16瀛楄妭锛孲tring[14]
     BARCODE("DB101", 0, 16),
     // 绉伴噸锛氭瘡绔欑偣4瀛楄妭锛孎loat
-    WEIGHT("DB102",  0, 4),
+    WEIGHT("DB102", 0, 4),
     // 灏哄寮傚父锛氭瘡绔欑偣2瀛楄妭锛孊it鏁扮粍
     DIMENSION_WORD("DB103", 0, 2);
 
@@ -16,7 +16,7 @@
     private final int offset;
     private final int byteLength;
 
-    DeviceField(String addressPattern,  int offset, int byteLength) {
+    DeviceField(String addressPattern, int offset, int byteLength) {
         this.addressPattern = addressPattern;
         this.offset = offset;
         this.byteLength = byteLength;
@@ -36,12 +36,10 @@
 
     /**
      * 鏍规嵁 DB 鍧楃紪鍙峰拰绔欑偣鍋忕Щ鐢熸垚鍏蜂綋鍦板潃
-     * @param dbBlock DB鍧楃紪鍙�
-     * @param stationBaseOffset 绔欑偣鍩哄潃鍋忕Щ锛堢珯鐐瑰彿*绔欑偣闀垮害锛�
+     *
      * @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.DBD0"
      */
-    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;
     }
 }

--
Gitblit v1.9.1