From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 三月 2025 09:50:47 +0800
Subject: [PATCH] 1、大理片笼新增复位按钮：清除笼内状态为0的玻璃数据，并将格子尺寸恢复到初始状态。 2、历史任务按钮：按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时，仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱，当数量小于总层数时，增加是否同一对玻璃的判断，避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息
---
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