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 | 523 ++++++++++++++++++++++++----------------------------------
1 files changed, 216 insertions(+), 307 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e76ffa8..739a37e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,10 +7,11 @@
application:
name: @pom.build.finalName@
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=lfdasrs
- username: sa
- password: sa@123
+ driver-class-name: com.oscar.Driver
+ # 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:
static-path-pattern: /**
redis:
@@ -25,7 +26,7 @@
# field-strategy: 0
logging:
- path: /stock/out/@pom.build.finalName@/logs
+ path: stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -34,368 +35,276 @@
enable: false
wms:
- url: localhost:8080/lfdwms
+ url: 10.10.10.200:8088/bjycwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 9,12,15,18
+ doubleLocs: 1,4
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.1
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 106
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.2
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 4
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 121
- row: 5
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 122
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 129
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 130
- row: 8
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 208
- row: 13
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 209
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�7
- crn[6]:
- id: 7
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 214
- row: 16
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 215
- row: 17
- bay: 1
- lev: 1
- # 杈撻�佺嚎1
- devp[0]:
- id: 1
- ip: 10.10.10.100
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 109
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 108
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 117
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 116
- led: ${wcs-slave.led[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 101
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 100
- led: ${wcs-slave.led[2].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 109
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 117
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[2]:
- staNo: 101
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 126
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 134
- # 鍑哄簱鍙�2
- outSta[2]:
- staNo: 100
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 126
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 134
-# barcode: ${wcs-slave.barcode[0].id}
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
ip: 10.10.10.110
port: 102
rack: 0
slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ 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
+ devp[0]:
+ id: 1
+ ip: 10.10.10.130
+ port: 102
+ rack: 0
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- backSta: 200
- led: ${wcs-slave.led[3].id}
+ staNo: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 101
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 206
- led: ${wcs-slave.led[4].id}
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�3
inSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- backSta: 212
- led: ${wcs-slave.led[5].id}
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 210
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[3].id}
+ staNo: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 101
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[4].id}
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- led: ${wcs-slave.led[5].id}
+ 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: 205
+ staNo: 101
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 211
+ staNo: 200
+ led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�3
outSta[2]:
- staNo: 217
+ staNo: 210
+ led: ${wcs-slave.led[2].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: 011
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
+# 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]:
id: 1
- ip: 10.10.10.121
+ ip: 10.10.10.132
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 10.10.10.134
port: 51236
# 鏉＄爜鎵弿浠�3
barcode[2]:
id: 3
- ip: 10.10.10.123
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.124
- port: 51236
- # 鏉＄爜鎵弿浠�5
- barcode[4]:
- id: 5
- ip: 10.10.10.125
- port: 51236
- # 鏉＄爜鎵弿浠�6
- barcode[5]:
- id: 6
- ip: 10.10.10.126
+ ip: 10.10.10.135
port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.249
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 015
+ staArr: 101
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.248
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 101
# LED3
led[2]:
id: 3
- ip: 10.10.10.202
+ ip: 10.10.10.247
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
\ No newline at end of file
+ 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
--
Gitblit v1.9.1