From 59f6af2be4fba052b605689582a3e6a3c2d221fa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 24 二月 2023 15:45:04 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 191 +++++++++++++++++++----------------------------
1 files changed, 79 insertions(+), 112 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4e56e87..3c15ddc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,11 +8,10 @@
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://localhost:1433;databasename=ynasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=szfzasrs
username: sa
- password: Zoneyung@zy56$
- # password: sa@123
+# password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -36,7 +35,14 @@
enable: false
wms:
- url: localhost:8080/bfwms
+ url: localhost:8080/ynwms
+
+erp:
+ db:
+ driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ ur: jdbc:sqlserver://10.20.46.23:1433;databasename=POY_ASRS
+ username: poy-asrs
+ password: Poy@2022
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -47,11 +53,11 @@
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 2
# 绌挎杞﹂�氶亾搴撲綅
- channel: 0200101
+ channel: '0200201'
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
@@ -61,157 +67,118 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 4
- bay: 4
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 4
- bay: 5
- 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: 11
- bay: 5
+ staNo: 100
+ row: 5
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 211
- row: 12
- bay: 5
- lev: 1
+ staNo: 200
+ row: 5
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 300
+ row: 5
+ bay: 1
+ lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 11
- bay: 4
+ staNo: 100
+ row: 5
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 204
- row: 12
- bay: 4
- 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: 207
- row: 18
- bay: 4
- lev: 1
+ staNo: 200
+ row: 5
+ bay: 1
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 208
- row: 18
- bay: 5
- lev: 1
+ staNo: 300
+ row: 5
+ bay: 1
+ lev: 3
# 绌挎杞�1
ste[0]:
id: 1
- ip: 10.10.10.40
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�2
- ste[1]:
- id: 2
- ip: 10.10.10.41
- port: 502
- rack: 0
- slot: 0
- # 绌挎杞�3
- ste[2]:
- id: 3
- ip: 10.10.10.42
+ ip: 192.168.4.250
port: 502
rack: 0
slot: 0
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.61
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 102
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�1
inSta[1]:
- staNo: 203
+ staNo: 201
barcode: ${wcs-slave.barcode[1].id}
backSta: 200
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�1
+ inSta[2]:
+ staNo: 301
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 300
led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 203
+ staNo: 201
barcode: ${wcs-slave.barcode[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 301
+ barcode: ${wcs-slave.barcode[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
+ staNo: 102
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 200
- # 鎷ｆ枡鍑哄簱鍙�
- pickOutSta[0]:
- staNo: 300
+ staNo: 202
+ # 鍑哄簱鍙�2
+ outSta[2]:
+ staNo: 302
# 鎷ｆ枡鍑哄簱鍙�
pickInSta[0]:
- staNo: 103
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 102
led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍑哄簱鍙�
- pickInSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[2].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.51
port: 51236
# 鏉＄爜鎵弿浠�
barcode[1]:
id: 2
- ip: 10.10.10.53
+ ip: 10.10.10.54
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.54
port: 51236
# LED1
led[0]:
@@ -219,18 +186,18 @@
ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 102
# LED1
led[1]:
id: 2
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 300
- # LED1
- led[2]:
- id: 3
ip: 10.10.10.207
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 200
+ staArr: 202
+ # LED1
+ led[2]:
+ id: 3
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 302
--
Gitblit v1.9.1