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 | 293 ++++++++++++++--------------------------------------------
1 files changed, 71 insertions(+), 222 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cdd665e..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=hylyasrs
+ 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,272 +38,117 @@
enable: false
wms:
- url: localhost:8081/lywms
+ url: 127.0.0.1:8080/czkhasrs
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ #
+ isToOrigin: 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.101
+ ip: 192.168.7.210
port: 102
rack: 0
slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 1006
row: 2
- bay: 1
+ bay: 11
lev: 1
+
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 1001
row: 2
- bay: 1
+ bay: 14
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.111
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
- bay: 1
- lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 401
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 401
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 401
- row: 14
- 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: 103
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[2].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 401
- barcode: ${wcs-slave.barcode[3].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 103
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 203
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 305
- # 绌烘澘鍏ュ簱鍙�4
- emptyInSta[3]:
- staNo: 401
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 102
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 202
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 303
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 402
+ 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: 102
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 202
- barcode: ${wcs-slave.barcode[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 303
- barcode: ${wcs-slave.barcode[2].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 402
- barcode: ${wcs-slave.barcode[3].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: 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: 1001
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.122
port: 51236
- barcode[1]:
- id: 2
- ip: 10.10.10.52
- port: 51236
- barcode[2]:
- id: 3
- ip: 10.10.10.52
- port: 51236
- barcode[3]:
- id: 4
- ip: 10.10.10.52
- port: 51236
- # LED1
+ # LED1
led[0]:
- id: 1
- ip: 10.10.10.201
+ id: 121
+ ip: 192.168.7.241
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
- # LED2
+ staArr: 1006
+ crnId: 1
+# # LED2
led[1]:
- id: 2
- ip: 10.10.10.202
+ id: 123
+ ip: 192.168.7.240
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
- # LED3
+ staArr: 1005
+ crnId: 1
+# # LED1
led[2]:
- id: 3
- ip: 10.10.10.203
+ id: 122
+ ip: 192.168.7.247
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 202
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.204
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 203
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.205
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 303
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.206
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 305
- # LED7
- led[6]:
- id: 7
- ip: 10.10.10.207
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 402
+ staArr: 1006
+ crnId: 1
+
--
Gitblit v1.9.1