From 511d4ceb774ce6ccc1827545a205ba55a0ff26c0 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期一, 01 十二月 2025 09:06:14 +0800
Subject: [PATCH] #1
---
src/main/resources/application.yml | 204 +++++++++++++++-----------------------------------
1 files changed, 63 insertions(+), 141 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e7cc467..ae96752 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,13 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=xgmFlasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=rqdzasrs
username: sa
password: sa@123
+# driver-class-name: com.oscar.Driver
+# url: jdbc:oscar://127.0.0.1:2003/osrdb?CURRENTSCHEMA=DBO
+# username: SYSDBA
+# password: szoscar55
mvc:
static-path-pattern: /**
redis:
@@ -34,199 +38,117 @@
enable: false
wms:
- url: 127.0.0.1:9090/ykwms
+ url: 127.0.0.1:8080/czkhasrs
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ #
+ isToOrigin: false
# 鍙屾繁
- doubleDeep: false
+ doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.110
+ ip: 192.168.7.210
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
- offset: 1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
+ staNo: 1006
row: 2
- bay: 1
+ bay: 11
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 204
- row: 1
- bay: 41
- lev: 1
+
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
+ crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 208
+ staNo: 1001
row: 2
- bay: 41
+ bay: 14
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.120
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 1
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 111
- row: 4
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 211
- row: 3
- bay: 41
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 215
- row: 4
- bay: 41
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.130
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 1
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
- row: 5
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 116
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 218
- row: 5
- bay: 41
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 222
- row: 6
- bay: 41
- lev: 1
- # 杈撻�佺嚎1
+
+ # plc
devp[0]:
id: 1
- ip: 10.10.10.140
+ ip: 192.168.7.230
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 1005
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[1].id}
+# # 鍏ュ簱鍙�2
+# inSta[1]:
+# staNo: 223
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 222
+# led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 101
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
- backSta: 100
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[1]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- backSta: 200
+ backSta: 1005
+# # 鎷ｆ枡鍏ュ簱鍙�2
+# pickSta[1]:
+# staNo: 225
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# backSta: 224
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 1005
led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[1].id}
+ #emptyInSta[1]:
+ #staNo: 223
+ #barcode: ${wcs-slave.barcode[0].id}
+ #backSta: 222
+ #led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 117
- outSta[1]:
- staNo: 223
+ staNo: 1001
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.121
- port: 51236
- # 鏉＄爜鎵弿浠�2
- barcode[1]:
- id: 2
ip: 10.10.10.122
port: 51236
# LED1
led[0]:
- id: 1
- ip: 10.10.10.101
+ id: 121
+ ip: 192.168.7.241
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
- # LED2
+ staArr: 1006
+ crnId: 1
+# # LED2
led[1]:
- id: 2
- ip: 10.10.10.102
+ id: 123
+ ip: 192.168.7.240
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 106
+ staArr: 1005
+ crnId: 1
+# # LED1
+ led[2]:
+ id: 122
+ ip: 192.168.7.247
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1006
+ crnId: 1
+
--
Gitblit v1.9.1