From d3786a4b86e2dac2c183a448d743b9786abb8582 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 10 十月 2024 20:38:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java | 3 +--
src/main/webapp/static/js/console.map.js | 8 --------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 29 ++++++++++++++++++++++++++++-
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
index 4c0dffb..4da5dfd 100644
--- a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
@@ -20,9 +20,8 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){//鎷嗗灈淇℃伅涓婁紶
- int[] staNos =new int[]{118,119,120,121};
+ int[] staNos =new int[]{118,120,121};
for (int staNo : staNos){
- if (staNo==119) continue;
try{
ReturnT<String> result = reportToDismantleTheStackHandler.start(staNo);
if (result.getCode()==200){
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index fc94483..aac7d50 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -58,6 +58,8 @@
add(144);add(145);add(146);add(147);
add(148);add(149);add(150);add(151);
add(152);add(153);
+ add(170);
+ add(171);
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(200);add(201);add(202);add(203);
@@ -206,6 +208,28 @@
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ if (siteId==119){
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setWorkNo(0); // 宸ヤ綔鍙�
+
+ staProtocol.setStaNo(0); // 鐩爣绔�
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
+ staProtocol.setAutoing(false); // 鑷姩
+ staProtocol.setLoading(status[1]); // 鏈夌墿
+ staProtocol.setInEnable(status[2]); // 鍙叆
+ staProtocol.setOutEnable(status[3]);// 鍙嚭
+ staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
+ staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
+ staProtocol.setHigh(status[6]); // 楂樺簱浣�
+ staProtocol.setLow(status[7]); // 浣庡簱浣�
+ continue;
+ }
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
@@ -225,7 +249,10 @@
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
staProtocol.setHigh(status[6]); // 楂樺簱浣�
staProtocol.setLow(status[7]); // 浣庡簱浣�
+ if (siteId==118){
+ staProtocol.setAutoing(false); // 鑷姩
+ }
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
@@ -420,7 +447,7 @@
case 118:
index=0;
break;
- case 119:
+ case 171:
index=1;
break;
case 120:
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index cf748bb..ba6ab73 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -731,14 +731,6 @@
"height": 20
}, {
"type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 355,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
"id": "site-120",
"text": "120",
"top": 421,
--
Gitblit v1.9.1