From 0477b72d30cfe7d412edeb237aa587b1c5242207 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 09 七月 2024 08:34:31 +0800
Subject: [PATCH] 1、任务新增计时功能,日志打印每次任务执行的周期 2、卧式理片笼更新出片规则:都为禁用(2),笼子不出玻璃;存在一个禁用,07片台可以存玻璃;都非禁用:两片台有玻璃笼子不出片

---
 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