From bfc97f036688f34e7c1451d68e3f6fc242f99929 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 12 五月 2023 16:07:46 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 270 +++++++----------------------------------------------
1 files changed, 39 insertions(+), 231 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 85b7913..78851a1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://localhost:1433;databasename=nbjfasrs
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=kdyasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
username: sa
password: sa@123
mvc:
@@ -35,152 +35,58 @@
enable: false
wms:
- url: localhost:8080/nbjfwms
+ url: localhost:8088/kdywms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1
+ # 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
- bay: 1
+ row: 1
+ bay: 25
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- row: 2
- bay: 55
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- row: 2
- bay: 55
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 2
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 200
- row: 2
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 302
- row: 2
- bay: 55
- lev: 7
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 300
- row: 2
- bay: 55
- lev: 7
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.111
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 7
- bay: 1
+ staNo: 105
+ row: 1
+ bay: 26
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 116
- row: 7
- bay: 55
+ staNo: 102
+ row: 1
+ bay: 25
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
- row: 7
- bay: 55
+ staNo: 105
+ row: 1
+ bay: 26
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 205
- row: 7
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
- bay: 55
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 305
- row: 7
- bay: 55
- lev: 7
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 303
- row: 7
- bay: 55
- lev: 7
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.1
port: 102
rack: 0
slot: 0
@@ -188,157 +94,59 @@
inSta[0]:
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 111
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
staNo: 104
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 114
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�5
- inSta[4]:
- staNo: 200
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�6
- inSta[5]:
- staNo: 203
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�7
- inSta[6]:
- staNo: 300
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�8
- inSta[7]:
- staNo: 303
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 101
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 111
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[2]:
staNo: 104
- # 绌烘澘鍏ュ簱鍙�4
- emptyInSta[3]:
- staNo: 114
- # 绌烘澘鍏ュ簱鍙�5
- emptyInSta[4]:
- staNo: 200
- # 绌烘澘鍏ュ簱鍙�6
- emptyInSta[5]:
- staNo: 203
- # 绌烘澘鍏ュ簱鍙�7
- emptyInSta[6]:
- staNo: 300
- # 绌烘澘鍏ュ簱鍙�8
- emptyInSta[7]:
- staNo: 303
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 110
- # 鍑哄簱鍙�3
- outSta[2]:
staNo: 103
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 113
- # 鍑哄簱鍙�5
- outSta[4]:
- staNo: 200
- # 鍑哄簱鍙�6
- outSta[5]:
- staNo: 203
- # 鍑哄簱鍙�7
- outSta[6]:
- staNo: 300
- # 鍑哄簱鍙�8
- outSta[7]:
- staNo: 303
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
+ led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 111
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
staNo: 104
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 114
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�5
- pickSta[4]:
- staNo: 200
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�6
- pickSta[5]:
- staNo: 203
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�7
- pickSta[6]:
- staNo: 300
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�8
- pickSta[7]:
- staNo: 303
- barcode: ${wcs-slave.barcode[0].id}
-
-
- # 鏉＄爜鎵弿浠�1
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
+ # 鏉＄爜鎵弿浠�1 宸︿笅 1妤煎紑濮�,111
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.3
port: 51236
- # 鏉＄爜鎵弿浠�2
+ # 鏉＄爜鎵弿浠�2, 114
barcode[1]:
id: 2
- ip: 10.10.10.52
+ ip: 10.10.10.4
port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�5
- barcode[4]:
- id: 5
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�6
- barcode[5]:
- id: 6
- ip: 10.10.10.52
- port: 51236
- # LED1
+ # LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.221
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 015
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.222
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
\ No newline at end of file
+ staArr: 103
\ No newline at end of file
--
Gitblit v1.9.1