From d119f9b4915c1d5cf352ee6955a6972238e82836 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 30 八月 2024 10:02:45 +0800
Subject: [PATCH] 对照协议调整
---
src/main/resources/application.yml | 253 ++++++++++++++++++++------------------------------
1 files changed, 103 insertions(+), 150 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c072c38..06a53b8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.oscar.Driver
- url: jdbc:oscar://localhost:2003/osrdb?CURRENTSCHEMA=BJYCWMS
+ # url: jdbc:oscar://aezj52528314.vicp.fun:13560/osrdb?CURRENTSCHEMA=BJYCWMS
+ url: jdbc:oscar://10.10.10.200:2003/osrdb?CURRENTSCHEMA=BJYCWMS
username: SYSDBA
password: szoscar55
mvc:
@@ -25,7 +26,7 @@
# field-strategy: 0
logging:
- path: /stock/out/@pom.build.finalName@/logs
+ path: stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -34,20 +35,20 @@
enable: false
wms:
- url: 127.0.0.1:8080/lktwms
+ url: 127.0.0.1:8080/bjycwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,11,14,21,24
+ doubleLocs: 1,4
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
@@ -58,165 +59,117 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 103
- row: 2
- bay: 1
+ row: 4
+ bay: 2
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
- row: 12
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 204
- row: 13
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[2].id}
- staNo: 303
- row: 22
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[2].id}
- staNo: 304
- row: 23
- bay: 1
+ staNo: 103
+ row: 4
+ bay: 2
lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.130
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
- led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
- led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 106
+ backSta: 101
led: ${wcs-slave.led[0].id}
-
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 101
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ backSta: 101
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 101
+ led: ${wcs-slave.led[0].id}
# 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[3].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[3].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[3].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 206
- led: ${wcs-slave.led[2].id}
-
- # 杈撻�佺嚎3
- devp[2]:
- id: 3
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 300
- led: ${wcs-slave.led[5].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 200
- led: ${wcs-slave.led[5].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[5].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 306
- led: ${wcs-slave.led[4].id}
+# devp[1]:
+# id: 2
+# ip: 10.10.10.130
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍏ュ簱鍙�1
+# inSta[0]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 200
+# led: ${wcs-slave.led[3].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 200
+# led: ${wcs-slave.led[3].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[3].id}
+# # 鍑哄簱鍙�1
+# outSta[0]:
+# staNo: 206
+# led: ${wcs-slave.led[2].id}
+#
+# # 杈撻�佺嚎3
+# devp[2]:
+# id: 3
+# ip: 10.10.10.130
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍏ュ簱鍙�1
+# inSta[0]:
+# staNo: 301
+# barcode: ${wcs-slave.barcode[2].id}
+# backSta: 300
+# led: ${wcs-slave.led[5].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 301
+# barcode: ${wcs-slave.barcode[2].id}
+# backSta: 200
+# led: ${wcs-slave.led[5].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 301
+# barcode: ${wcs-slave.barcode[2].id}
+# led: ${wcs-slave.led[5].id}
+# # 鍑哄簱鍙�1
+# outSta[0]:
+# staNo: 306
+# led: ${wcs-slave.led[4].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.121
+ ip: 10.10.10.132
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 10.10.10.134
port: 51236
# 鏉＄爜鎵弿浠�3
barcode[2]:
id: 3
- ip: 10.10.10.123
+ ip: 10.10.10.135
port: 51236
# LED1
led[0]:
@@ -246,17 +199,17 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 126
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.245
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 134
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.244
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 201
\ No newline at end of file
+# # LED5
+# led[4]:
+# id: 5
+# ip: 10.10.10.245
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 134
+# # LED6
+# led[5]:
+# id: 6
+# ip: 10.10.10.244
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 201
\ No newline at end of file
--
Gitblit v1.9.1