From 7afae7415d0fa7cdd65b751deb0377c89a8f9981 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 二月 2023 17:49:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 4 +-
src/main/webapp/views/pipeline.html | 2
src/main/webapp/static/js/console.map.js | 34 ++++++++--------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 30 +++++++-------
4 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index c7534f6..fc82ad9 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -126,8 +126,8 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "鐭�" : "闀�"); //楂樹綆搴撲綅
+// vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index dfc1b4d..f4417ad 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -162,23 +162,23 @@
}
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2)); // 鐩爣绔�
+// staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2)); // 鐩爣绔�
}
}
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
-// if (result0.IsSuccess) {
-// for (int i = 0; i < 93; i++) {
-// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔�
-// }
-// }
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
+ if (result0.IsSuccess) {
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔�
+ }
+ }
Thread.sleep(200);
OperateResultExOne<byte[]> result1 = null;
result1 = siemensS7Net.Read("DB102.100", (short) (staNoSize * 2));
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 2b53757..d4c8047 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -91,8 +91,8 @@
"rackDescs": [
{
"type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
+ "id": "lb_desc8",
+ "text": "#8",
"top": 150,
"left": 1345,
"width": 30,
@@ -100,18 +100,9 @@
},
{
"type": "rackDescs",
- "id": "lb_desc3",
- "text": "#3",
+ "id": "lb_desc6",
+ "text": "#6",
"top": 223,
- "left": 1380,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc4",
- "text": "#4",
- "top": 245,
"left": 1380,
"width": 30,
"height": 23
@@ -120,6 +111,15 @@
"type": "rackDescs",
"id": "lb_desc5",
"text": "#5",
+ "top": 245,
+ "left": 1380,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc4",
+ "text": "#4",
"top": 280,
"left": 1380,
"width": 30,
@@ -127,8 +127,8 @@
},
{
"type": "rackDescs",
- "id": "lb_desc6",
- "text": "#6",
+ "id": "lb_desc3",
+ "text": "#3",
"top": 300,
"left": 1380,
"width": 30,
@@ -136,8 +136,8 @@
},
{
"type": "rackDescs",
- "id": "lb_desc8",
- "text": "#8",
+ "id": "lb_desc1",
+ "text": "#1",
"top": 380,
"left": 1345,
"width": 30,
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index c316cbd..79dc1a3 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -115,7 +115,7 @@
<th>鍏ュ簱鏍囪</th>
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
- <th>楂樹綆搴撲綅</th>
+ <th>闀跨煭搴撲綅</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
--
Gitblit v1.9.1