From 7ba042f4fb701de6916594962116a49b05491178 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 十二月 2023 22:05:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/resources/application.yml | 262 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 208 insertions(+), 54 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1b42313..55eee52 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=jkxcasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
username: sa
password: sa@123
mvc:
@@ -28,25 +28,63 @@
path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: xltys1995
+ pwd: asrs2023
swagger:
enable: false
wms:
- url: localhost:8080/jkxcwms
+ url: localhost:8081/mdqdwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: false
+ doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 2
+ groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
+ ip: 10.10.10.100
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯1
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1003
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1022
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1006
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1016
+ row: 3
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
ip: 10.10.10.110
port: 102
rack: 0
@@ -57,80 +95,168 @@
# 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 1
+ staNo: 1013
+ row: 7
bay: 1
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1025
+ row: 6
+ bay: 1
+ lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- row: 1
- bay: 1
- lev: 1
- # 绌烘墭鍏ュ簱绔欑偣
- emptyCrnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- row: 1
- bay: 1
- lev: 1
- # 绌烘墭鍑哄簱绔欑偣
- emptyCrnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 1
+ staNo: 1010
+ row: 6
bay: 1
lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1019
+ row: 6
+ bay: 1
+ lev: 3
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.1
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 102
+ staNo: 1002
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
+ backSta: 1001
led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 1012
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1011
+ led: ${wcs-slave.led[3].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 3007
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 3007
+ led: ${wcs-slave.led[4].id}
+ # 鍏ュ簱鍙�4
+ inSta[3]:
+ staNo: 3012
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 3012
+ led: ${wcs-slave.led[5].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 102
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 101
+ staNo: 1002
+ emptyInSta[1]:
+ staNo: 1012
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 102
+ staNo: 1003
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
+ backSta: 1001
led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 1013
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1011
+ led: ${wcs-slave.led[3].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 3007
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 3007
+ led: ${wcs-slave.led[4].id}
+ # 鎷ｆ枡鍏ュ簱鍙�4
+ pickSta[3]:
+ staNo: 3012
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 3012
+ led: ${wcs-slave.led[5].id}
+ # 鎷嗙洏鏈哄嚭绌烘墭
+ autoEmptyOut[0]:
+ staNo: 1007
+ # 鎷嗙洏鏈哄叆绌烘墭
+ autoEmptyIn[0]:
+ staNo: 1007
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.51
- port: 102
- rack: 0
- slot: 0
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 307
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 408
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 305
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 400
+ # RGV1
+# rgv[0]:
+# id: 1
+# ip: 10.10.10.120
+# port: 102
+# rack: 0
+# slot: 0
+# inStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2401
+# inStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2114
+# outStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 1014
+# outStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 1017
+# # RGV2
+# rgv[1]:
+# id: 2
+# ip: 10.10.10.121
+# port: 102
+# rack: 0
+# slot: 0
+# inStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 3001
+# outStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2402
+# # RGV1
+# rgv[2]:
+# id: 3
+# ip: 10.10.10.122
+# port: 102
+# rack: 0
+# slot: 0
+# inStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2102
+# inStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 4007
+# inStn[2]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 4016
+# outStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2003
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
+ ip: 10.10.10.5
+ port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.6
+ port: 51236
+ # 鏉＄爜鎵弿浠�3
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.3
+ port: 51236
+ # 鏉＄爜鎵弿浠�4
+ barcode[3]:
+ id: 4
ip: 10.10.10.3
port: 51236
@@ -140,11 +266,39 @@
ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 1003
# LED2
led[1]:
id: 2
ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
\ No newline at end of file
+ staArr: 1006
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1010
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1013
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 3007
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 3012
\ No newline at end of file
--
Gitblit v1.9.1