From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1
---
src/main/resources/application.yml | 312 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 214 insertions(+), 98 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bf6ac68..1acdcc3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 9091
servlet:
context-path: /@pom.build.finalName@
@@ -8,8 +8,10 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=htasrs
+ url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
username: sa
+ # password: Zoneyung@zy56$
password: sa@123
mvc:
static-path-pattern: /**
@@ -33,188 +35,302 @@
swagger:
enable: false
+wms:
+ url: 10.10.10.100:8080/bfwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
+ ip: 10.10.10.10
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 205
- row: 2
- bay: 65
+ staNo: 107
+ row: 4
+ bay: 4
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
- row: 2
- bay: 0
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 112
+ row: 3
+ bay: 2
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 3
- bay: 65
+ staNo: 108
+ row: 4
+ bay: 5
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 112
row: 3
- bay: 0
+ bay: 2
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.10.20
+ ip: 10.10.10.20
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 6
- bay: 65
+ staNo: 111
+ row: 11
+ bay: 5
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 124
- row: 6
- bay: 0
+ staNo: 211
+ row: 12
+ bay: 5
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
- row: 7
- bay: 65
+ staNo: 104
+ row: 11
+ bay: 4
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 7
- bay: 0
+ staNo: 204
+ row: 12
+ bay: 4
lev: 1
- # 杈撻�佺嚎
- devp[0]:
- id: 1
- ip: 192.168.10.100
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.10.10.30
port: 102
rack: 0
- slot: 1
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 207
+ row: 18
+ bay: 4
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 212
+ row: 19
+ bay: 6
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 208
+ row: 18
+ bay: 5
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 212
+ row: 19
+ bay: 6
+ lev: 1
+ # 绌挎杞�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
+ port: 502
+ rack: 0
+ slot: 0
+ # 杈撻�佺嚎1
+ devp[0]:
+ id: 1
+ ip: 10.10.10.61
+ port: 102
+ rack: 0
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 301
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
-# # 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 202
-# barcode: ${wcs-slave.barcode[1].id}
+ backSta: 100
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�1
inSta[1]:
- staNo: 110
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 301
- # 绌烘澘鍏ュ簱鍙�2
-# emptyInSta[1]:
-# staNo: 202
- # 绌烘澘鍏ュ簱鍙�3
+ staNo: 103
+ barcode: ${wcs-slave.barcode[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 126
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 200
+ staNo: 100
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 203
- # 鍑哄簱鍙�3
- outSta[2]:
+ staNo: 200
+ # 鎷ｆ枡鍑哄簱鍙�
+ pickOutSta[0]:
+ staNo: 300
+ # 鎷ｆ枡鍑哄簱鍙�
+ pickInSta[0]:
staNo: 103
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 127
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[1]:
- staNo: 128
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍑哄簱鍙�
+ pickInSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[2].id}
+ # 杈撻�佺嚎2
+ devp[1]:
+ id: 2
+ ip: 10.10.10.160
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 113
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 114
+ led: ${wcs-slave.led[3].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 113
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[3].id}
+
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 114
+ led: ${wcs-slave.led[3].id}
+
+ # 杈撻�佺嚎3
+ devp[2]:
+ id: 3
+ ip: 10.10.10.170
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 213
+ barcode: ${wcs-slave.barcode[3].id}
+ backSta: 214
+ led: ${wcs-slave.led[4].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 213
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[4].id}
+
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 214
+ led: ${wcs-slave.led[4].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.10.130
+ ip: 10.10.10.52
port: 51236
-# # 鏉＄爜鎵弿浠�
-# barcode[1]:
-# id: 2
-# ip: 192.168.10.131
-# port: 51236
- # LED1
+ # 鏉＄爜鎵弿浠�
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.53
+ port: 51236
+ # LED1
+ # 鏉＄爜鎵弿浠�
+ barcode[2]:
+ id: 3
+ ip: 10.10.11.53
+ port: 51236
+ # LED1
+ # 鏉＄爜鎵弿浠�
+ barcode[3]:
+ id: 4
+ ip: 10.10.12.53
+ port: 51236
+ # LED1
led[0]:
id: 1
- ip: 192.168.10.211
+ ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 113
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 192.168.10.221
+ ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109
+ staArr: 300
# LED3
led[2]:
id: 3
- ip: 192.168.10.231
+ ip: 10.10.10.207
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
+ staArr: 200
# LED4
led[3]:
id: 4
- ip: 192.168.10.231
+ ip: 10.10.10.208
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 129
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.10.135
- port: 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 114
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.209
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staArr: 214
--
Gitblit v1.9.1