From 31db311cbc564a85ed843913c32017c77705e148 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 十月 2023 10:43:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/skwcs' into tzskwcs
---
src/main/resources/application.yml | 260 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 187 insertions(+), 73 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 740808b..b45d4ac 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
+ url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
@@ -38,10 +38,10 @@
enable: false
wms:
- url: localhost:8081/xzjlwms
+ url: 10.10.10.40:8080/tzskwms
robot:
- url: http://127.0.0.1:9090/tzskwcs
+ url: http://10.10.10.41:7002
erp:
db:
@@ -60,144 +60,183 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.10.10.51
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 100
backSta: 101
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 102
+ staNo: 103
backSta: 102
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[1].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[1].id}
# 鍏ュ簱鍙�3
inSta[2]:
- staNo: 104
+ staNo: 105
backSta: 104
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
# 鍏ュ簱鍙�4
inSta[3]:
- staNo: 201
+ staNo: 200
backSta: 201
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[3].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[0].id}
# 鍏ュ簱鍙�5
inSta[4]:
- staNo: 202
+ staNo: 203
backSta: 202
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[4].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[1].id}
# 鍏ュ簱鍙�6
inSta[5]:
- staNo: 204
+ staNo: 205
backSta: 204
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[5].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
# 鍏ュ簱鍙�7
inSta[6]:
- staNo: 340
- backSta: 340
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�8
- inSta[7]:
- staNo: 345
+ staNo: 346
backSta: 345
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[8].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 100
backSta: 101
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[0].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 102
+ staNo: 103
backSta: 102
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[1].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[1].id}
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
- staNo: 104
+ staNo: 105
backSta: 104
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
# 绌烘澘鍏ュ簱鍙�4
emptyInSta[3]:
- staNo: 201
+ staNo: 200
backSta: 201
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[3].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[0].id}
# 绌烘澘鍏ュ簱鍙�5
emptyInSta[4]:
- staNo: 202
+ staNo: 203
backSta: 202
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[4].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[1].id}
# 绌烘澘鍏ュ簱鍙�6
emptyInSta[5]:
- staNo: 204
+ staNo: 205
backSta: 204
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[5].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
# 绌烘澘鍏ュ簱鍙�7
emptyInSta[6]:
- staNo: 340
- backSta: 340
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�8
- emptyInSta[7]:
- staNo: 345
+ staNo: 346
backSta: 345
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[8].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 101
led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 102
+ staNo: 100
led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�3
outSta[2]:
- staNo: 104
+ staNo: 103
led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�4
outSta[3]:
- staNo: 201
+ staNo: 105
led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�5
outSta[4]:
- staNo: 202
+ staNo: 200
led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�6
outSta[5]:
- staNo: 204
+ staNo: 203
led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�7
outSta[6]:
- staNo: 301
+ staNo: 205
led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�8
outSta[7]:
- staNo: 345
+ staNo: 346
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍑哄簱鍙�
pickInSta[0]:
staNo: 100
- barcode: ${wcs-slave.barcode[0].id}
backSta: 101
+ barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[0].id}
+ pickInSta[1]:
+ staNo: 103
+ backSta: 102
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[1].id}
+ pickInSta[2]:
+ staNo: 105
+ backSta: 104
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
+ pickInSta[3]:
+ staNo: 200
+ backSta: 201
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[0].id}
+ pickInSta[4]:
+ staNo: 203
+ backSta: 202
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[1].id}
+ pickInSta[5]:
+ staNo: 205
+ backSta: 204
+ barcode: ${wcs-slave.barcode[5].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
+ pickInSta[6]:
+ staNo: 346
+ backSta: 345
+ barcode: ${wcs-slave.barcode[8].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
# # 璐ф灦鍏ュ簱绔欑偣
# rackInStn[0]:
# devpPlcId: ${wcs-slave.devp[0].id}
@@ -260,6 +299,51 @@
id: 1
ip: 10.10.10.102
port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.102
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.102
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.102
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[4]:
+ id: 5
+ ip: 10.10.10.102
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[5]:
+ id: 6
+ ip: 10.10.10.102
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[6]:
+ id: 7
+ ip: 10.10.10.102
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[7]:
+ id: 8
+ ip: 10.10.10.102
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[8]:
+ id: 9
+ ip: 10.10.10.102
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[9]:
+ id: 10
+ ip: 10.10.10.102
+ port: 51236
# LED1
led[0]:
@@ -279,181 +363,211 @@
# 鍥涘悜绌挎杞�1
shuttle[0]:
id: 1
- ip: 127.0.0.1
+ ip: 10.10.10.101
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�2
shuttle[1]:
id: 2
- ip: 192.168.4.15
+ ip: 10.10.10.102
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�3
shuttle[2]:
id: 3
- ip: 10.10.10.221
+ ip: 10.10.10.103
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�4
shuttle[3]:
id: 4
- ip: 10.10.10.221
+ ip: 10.10.10.104
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�5
shuttle[4]:
id: 5
- ip: 10.10.10.221
+ ip: 10.10.10.105
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�6
shuttle[5]:
id: 6
- ip: 10.10.10.221
+ ip: 10.10.10.106
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�7
shuttle[6]:
id: 7
- ip: 10.10.10.221
+ ip: 10.10.10.107
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�8
shuttle[7]:
id: 8
- ip: 10.10.10.221
+ ip: 10.10.10.108
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�9
shuttle[8]:
id: 9
- ip: 10.10.10.221
+ ip: 10.10.10.109
port: 8888
rack: 0
slot: 0
# 鍥涘悜绌挎杞�10
shuttle[9]:
id: 10
- ip: 10.10.10.221
+ ip: 10.10.10.110
port: 8888
rack: 0
slot: 0
# 鎻愬崌鏈�1
lift[0]:
id: 1
- ip: 192.168.4.250
- port: 502
- row: 18
- bay: 2
+ ip: 10.10.10.131
+ port: 102
+ staRow: 13
+ staBay: 22
sta[0]:
staNo: 101
lev: 1
+ liftNo: ${wcs-slave.lift[0].id}
sta[1]:
staNo: 102
lev: 2
+ liftNo: ${wcs-slave.lift[0].id}
sta[2]:
staNo: 103
lev: 3
+ liftNo: ${wcs-slave.lift[0].id}
sta[3]:
staNo: 104
lev: 4
+ liftNo: ${wcs-slave.lift[0].id}
sta[4]:
staNo: 105
lev: 5
+ liftNo: ${wcs-slave.lift[0].id}
sta[5]:
staNo: 106
lev: 6
+ liftNo: ${wcs-slave.lift[0].id}
sta[6]:
staNo: 107
lev: 7
+ liftNo: ${wcs-slave.lift[0].id}
sta[7]:
staNo: 108
lev: 8
+ liftNo: ${wcs-slave.lift[0].id}
sta[8]:
staNo: 109
lev: 9
+ liftNo: ${wcs-slave.lift[0].id}
sta[9]:
staNo: 110
lev: 10
+ liftNo: ${wcs-slave.lift[0].id}
# 鎻愬崌鏈�2
lift[1]:
id: 2
- ip: 127.0.0.1
- port: 502
- row: 18
- bay: 2
+ ip: 10.10.10.132
+ port: 102
+ staRow: 13
+ staBay: 38
sta[0]:
staNo: 201
lev: 1
+ liftNo: ${wcs-slave.lift[1].id}
sta[1]:
staNo: 202
lev: 2
+ liftNo: ${wcs-slave.lift[1].id}
sta[2]:
staNo: 203
lev: 3
+ liftNo: ${wcs-slave.lift[1].id}
sta[3]:
staNo: 204
lev: 4
+ liftNo: ${wcs-slave.lift[1].id}
sta[4]:
staNo: 205
lev: 5
+ liftNo: ${wcs-slave.lift[1].id}
sta[5]:
staNo: 206
lev: 6
+ liftNo: ${wcs-slave.lift[1].id}
sta[6]:
staNo: 207
lev: 7
+ liftNo: ${wcs-slave.lift[1].id}
sta[7]:
staNo: 208
lev: 8
+ liftNo: ${wcs-slave.lift[1].id}
sta[8]:
staNo: 209
lev: 9
+ liftNo: ${wcs-slave.lift[1].id}
sta[9]:
staNo: 210
lev: 10
+ liftNo: ${wcs-slave.lift[1].id}
# 鎻愬崌鏈�3
lift[2]:
id: 3
- ip: 127.0.0.1
- port: 502
- row: 18
- bay: 2
+ ip: 10.10.10.133
+ port: 102
+ staRow: 13
+ staBay: 57
sta[0]:
staNo: 301
lev: 1
+ liftNo: ${wcs-slave.lift[2].id}
sta[1]:
staNo: 302
lev: 2
+ liftNo: ${wcs-slave.lift[2].id}
sta[2]:
staNo: 303
lev: 3
+ liftNo: ${wcs-slave.lift[2].id}
sta[3]:
staNo: 304
lev: 4
+ liftNo: ${wcs-slave.lift[2].id}
sta[4]:
staNo: 305
lev: 5
+ liftNo: ${wcs-slave.lift[2].id}
sta[5]:
staNo: 306
lev: 6
+ liftNo: ${wcs-slave.lift[2].id}
sta[6]:
staNo: 307
lev: 7
+ liftNo: ${wcs-slave.lift[2].id}
sta[7]:
staNo: 308
lev: 8
+ liftNo: ${wcs-slave.lift[2].id}
sta[8]:
staNo: 309
lev: 9
+ liftNo: ${wcs-slave.lift[2].id}
sta[9]:
staNo: 310
- lev: 10
\ No newline at end of file
+ lev: 10
+ liftNo: ${wcs-slave.lift[2].id}
\ No newline at end of file
--
Gitblit v1.9.1