From b94ae4d8f439b78a419da97d12e863d41ac4c181 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 18:57:43 +0800
Subject: [PATCH] 1、fixbug:玻璃出片调度未将格子置空导致有进片任务,占用同一格的情况 2、大理片笼界面显示缺少任务信息 3、优化钢化推送任务

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
index 15fa1e7..313adc2 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
@@ -105,9 +105,10 @@
         if (addressLength < 2) {
             return null;
         }
+        int wordindex = Integer.parseInt(stringdatas[1]) + index;
+        return stringdatas[0] + "." + wordindex;
+      /*  if (addressLength == 2) {
 
-        if (addressLength == 2) {
-            int wordindex = index;
 
             return stringdatas[0] + "." + wordindex;
         }
@@ -115,13 +116,8 @@
             int wordindex = index;
             int newIndex = wordindex + 13;
             return stringdatas[0] + "." + wordindex + "-" + newIndex;
-        }
-        return null;
-    }
-
-    public int getPlcAddress() {
-
-        return addressIndex;
+        }*/
+//        return null;
     }
 
     public String getAddress() {

--
Gitblit v1.8.0