From fcc38f90f19b5dd09bac80cfa3069817c6243acb Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 11 十二月 2025 09:37:50 +0800
Subject: [PATCH] #1
---
src/main/resources/application.yml | 203 +++++++++++++++++++-------------------------------
1 files changed, 77 insertions(+), 126 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0c2a5b1..ae96752 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,12 +8,13 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
- # username: sa
- # password: Zoneyung@zy56$
- url: jdbc:sqlserver://10.10.10.238:1433;databasename=xgmasrs
+ 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:
@@ -37,167 +38,117 @@
enable: false
wms:
- url: 10.10.10.238:8080/xgmwms
-# url: localhost:8082/xgmwms
+ url: 127.0.0.1:8080/czkhasrs
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ #
+ isToOrigin: false
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
+ doubleLocs: 1,4
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ ip: 192.168.7.210
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
+ staNo: 1006
row: 2
- bay: 1
+ bay: 11
lev: 1
+
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
- bay: 1
+ staNo: 1001
+ row: 2
+ bay: 14
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.13
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.16
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.19
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 15
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.22
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 18
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 19
- bay: 1
- lev: 1
- # 杈撻�佺嚎
+
+ # plc
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.7.230
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1005
+ led: ${wcs-slave.led[0].id}
+# # 鍏ュ簱鍙�2
+# inSta[1]:
+# staNo: 223
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 222
+# led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 1006
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ 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: 176
+ staNo: 1006
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1005
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�2
+ #emptyInSta[1]:
+ #staNo: 223
+ #barcode: ${wcs-slave.barcode[0].id}
+ #backSta: 222
+ #led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 173
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 182
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 176
- barcode: ${wcs-slave.barcode[0].id}
- # 鏉＄爜鎵弿浠�
+ staNo: 1001
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.122
port: 51236
- # LED1
+ # LED1
led[0]:
- id: 1
- ip: 10.10.10.60
+ id: 121
+ ip: 192.168.7.241
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 173
- # LED2
+ staArr: 1006
+ crnId: 1
+# # LED2
led[1]:
- id: 2
- ip: 10.10.10.61
+ id: 123
+ ip: 192.168.7.240
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
+ 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