From ce641926a957d238b202aa0d9dac3b8f15aff153 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 14 五月 2025 14:43:00 +0800
Subject: [PATCH] 123
---
src/main/resources/application.yml | 317 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 264 insertions(+), 53 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0a02570..739a37e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,16 +1,17 @@
server:
port: 9090
+ servlet:
+ context-path: /@pom.build.finalName@
spring:
application:
-# name: @pom.artifactId@
- name:
+ name: @pom.build.finalName@
datasource:
- # sql-server
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
- username: sa
- password: sa@123
+ driver-class-name: com.oscar.Driver
+ # url: jdbc:oscar://aezj52528314.vicp.fun:13560/osrdb?CURRENTSCHEMA=BJYCWMS
+ url: jdbc:oscar://10.10.10.200:2003/osrdb?CURRENTSCHEMA=BJYCWMS
+ username: SYSDBA
+ password: szoscar55
mvc:
static-path-pattern: /**
redis:
@@ -21,11 +22,11 @@
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
- global-config:
- field-strategy: 0
+# global-config:
+# field-strategy: 0
logging:
- path: /stock/out/logs
+ path: stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -33,67 +34,277 @@
swagger:
enable: false
+wms:
+ url: 10.10.10.200:8088/bjycwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
+ # 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.6.1
+ ip: 10.10.10.110
port: 102
rack: 0
- slot: 1
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 5
+ staNo: 103
+ row: 4
+ bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 3
+ bay: 7
+ lev: 10
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 212
+ row: 3
+ bay: 2
+ lev: 10
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�4
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 104
+ row: 1
+ bay: 2
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
- # 绔欑偣
+ staNo: 103
+ row: 4
+ bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 3
+ bay: 7
+ lev: 10
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 212
+ row: 3
+ bay: 2
+ lev: 10
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�4
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 104
+ row: 1
+ bay: 2
+ lev: 1
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 192.168.1.125
- port: 8888
- # 鍏ュ簱鍙�
+ ip: 10.10.10.130
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
inSta[0]:
- staNo: 2
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
- # 鍑哄簱鍙�
- outSta[0]:
- staNo: 6
- # 鎷ｆ枡鍏ュ簱鍙�
+ backSta: 101
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 200
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 210
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 101
+ 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}
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 210
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�4
+ emptyInSta[3]:
+ staNo: 104
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 2
- # 鏉＄爜鎵弿浠�
+ staNo: 102
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ backSta: 101
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 200
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 211
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ backSta: 210
+ # 鎷ｆ枡鍏ュ簱鍙�4
+ pickSta[3]:
+ staNo: 104
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 101
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 200
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 210
+ led: ${wcs-slave.led[2].id}
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 104
+ # 杈撻�佺嚎2
+# devp[1]:
+# id: 2
+# ip: 10.10.10.130
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍏ュ簱鍙�1
+# inSta[0]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 200
+# led: ${wcs-slave.led[3].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 200
+# led: ${wcs-slave.led[3].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 201
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[3].id}
+# # 鍑哄簱鍙�1
+# outSta[0]:
+# staNo: 206
+# led: ${wcs-slave.led[2].id}
+#
+# # 杈撻�佺嚎3
+# devp[2]:
+# id: 3
+# ip: 10.10.10.130
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍏ュ簱鍙�1
+# inSta[0]:
+# staNo: 301
+# barcode: ${wcs-slave.barcode[2].id}
+# backSta: 300
+# led: ${wcs-slave.led[5].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 301
+# barcode: ${wcs-slave.barcode[2].id}
+# backSta: 200
+# led: ${wcs-slave.led[5].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 301
+# barcode: ${wcs-slave.barcode[2].id}
+# led: ${wcs-slave.led[5].id}
+# # 鍑哄簱鍙�1
+# outSta[0]:
+# staNo: 306
+# led: ${wcs-slave.led[4].id}
+
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # LED
+ ip: 10.10.10.132
+ port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.134
+ port: 51236
+ # 鏉＄爜鎵弿浠�3
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.135
+ port: 51236
+ # LED1
led[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.1.1
- port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ip: 10.10.10.249
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 101
+ # LED2
+ led[1]:
+ id: 2
+ ip: 10.10.10.248
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 101
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.247
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 117
+# # LED4
+# led[3]:
+# id: 4
+# ip: 10.10.10.246
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 126
+# # LED5
+# led[4]:
+# id: 5
+# ip: 10.10.10.245
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 134
+# # LED6
+# led[5]:
+# id: 6
+# ip: 10.10.10.244
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 201
\ No newline at end of file
--
Gitblit v1.9.1