From 66942458f7753fe4ddee7c5ed3386d61cff28b24 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 13:55:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/resources/application-prod.yml | 280 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 192 insertions(+), 88 deletions(-)
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index fec68b0..9af468b 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,106 +1,210 @@
wcs-slave:
+ doubleDeep: true #鍙屾繁
+ doubleLocs: 1,4,5,8 #鍙屾繁搴撲綅鎺掑彿 1,4,5,8
+ groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
crn[0]: #鍫嗗灈鏈�1
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 210
- row: 1
- bay: 41
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
- staNo: 209
- row: 2
- bay: 41
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 105
- row: 1
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- ip: 10.10.10.3
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 106
- row: 2
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
id: 1
+ ip: 10.10.10.110
slot: 0
demo: false
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 125
+ row: 3
+ bay: 1
+ lev: 2
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 100
+ row: 2
+ bay: 1
+ lev: 2
+ backSta: 102
+ devpPlcId: ${wcs-slave.devp[0].id}
crn[1]: #鍫嗗灈鏈�2
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 206
- row: 3
- bay: 41
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
- staNo: 205
- row: 4
- bay: 41
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 109
- row: 3
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- ip: 10.10.10.10
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 110
- row: 4
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
id: 2
+ ip: 10.10.10.120
slot: 0
demo: false
- doubleLocs: #鍙屾繁搴撲綅鎺掑彿 1,4,5,8,9,12,13,16
- barcode[1]:
- port: 51236
- ip: 10.10.10.52
- id: 2
- groupCount: 2 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- devp[0]: #杈撻�佺嚎
- emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
- staNo: 201
rack: 0
- emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
- staNo: 101
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
- inSta[0]: #鍏ュ簱鍙�1
- scale: ${wcs-slave.scale[0].id}
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- ip: 10.10.10.30
- inSta[1]: #鍏ュ簱鍙�2
- scale: ${wcs-slave.scale[1].id}
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 115
+ row: 7
+ bay: 1
+ lev: 2
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 120
+ row: 6
+ bay: 1
+ lev: 2
+ backSta: 106
+ devpPlcId: ${wcs-slave.devp[0].id}
+ devp[0]: #杈撻�佺嚎
id: 1
+ ip: 10.10.10.130
+ rack: 0
+ port: 102
slot: 0
+ emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
+ staNo: 116
+ inSta[0]: #鍏ュ簱鍙�1
+ staNo: 116
+ backSta: 110
+ barcode: ${wcs-slave.barcode[0].id}
outSta[0]: #鍑哄簱鍙�1
- staNo: 103
+ staNo: 105
outSta[1]: #鍑哄簱鍙�2
- staNo: 203
- scale[0]: #纾呯Г
- port: 5005
- ip: 10.10.10.201
- id: 1
- scale[1]: #纾呯Г
- port: 5005
- ip: 10.10.10.202
- id: 2
+ staNo: 107
+ outSta[2]: #鍑哄簱鍙�2
+ staNo: 109
+ outSta[3]: #鍑哄簱鍙�1
+ staNo: 110
barcode[0]: #鏉＄爜鎵弿浠�
port: 51236
- ip: 10.10.10.52
+ ip: 172.17.91.39
id: 1
- doubleDeep: false #鍙屾繁
+# crn[0]: #鍫嗗灈鏈�1
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 101
+# row: 2
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# ip: 192.168.1.100
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 100
+# row: 1
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# id: 1
+# slot: 0
+# demo: false
+# crn[1]: #鍫嗗灈鏈�2
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 103
+# row: 5
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# ip: 192.168.1.110
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 102
+# row: 4
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# id: 2
+# slot: 0
+# demo: false
+# barcode[3]: #鏉＄爜鎵弿浠�4
+# port: 51236
+# ip: 10.10.10.52
+# id: 4
+# barcode[2]: #鏉＄爜鎵弿浠�3
+# port: 51236
+# ip: 10.10.10.52
+# id: 3
+#
+# barcode[1]: #鏉＄爜鎵弿浠�2
+# port: 51236
+# ip: 10.10.10.52
+# id: 2
+#
+# devp[0]: #杈撻�佺嚎
+# emptyInSta[2]: #绌烘澘鍏ュ簱鍙�3
+# staNo: 104
+# emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
+# staNo: 102
+# rack: 0
+# emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+# staNo: 100
+# ip: 192.168.1.140
+# outSta[4]: #鍑哄簱鍙�5
+# staNo: 104
+# outSta[3]: #鍑哄簱鍙�4
+# staNo: 103
+# outSta[6]: #鍑哄簱鍙�7
+# staNo: 106
+# slot: 0
+# outSta[5]: #鍑哄簱鍙�6
+# staNo: 105
+# outSta[0]: #鍑哄簱鍙�1
+# staNo: 100
+# outSta[2]: #鍑哄簱鍙�3
+# staNo: 102
+# emptyInSta[3]: #绌烘澘鍏ュ簱鍙�4
+# staNo: 106
+# outSta[1]: #鍑哄簱鍙�2
+# staNo: 101
+# inSta[2]:
+# staNo: 104
+# barcode: ${wcs-slave.barcode[2].id}
+# inSta[3]:
+# staNo: 106
+# barcode: ${wcs-slave.barcode[3].id}
+# port: 102
+# outSta[7]: #鍑哄簱鍙�8
+# staNo: 107
+# inSta[0]: #鍏ュ簱鍙�1
+# staNo: 100
+# barcode: ${wcs-slave.barcode[0].id}
+# inSta[1]: #鍏ュ簱鍙�2
+# staNo: 102
+# barcode: ${wcs-slave.barcode[1].id}
+# id: 1
+#
+#
+# crn[2]: #鍫嗗灈鏈�3
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 105
+# row: 9
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# ip: 192.168.1.120
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 104
+# row: 8
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# id: 3
+# slot: 0
+# demo: false
+# crn[3]: #鍫嗗灈鏈�4
+# rack: 0
+# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# port: 102
+# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+# staNo: 107
+# row: 12
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# ip: 192.168.1.130
+# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+# staNo: 106
+# row: 11
+# bay: 1
+# lev: 1
+# devpPlcId: ${wcs-slave.devp[0].id}
+# id: 4
+# slot: 0
+# demo: false
+
+
--
Gitblit v1.9.1