From 62af9acaccedaea4c4c7efd4e68c8b702cf5a27d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 22 六月 2024 13:35:02 +0800
Subject: [PATCH] # 捷众二期开发
---
src/main/resources/application.yml | 325 +++++++++++++++++++++++++----------------------------
1 files changed, 153 insertions(+), 172 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5f86d6d..5f90ed6 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=sxjzasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=sxjzasrs
username: sa
password: sa@123
mvc:
@@ -34,69 +34,69 @@
enable: false
wms:
- url: 127.0.0.1:8080/sxjzwms
+ url: 127.0.0.1:8080/jzwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12
+ doubleLocs: 1
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
- # 鍫嗗灈鏈�1
- crn[0]:
- id: 1
- ip: 10.10.10.10
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.18
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 204
- row: 4
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
- row: 5
- bay: 2
- lev: 1
+ groupCount: 3
+# # 鍫嗗灈鏈�1
+# crn[0]:
+# id: 1
+# ip: 10.10.10.10
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 104
+# row: 3
+# bay: 39
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 100
+# row: 2
+# bay: 39
+# lev: 1
+# # 鍫嗗灈鏈�2
+# crn[1]:
+# id: 2
+# ip: 10.10.10.18
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 204
+# row: 5
+# bay: 39
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 200
+# row: 4
+# bay: 39
+# lev: 1
# 鍫嗗灈鏈�3
- crn[2]:
+ crn[0]:
id: 3
- ip: 10.10.10.110
- port: 102
+ ip: 10.10.10.30
+ port: 0
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -106,147 +106,128 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 304
- row: 4
- bay: 1
+ row: 7
+ bay: 0
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 300
- row: 5
- bay: 2
+ row: 6
+ bay: 0
lev: 1
- # 杈撻�佺嚎1
- devp[0]:
- id: 1
- ip: 10.10.10.100
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 104
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 1
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 204
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 1
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 104
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 1
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 1
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 204
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 104
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 101
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 201
- led: ${wcs-slave.led[1].id}
+# # 杈撻�佺嚎1
+# devp[0]:
+# id: 1
+# ip: 10.10.10.100
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍏ュ簱鍙�1
+# inSta[0]:
+# staNo: 104
+# barcode: ${wcs-slave.barcode[0].id}
+# backSta: 103
+# led: ${wcs-slave.led[0].id}
+# # 鍏ュ簱鍙�2
+# inSta[1]:
+# staNo: 204
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 203
+# led: ${wcs-slave.led[1].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 104
+# barcode: ${wcs-slave.barcode[0].id}
+# led: ${wcs-slave.led[0].id}
+# # 绌烘澘鍏ュ簱鍙�2
+# emptyInSta[1]:
+# staNo: 204
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 204
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# # 鎷ｆ枡鍏ュ簱鍙�2
+# pickSta[1]:
+# staNo: 104
+# barcode: ${wcs-slave.barcode[0].id}
+# led: ${wcs-slave.led[0].id}
+# # 鍑哄簱鍙�1
+# outSta[0]:
+# staNo: 101
+# led: ${wcs-slave.led[0].id}
+# # 鍑哄簱鍙�2
+# outSta[1]:
+# staNo: 201
+# led: ${wcs-slave.led[1].id}
# 杈撻�佺嚎2
- devp[1]:
+ devp[0]:
id: 2
- ip: 10.10.10.120
- port: 102
+ ip: 10.10.10.130
+ port: 0
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 104
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 1
- led: ${wcs-slave.led[2].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 204
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 1
- led: ${wcs-slave.led[2].id}
+ staNo: 304
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 303
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 104
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 1
- led: ${wcs-slave.led[2].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 101
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 1
- led: ${wcs-slave.led[2].id}
+ staNo: 304
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 204
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 104
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
+ staNo: 304
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 101
- led: ${wcs-slave.led[2].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 201
- led: ${wcs-slave.led[2].id}
+ staNo: 301
+ led: ${wcs-slave.led[0].id}
# 鏉＄爜鎵弿浠�1
- barcode[0]:
- id: 1
- ip: 10.10.10.102
- port: 51236
- # 鏉＄爜鎵弿浠�2
- barcode[1]:
- id: 2
- ip: 10.10.10.104
- port: 51236
+# barcode[0]:
+# id: 1
+# ip: 10.10.10.102
+# port: 51236
+# # 鏉＄爜鎵弿浠�2
+# barcode[1]:
+# id: 2
+# ip: 10.10.10.104
+# port: 51236
# 鏉＄爜鎵弿浠�3
- barcode[2]:
+ barcode[0]:
id: 3
- ip: 10.10.10.121
- port: 51236
# LED1
- led[0]:
- id: 1
- ip: 10.10.10.107
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 2
- # LED2
- led[1]:
- id: 2
- ip: 10.10.10.105
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 11
+# led[0]:
+# id: 1
+# ip: 10.10.10.107
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 101
+# # LED2
+# led[1]:
+# id: 2
+# ip: 10.10.10.105
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 201
# LED3
- led[2]:
+ led[0]:
id: 3
ip: 10.10.10.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 11
\ No newline at end of file
+ staArr: 301
+# # LED4
+# led[3]:
+# id: 4
+# ip: 10.10.10.105
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 304
\ No newline at end of file
--
Gitblit v1.9.1