From 2e5837667e60378a06c7d8d1a4b095c4ba6e2d06 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 17 十一月 2025 09:29:08 +0800
Subject: [PATCH] 限制优化
---
src/main/resources/application.yml | 276 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 200 insertions(+), 76 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eb77c87..68908e8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,13 +6,12 @@
spring:
application:
name: @pom.build.finalName@
+ jmx:
+ enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
- # username: sa
- # password: Zoneyung@zy56$
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=klsasrs2
-# url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://192.168.2.203:1433;databasename=mdqzasrs
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqzasrs
username: sa
password: sa@123
mvc:
@@ -38,157 +37,282 @@
enable: false
wms:
- url: localhost:8080/klswms
-
-#鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃緭閫佹湁鍏ュ簱浠诲姟锛屽彨鍥炲師鐐�
-crnBackHp:
- enable: false
+ url: 192.168.2.203:8080/mdqzwms
+# url: 127.0.0.1:8080/mdqzwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12
+ doubleLocs: 1,4
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
+
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
+ ip: 192.168.2.30
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 3
- bay: 1
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 1096
+ row: 4
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 2
- bay: 1
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 1093
+ row: 3
+ bay: 0
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.13
- port: 8888
+ ip: 192.168.2.11
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
- row: 7
- bay: 1
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 1104
+ row: 6
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
- row: 6
- bay: 1
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 1099
+ row: 5
+ bay: 0
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.16
- port: 8888
+ ip: 192.168.2.21
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 133
- row: 11
- bay: 1
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 1102
+ row: 7
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 10
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 1107
+ row: 8
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ ip: 192.168.2.31
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1050
row: 11
- bay: 1
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1049
+ row: 12
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1056
+ row: 9
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1057
+ row: 10
+ bay: 0
lev: 1
- # 杈撻�佺嚎
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.2.60
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 104
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 104
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 1012
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 1018
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ # 鍏ュ簱鍙�4
+ inSta[3]:
+ staNo: 1041
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 110
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 117
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 124
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 131
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 136
- barcode: ${wcs-slave.barcode[0].id}
- # 鏉＄爜鎵弿浠�
+ staNo: 1024
+ led: ${wcs-slave.led[5].id}
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 1040
+ led: ${wcs-slave.led[4].id}
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 1043
+ led: ${wcs-slave.led[3].id}
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 1016
+ led: ${wcs-slave.led[2].id}
+ # 杈撻�佺嚎2
+ devp[1]:
+ id: 2
+ ip: 192.168.2.80
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�4
+ inSta[0]:
+ staNo: 1090
+ led: ${wcs-slave.led[6].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 1090
+ led: ${wcs-slave.led[6].id}
+ # 杈撻�佺嚎3
+ devp[2]:
+ id: 3
+ ip: 192.168.2.100
+ port: 102
+ rack: 0
+ slot: 0
+ # 缃愯绾�1
+ devp[3]:
+ id: 4
+ ip: 192.168.1.10
+ port: 102
+ rack: 0
+ slot: 0
+ # 缃愯绾�2
+ devp[4]:
+ id: 5
+ ip: 192.168.1.30
+ port: 102
+ rack: 0
+ slot: 0
+ # 缃愯绾�3
+ devp[5]:
+ id: 6
+ ip: 192.168.1.50
+ port: 102
+ rack: 0
+ slot: 0
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 192.168.2.63
port: 51236
- # LED1
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 192.168.2.64
+ port: 51236
+ # 鏉＄爜鎵弿浠�3
+ barcode[2]:
+ id: 3
+ ip: 192.168.2.67
+ port: 51236
+ # 鏉＄爜鎵弿浠�4
+ barcode[3]:
+ id: 4
+ ip: 192.168.2.68
+ port: 51236
+
+ # LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 192.168.2.221
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
+ staArr: 1012
# LED2
led[1]:
id: 2
- ip: 10.10.10.61
+ ip: 192.168.2.222
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
+ staArr: 1006
# LED3
led[2]:
id: 3
- ip: 10.10.10.61
+ ip: 192.168.2.223
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 124
+ staArr: 1018,1016
# LED4
led[3]:
id: 4
- ip: 10.10.10.61
+ ip: 192.168.2.224
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 131
+ staArr: 1041,1043
# LED5
led[4]:
id: 5
- ip: 10.10.10.61
+ ip: 192.168.2.225
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
\ No newline at end of file
+ staArr: 1040
+ # LED6
+ led[5]:
+ id: 6
+ ip: 192.168.2.226
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1024
+ # LED7
+ led[6]:
+ id: 7
+ ip: 192.168.2.227
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 1090
\ No newline at end of file
--
Gitblit v1.9.1