From 8af52b048a4ddaadb07346b4bcc08f671fcc05ea Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 九月 2023 10:03:03 +0800
Subject: [PATCH] #基础地图更新
---
src/main/resources/application.yml | 523 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 376 insertions(+), 147 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5f25600..f6ec637 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,23 +8,25 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://47.97.1.152:51433;databasename=ynasrs
- url: jdbc:sqlserver://10.10.10.201:1433;databasename=ynasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
mvc:
static-path-pattern: /**
redis:
- host: localhost
+ host: 127.0.0.1
port: 6379
database: 0
-# password: xltys1995
+# password: 123456
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
logging:
path: /stock/out/@pom.build.finalName@/logs
@@ -36,7 +38,14 @@
enable: false
wms:
- url: 10.10.10.201:8080/ynwms
+ url: localhost:8081/xzjlwms
+
+erp:
+ db:
+ driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ ur: jdbc:sqlserver://10.10.10.209:1433;databasename=POY_ASRS
+ username: poy-asrs
+ password: Poy@2022
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -44,184 +53,404 @@
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
doubleLocs: 32
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 2
- # 绌挎杞﹂�氶亾搴撲綅
- channel: '0200201'
- # 鍫嗗灈鏈�1
- crn[0]:
- id: 1
- ip: 10.10.10.10
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.20
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 111
- row: 17
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 18
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.30
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 119
- row: 32
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 117
- row: 30
- bay: 1
- lev: 1
- # 绌挎杞�1
- ste[0]:
- id: 1
- ip: 10.10.10.60
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�2
- ste[1]:
- id: 2
- ip: 10.10.10.61
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�3
- ste[2]:
- id: 3
- ip: 10.10.10.62
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�3
- ste[3]:
- id: 4
- ip: 10.10.10.63
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�3
- ste[4]:
- id: 5
- ip: 10.10.10.64
- port: 502
- rack: 0
- slot: 0
+
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 102
+ staNo: 101
+ backSta: 101
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�1
+ # 鍏ュ簱鍙�2
inSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[3].id}
+ staNo: 102
+ backSta: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 104
+ backSta: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�4
+ inSta[3]:
+ staNo: 201
+ backSta: 201
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�5
+ inSta[4]:
+ staNo: 202
+ backSta: 202
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�6
+ inSta[5]:
+ staNo: 204
+ backSta: 204
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].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
+ backSta: 345
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 102
+ staNo: 101
+ backSta: 101
barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�1
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
+ staNo: 102
+ backSta: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 104
+ backSta: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�4
+ emptyInSta[3]:
+ staNo: 201
+ backSta: 201
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�5
+ emptyInSta[4]:
+ staNo: 202
+ backSta: 202
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�6
+ emptyInSta[5]:
+ staNo: 204
+ backSta: 204
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].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
+ backSta: 345
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
+ staNo: 101
+ led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 101
+ staNo: 102
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 104
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 201
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�5
+ outSta[4]:
+ staNo: 202
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�6
+ outSta[5]:
+ staNo: 204
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�7
+ outSta[6]:
+ staNo: 301
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�8
+ outSta[7]:
+ staNo: 345
+ led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍑哄簱鍙�
pickInSta[0]:
- staNo: 102
+ staNo: 100
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
+ backSta: 101
led: ${wcs-slave.led[0].id}
+# # 璐ф灦鍏ュ簱绔欑偣
+# rackInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 105
+# row: 4
+# bay: 6
+# lev: 1
+# # 璐ф灦鍏ュ簱绔欑偣
+# rackInStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 106
+# row: 4
+# bay: 6
+# lev: 3
+# # 璐ф灦鍏ュ簱绔欑偣
+# rackInStn[2]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 107
+# row: 4
+# bay: 6
+# lev: 6
+# # 璐ф灦鍏ュ簱绔欑偣
+# rackInStn[3]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 108
+# row: 4
+# bay: 6
+# lev: 6
+# # 璐ф灦鍑哄簱绔欑偣
+# rackOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 100
+# row: 15
+# bay: 2
+# lev: 1
+# # 璐ф灦鍑哄簱绔欑偣
+# rackOutStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 104
+# row: 4
+# bay: 6
+# lev: 1
+# # 璐ф灦鍑哄簱绔欑偣
+# rackOutStn[2]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 105
+# row: 4
+# bay: 6
+# lev: 3
+# # 璐ф灦鍑哄簱绔欑偣
+# rackOutStn[3]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 108
+# row: 4
+# bay: 6
+# lev: 6
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 10.10.10.51
+ ip: 10.10.10.102
port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[1]:
- id: 2
- ip: 10.10.10.54
- port: 51236
+
# LED1
led[0]:
id: 1
- ip: 10.10.10.205
+ ip: 10.10.10.241
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 102
- # LED1
+ # LED2
led[1]:
id: 2
- ip: 10.10.10.207
+ ip: 10.10.10.242
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
- # LED1
- led[2]:
+ staArr: 201
+
+ # 鍥涘悜绌挎杞�1
+ shuttle[0]:
+ id: 1
+ ip: 192.168.0.101
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�2
+ shuttle[1]:
+ id: 2
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�3
+ shuttle[2]:
id: 3
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
- # LED1
- led[3]:
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�4
+ shuttle[3]:
id: 4
- ip: 10.10.10.208
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 200
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�5
+ shuttle[4]:
+ id: 5
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�6
+ shuttle[5]:
+ id: 6
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�7
+ shuttle[6]:
+ id: 7
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�8
+ shuttle[7]:
+ id: 8
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�9
+ shuttle[8]:
+ id: 9
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鍥涘悜绌挎杞�10
+ shuttle[9]:
+ id: 10
+ ip: 10.10.10.221
+ port: 8888
+ rack: 0
+ slot: 0
+ # 鎻愬崌鏈�1
+ lift[0]:
+ id: 1
+ ip: 192.168.4.250
+ port: 502
+ row: 18
+ bay: 2
+ sta[0]:
+ staNo: 101
+ lev: 1
+ sta[1]:
+ staNo: 102
+ lev: 2
+ sta[2]:
+ staNo: 103
+ lev: 3
+ sta[3]:
+ staNo: 104
+ lev: 4
+ sta[4]:
+ staNo: 105
+ lev: 5
+ sta[5]:
+ staNo: 106
+ lev: 6
+ sta[6]:
+ staNo: 107
+ lev: 7
+ sta[7]:
+ staNo: 108
+ lev: 8
+ sta[8]:
+ staNo: 109
+ lev: 9
+ sta[9]:
+ staNo: 110
+ lev: 10
+ # 鎻愬崌鏈�2
+ lift[1]:
+ id: 2
+ ip: 127.0.0.1
+ port: 502
+ row: 18
+ bay: 2
+ sta[0]:
+ staNo: 201
+ lev: 1
+ sta[1]:
+ staNo: 202
+ lev: 2
+ sta[2]:
+ staNo: 203
+ lev: 3
+ sta[3]:
+ staNo: 204
+ lev: 4
+ sta[4]:
+ staNo: 205
+ lev: 5
+ sta[5]:
+ staNo: 206
+ lev: 6
+ sta[6]:
+ staNo: 207
+ lev: 7
+ sta[7]:
+ staNo: 208
+ lev: 8
+ sta[8]:
+ staNo: 209
+ lev: 9
+ sta[9]:
+ staNo: 210
+ lev: 10
+ # 鎻愬崌鏈�3
+ lift[2]:
+ id: 3
+ ip: 127.0.0.1
+ port: 502
+ row: 18
+ bay: 2
+ sta[0]:
+ staNo: 301
+ lev: 1
+ sta[1]:
+ staNo: 302
+ lev: 2
+ sta[2]:
+ staNo: 303
+ lev: 3
+ sta[3]:
+ staNo: 304
+ lev: 4
+ sta[4]:
+ staNo: 305
+ lev: 5
+ sta[5]:
+ staNo: 306
+ lev: 6
+ sta[6]:
+ staNo: 307
+ lev: 7
+ sta[7]:
+ staNo: 308
+ lev: 8
+ sta[8]:
+ staNo: 309
+ lev: 9
+ sta[9]:
+ staNo: 310
+ lev: 10
\ No newline at end of file
--
Gitblit v1.9.1