From ce641926a957d238b202aa0d9dac3b8f15aff153 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 14 五月 2025 14:43:00 +0800
Subject: [PATCH] 123
---
src/main/resources/application.yml | 258 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 177 insertions(+), 81 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4f537d9..739a37e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.oscar.Driver
- url: jdbc:oscar://aezj52528314.vicp.fun:13560/osrdb?CURRENTSCHEMA=BJYCWMS
-# url: jdbc:oscar://localhost:2003/osrdb?CURRENTSCHEMA=BJYCWMS
+ # url: jdbc:oscar://aezj52528314.vicp.fun:13560/osrdb?CURRENTSCHEMA=BJYCWMS
+ url: jdbc:oscar://10.10.10.200:2003/osrdb?CURRENTSCHEMA=BJYCWMS
username: SYSDBA
password: szoscar55
mvc:
@@ -35,7 +35,7 @@
enable: false
wms:
- url: 127.0.0.1:8080/bjycwms
+ url: 10.10.10.200:8088/bjycwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -62,11 +62,53 @@
row: 4
bay: 2
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 3
+ bay: 7
+ lev: 10
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 212
+ row: 3
+ bay: 2
+ lev: 10
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�4
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 104
+ row: 1
+ bay: 2
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 103
row: 4
+ bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 3
+ bay: 7
+ lev: 10
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 212
+ row: 3
+ bay: 2
+ lev: 10
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�4
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 104
+ row: 1
bay: 2
lev: 1
# 杈撻�佺嚎1
@@ -81,79 +123,133 @@
staNo: 102
barcode: ${wcs-slave.barcode[0].id}
backSta: 101
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 210
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 102
barcode: ${wcs-slave.barcode[0].id}
backSta: 101
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 210
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�4
+ emptyInSta[3]:
+ staNo: 104
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 102
barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ backSta: 101
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
led: ${wcs-slave.led[1].id}
+ backSta: 200
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ backSta: 210
+ # 鎷ｆ枡鍏ュ簱鍙�4
+ pickSta[3]:
+ staNo: 104
# 鍑哄簱鍙�1
outSta[0]:
staNo: 101
led: ${wcs-slave.led[0].id}
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.130
- 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
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 200
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 210
led: ${wcs-slave.led[2].id}
-
- # 杈撻�佺嚎3
- devp[2]:
- id: 3
- ip: 10.10.10.130
- 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}
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 104
+ # 杈撻�佺嚎2
+# devp[1]:
+# id: 2
+# ip: 10.10.10.130
+# 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: 10.10.10.130
+# 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]:
@@ -183,7 +279,7 @@
ip: 10.10.10.248
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 108
+ staArr: 101
# LED3
led[2]:
id: 3
@@ -191,24 +287,24 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 117
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.246
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 126
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.245
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 134
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.244
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 201
\ No newline at end of file
+# # LED4
+# led[3]:
+# id: 4
+# ip: 10.10.10.246
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 126
+# # LED5
+# led[4]:
+# id: 5
+# ip: 10.10.10.245
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 134
+# # LED6
+# led[5]:
+# id: 6
+# ip: 10.10.10.244
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 201
\ No newline at end of file
--
Gitblit v1.9.1