From caa5cbcc2f434004ff6da9ae3cd8976ea70beeea Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 27 十一月 2025 09:44:38 +0800
Subject: [PATCH] 济南二机床滑块库初始化
---
src/main/webapp/static/js/console.map.js | 20 +++++-----
src/main/resources/application.yml | 81 ++++++++++++++++++++++++++--------------
2 files changed, 62 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2b96715..a6008fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9092
+ port: 9093
servlet:
context-path: /@pom.build.finalName@
@@ -39,7 +39,7 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
doubleLocs: 3
# 宸︽繁搴撲綅鎺掑彿
@@ -65,24 +65,31 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
+ staNo: 401
row: 2
bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 402
+ row: 2
+ bay: 30
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 1
+ staNo: 401
+ row: 2
bay: 2
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1016
-# row: 5
-# bay: 120
-# lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 402
+ row: 2
+ bay: 30
+ lev: 1
# 鍫嗗灈鏈�2
# crn[1]:
# id: 2
@@ -219,31 +226,47 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 302
+ staNo: 401
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 401
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 1076
-# barcode: ${wcs-slave.barcode[1].id}
-# backSta: 1075
-# led: ${wcs-slave.led[1].id}
+ inSta[1]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 402
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 302
+ staNo: 401
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 401
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 402
led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 302
+ staNo: 401
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 401
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 402
led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 306
+ staNo: 401
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 402
led: ${wcs-slave.led[0].id}
# 杈撻�佺嚎2
# devp[1]:
@@ -270,10 +293,10 @@
ip: 10.10.10.121
port: 51236
# 鏉＄爜鎵弿浠�2
-# barcode[1]:
-# id: 2
-# ip: 10.10.10.121
-# port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.121
+ port: 51236
# # 鏉＄爜鎵弿浠�3
# barcode[2]:
# id: 3
@@ -290,14 +313,14 @@
ip: 127.0.0.1
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 302
+ staArr: 401
# LED2
led[1]:
id: 2
ip: 172.17.60.183
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 306
+ staArr: 402
# # LED3
# led[2]:
# id: 3
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 4e28f76..61a27f2 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -14,10 +14,10 @@
// {"type":"rack","id":"rack18","top":449,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
// {"type":"rack","id":"rack17","top":430,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
// {"type":"rack","id":"rack16","top":396,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- {"type":"rack","id":"rack11","top":287,"left":400,"width":1100,"height":18,"minBayNo":2,"maxBayNo":24},
+ // {"type":"rack","id":"rack11","top":287,"left":400,"width":1100,"height":18,"minBayNo":2,"maxBayNo":24},
// {"type":"rack","id":"rack14","top":357,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- {"type":"rack","id":"rack13","top":341,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":24},
- {"type":"rack","id":"rack12","top":302,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":24},
+ {"type":"rack","id":"rack13","top":341,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":30},
+ {"type":"rack","id":"rack12","top":302,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":30},
// {"type":"rack","id":"rack7","top":193,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
// {"type":"rack","id":"rack10","top":268,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
// {"type":"rack","id":"rack9","top":249,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
@@ -100,15 +100,15 @@
// {"type":"stn","id":"site-1038","text":"1038","top":418,"left":501,"width":67,"height":45},
// {"type":"stn","id":"site-1036","text":"1036","top":397,"left":571,"width":67,"height":17},
// {"type":"stn","id":"site-1035","text":"1035","top":398,"left":501,"width":67,"height":17},
- {"type":"stn","id":"site-304","text":"304","top":344,"left":1500,"width":67,"height":17},
- {"type":"stn","id":"site-305","text":"305","top":344,"left":1570,"width":67,"height":17},
- {"type":"stn","id":"site-306","text":"306","top":344,"left":1640,"width":67,"height":17},
+ // {"type":"stn","id":"site-304","text":"304","top":344,"left":1500,"width":67,"height":17},
+ // {"type":"stn","id":"site-305","text":"305","top":344,"left":1570,"width":67,"height":17},
+ // {"type":"stn","id":"site-306","text":"306","top":344,"left":1640,"width":67,"height":17},
// {"type":"stn","id":"site-1029","text":"1029","top":308,"left":571,"width":67,"height":17},
- {"type":"stn","id":"site-301","text":"301","top":306,"left":1500,"width":67,"height":17},
+ {"type":"stn","id":"site-401","text":"401","top":287,"left":1433,"width":67,"height":17},
// {"type":"stn","id":"site-1026","text":"1026","top":250,"left":571,"width":67,"height":17},
- {"type":"stn","id":"site-302","text":"302","top":306,"left":1570,"width":67,"height":17},
- {"type":"stn","id":"site-303","text":"303","top":306,"left":1640,"width":67,"height":17},
- {"type":"stn","id":"site-307","text":"307","top":370,"left":1200,"width":67,"height":17},
+ {"type":"stn","id":"site-402","text":"402","top":287,"left":400,"width":67,"height":17},
+ // {"type":"stn","id":"site-303","text":"303","top":306,"left":1640,"width":67,"height":17},
+ // {"type":"stn","id":"site-307","text":"307","top":370,"left":1200,"width":67,"height":17},
// {"type":"stn","id":"site-106","text":"106","top":252,"left":571,"width":67,"height":17},
// {"type":"stn","id":"site-105","text":"105","top":243,"left":501,"width":67,"height":25},
// {"type":"stn","id":"site-1020","text":"1020","top":177,"left":571,"width":67,"height":17},
--
Gitblit v1.9.1