From f33935a9d187f2f98698c741ccbb14c56f85a483 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 13 六月 2022 16:17:29 +0800
Subject: [PATCH] #
---
/dev/null | 0
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 2 +-
src/main/webapp/views/render.js | 4 ++++
src/main/java/com/zy/core/MainProcess.java | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 5 -----
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c7ed6a0..a7a89ca 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -61,7 +61,7 @@
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
+ mainService.storeEmptyPlt();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index cb42c1f..4999239 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -356,7 +356,7 @@
}
OperateResult write = melsecMcNet.Write("D10", heartBeatVal);
if (!write.IsSuccess) {
- log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+ log.error("鍫嗗灈鏈簆lc蹇冭烦閫氳澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 66e80c6..df00d38 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -23,7 +23,6 @@
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
-import com.zy.core.properties.SlaveProperties;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,9 +52,6 @@
add(120);add(121);add(122);add(123);add(124);add(125);add(126);add(127);add(128);add(129);
add(130);add(131);add(132);add(133);add(134);add(135);add(136);
}};
-
- @Autowired
- private SlaveProperties slaveProperties;
/**
* 鏉＄爜鏁伴噺
@@ -178,7 +174,6 @@
}
Thread.sleep(200);
- barcodeSize = slaveProperties.getBarcode().size();
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
diff --git a/src/main/webapp/views/ren.js b/src/main/webapp/views/ren.js
deleted file mode 100644
index e69de29..0000000
--- a/src/main/webapp/views/ren.js
+++ /dev/null
diff --git a/src/main/webapp/views/render.js b/src/main/webapp/views/render.js
index c09c091..0d12b46 100644
--- a/src/main/webapp/views/render.js
+++ b/src/main/webapp/views/render.js
@@ -558,6 +558,7 @@
let rack = '', racks = '', rackDesc = '',
rackDescs = '', crn = '', crns = '',track = '',
tracks = '', stn = '', stns = '';
+ let stnCount = 0;
let rackss = data.racks,
rackDescss = data.rackDescs,
crnss = data.crns,
@@ -646,7 +647,10 @@
"px;left: "+ stnss[i].left +
"px'>" + stnss[i].text + "</div>"
stns = stns + stn
+ stnCount++;
}
let whycq = racks + stns + rackDescs + crns + tracks
$(".main-part").append(whycq)
+ $("#line-total").empty()
+ $("#line-total").html(stnCount)
};
\ No newline at end of file
--
Gitblit v1.9.1