From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发,与电气调试中,新增磨边队列表 2、卧理新增历史任务表,记录卧理两台设备执行过的历史数据 3、大理片笼opc任务,新增玻璃进笼计算方式:在笼内存储同炉的多片玻璃,笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发,新增历史任务表记录上片的历史信息

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java
index 3fefdac..bc14c50 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java
@@ -54,19 +54,29 @@
      */
     public String getAddress(int index) {
         String[] stringdatas = this.startAddress.trim().split("\\.");
-        if (stringdatas.length < 2)
+        if (stringdatas.length < 2) {
             return null;
+        }
         int dbwindex = 0;
         int bitindex = 0;
         if (stringdatas.length == 3) {
             dbwindex = Integer.parseInt(stringdatas[1]);
             bitindex = Integer.parseInt(stringdatas[2]);
         } else
+        {
             return null;
+        }
         dbwindex += index / 8;
         bitindex += index % 8;
         return stringdatas[0] + "." + dbwindex + "." + bitindex;
     }
+    /**
+     * 鑾峰彇鍦板潃
+     *
+     */
+    public String getAddress() {
+      return   getAddress(this.addressIndex);
+    }
 
 
     public void setAddressIndex(int addressindex) {

--
Gitblit v1.8.0