From 625aed02d6fa6609ad380d4f9e48df1887a3d62a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 19 十月 2023 14:00:04 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/console.map.js | 16 ++++++++
src/main/resources/application.yml | 86 +++++++++++++------------------------------
2 files changed, 42 insertions(+), 60 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 971f7b7..c99ecd0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -47,7 +47,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.10
port: 102
rack: 0
slot: 0
@@ -95,7 +95,31 @@
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.4.250
+ ip: 10.10.10.10
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 303
+ row: 22
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 304
+ row: 23
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 10.10.10.10
port: 102
rack: 0
slot: 0
@@ -144,64 +168,6 @@
outSta[0]:
staNo: 106
led: ${wcs-slave.led[0].id}
-
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[3].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[3].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[3].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 206
- led: ${wcs-slave.led[2].id}
-
- # 杈撻�佺嚎3
- devp[2]:
- id: 3
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 300
- led: ${wcs-slave.led[5].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 200
- led: ${wcs-slave.led[5].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[5].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 306
- led: ${wcs-slave.led[4].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 42a7341..758dc63 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -651,6 +651,22 @@
"height": 700
}, {
"type": "stn",
+ "id": "site-1",
+ "text": "1",
+ "top": 398,
+ "left": 220,
+ "width": 60,
+ "height": 19
+ }, {
+ "type": "stn",
+ "id": "site-2",
+ "text": "2",
+ "top": 698,
+ "left": 220,
+ "width": 60,
+ "height": 19
+ }, {
+ "type": "stn",
"id": "site-110",
"text": "110",
"top": 620,
--
Gitblit v1.9.1