From 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 25 十月 2024 12:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs
---
src/main/resources/application.yml | 193 ++++++++++++++++++++++++++++++++---------------
1 files changed, 131 insertions(+), 62 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 239c8dc..ba30efc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,11 +8,7 @@
name: @pom.build.finalName@
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://localhost:1433;databasename=tzhtasrs
username: sa
password: sa@123
mvc:
@@ -38,157 +34,230 @@
enable: false
wms:
- url: localhost:8080/klswms
-
-#鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃緭閫佹湁鍏ュ簱浠诲姟锛屽彨鍥炲師鐐�
-crnBackHp:
- enable: false
+ url: 127.0.0.1:8080/htwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
+ ip: 10.10.10.110
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
+ staNo: 101
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
row: 3
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 101
row: 2
bay: 1
lev: 1
+
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.13
- port: 8888
+ ip: 10.10.10.120
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
+ staNo: 105
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 107
row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
+ staNo: 105
row: 6
bay: 1
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.16
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 133
- row: 11
+ staNo: 107
+ row: 7
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 10
- row: 11
- bay: 1
- lev: 1
-
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ # 鍏ュ簱鍙�4
+ inSta[3]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
+ staNo: 101
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
staNo: 103
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 105
+ # 绌烘澘鍏ュ簱鍙�4
+ emptyInSta[3]:
+ staNo: 107
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 110
+ staNo: 100
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 102
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 104
+ # 鍑哄簱鍙�3
+ outSta[3]:
+ staNo: 106
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 117
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 124
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 103
+ barcode: ${wcs-slave.barcode[1].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
- staNo: 131
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 105
+ barcode: ${wcs-slave.barcode[2].id}
# 鎷ｆ枡鍏ュ簱鍙�4
pickSta[3]:
- staNo: 136
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 107
+ barcode: ${wcs-slave.barcode[3].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.105
+ port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.106
+ port: 51236
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.107
+ port: 51236
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.108
port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.61
+ ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
+ staArr: 102
# LED3
led[2]:
id: 3
- ip: 10.10.10.61
+ ip: 10.10.10.203
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 124
+ staArr: 104
# LED4
led[3]:
id: 4
- ip: 10.10.10.61
+ ip: 10.10.10.204
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 131
- # LED5
+ staArr: 106
+ # LED1
led[4]:
id: 5
- ip: 10.10.10.61
+ ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
\ No newline at end of file
+ staArr: 101
+ # LED2
+ led[5]:
+ id: 6
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 103
+ # LED3
+ led[6]:
+ id: 7
+ ip: 10.10.10.203
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 105
+ # LED4
+ led[7]:
+ id: 8
+ ip: 10.10.10.204
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 107
--
Gitblit v1.9.1