From 74939fd9434b584571b26d939a0dd29fde43b354 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 06 九月 2022 17:17:18 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pipeline.html | 21 +-----
src/main/resources/application.yml | 122 +++++++++++-----------------------------
src/main/java/com/zy/core/ServerBootstrap.java | 28 ++++----
3 files changed, 51 insertions(+), 120 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index b9a18f7..32447ef 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -88,13 +88,13 @@
new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
- // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
- log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
- for (Slave barcode : slaveProperties.getBarcode()) {
- BarcodeThread barcodeThread = new BarcodeThread(barcode);
-// new Thread(barcodeThread).start();
- SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
- }
+// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+// log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+// for (Slave barcode : slaveProperties.getBarcode()) {
+// BarcodeThread barcodeThread = new BarcodeThread(barcode);
+//// new Thread(barcodeThread).start();
+// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+// }
// // 鍒濆鍖朙ED绾跨▼
// log.info("鍒濆鍖朙ED绾跨▼...................................................");
// for (LedSlave led : slaveProperties.getLed()) {
@@ -102,13 +102,13 @@
// new Thread(ledThread).start();
// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
// }
- // 鍒濆鍖栫绉ょ嚎绋�
-// log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-// for (Slave scale : slaveProperties.getScale()) {
-// ScaleThread barcodeThread = new ScaleThread(scale);
-// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
-// }
+// 鍒濆鍖栫绉ょ嚎绋�
+ log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+ for (Slave scale : slaveProperties.getScale()) {
+ ScaleThread scaleThread = new ScaleThread(scale);
+ new Thread(scaleThread).start();
+ SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 89039cc..efa500f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -54,26 +54,33 @@
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 3
+ staNo: 105
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 209
row: 2
- bay: 1
+ bay: 41
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 106
row: 2
bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 210
+ row: 1
+ bay: 41
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
@@ -88,29 +95,29 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
+ staNo: 109
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
- bay: 1
+ staNo: 205
+ row: 4
+ bay: 41
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
+ staNo: 110
+ row: 4
bay: 1
lev: 1
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
- bay: 1
+ staNo: 206
+ row: 3
+ bay: 41
lev: 1
# 杈撻�佺嚎
@@ -122,46 +129,24 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 203
+ staNo: 201
barcode: ${wcs-slave.barcode[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
+ staNo: 101
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 203
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 305
+ staNo: 201
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 102
+ staNo: 103
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 202
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 303
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 102
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 202
- barcode: ${wcs-slave.barcode[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 303
- barcode: ${wcs-slave.barcode[2].id}
+ staNo: 203
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -171,49 +156,8 @@
id: 2
ip: 10.10.10.52
port: 51236
- barcode[2]:
- id: 3
- ip: 10.10.10.52
- port: 51236
- # LED1
- led[0]:
+ # 纾呯Г
+ scale[0]:
id: 1
ip: 10.10.10.201
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.203
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 202
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.204
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 203
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.205
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 303
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 305
\ No newline at end of file
+ port: 5005
\ No newline at end of file
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index eccbf95..e04a03f 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -53,32 +53,19 @@
<!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
<div id="plc-error" class="main-board" style="padding-left: 10px">
<!-- 澶撮儴 -->
-<!-- <div class="plc-log-header">-->
- <!-- 璁惧浠诲姟鎿嶄綔 -->
-<!-- <div class="io-mode-oper">-->
-<!-- <fieldset>-->
-<!-- <legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>-->
-<!-- <div class="io-mode-box">-->
-<!-- <label>2F</label>-->
-<!-- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
-<!-- </div>-->
-<!-- </fieldset>-->
-<!-- </div>-->
+ <div class="plc-log-header">
<!-- <div style="height: 40%">-->
<!-- <span>涓滀晶PLC鎵ц鎸囦护</span>-->
<!-- </div>-->
<!-- <div style="height: 40%">-->
<!-- <span>瑗夸晶PLC鎵ц鎸囦护</span>-->
<!-- </div>-->
- <!-- <div>-->
- <!-- <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>-->
- <!-- </div>-->
-<!-- </div>-->
- <!-- 涓讳綋 -->
- <div class="plc-log-body">
<div>
<span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
</div>
+ </div>
+ <!-- 涓讳綋 -->
+ <div class="plc-log-body">
<table id="plc-error-table">
<thead>
<tr>
--
Gitblit v1.9.1