From c5698e42c67e32892424a1a94ed9e7b532f0f7b8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 十二月 2025 09:43:49 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善
---
src/main/resources/application.yml | 202 ++++++++++++++++++++++----------------------------
1 files changed, 88 insertions(+), 114 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 72d67cf..5dcb7a0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 9090
servlet:
context-path: /@pom.build.finalName@
@@ -8,9 +8,9 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghlnasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jgwms
username: sa
- password: 123456
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -28,27 +28,27 @@
path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: lnWCS2024
+ pwd: xltys1995
swagger:
enable: false
wms:
- url: 127.0.0.1:8080/wms
+ url: 127.0.0.1:8089/jgwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 172.26.11.31
port: 102
rack: 0
slot: 0
@@ -58,168 +58,142 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 123
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
+ staNo: 201
row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.20
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 127
- row: 6
+ staNo: 203
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 131
- row: 7
+ staNo: 203
+ row: 1
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 205
+ row: 1
+ bay: 9
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 201
+ row: 2
bay: 1
lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 172.26.11.41
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 201
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 202
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�1
+ # 鍏ュ簱鍙�2
inSta[1]:
- staNo: 103
+ staNo: 205
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 203
barcode: ${wcs-slave.barcode[1].id}
- backSta: 102
led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�
+ backSta: 204
+ # 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 201
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 202
led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 205
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 204
+ led: ${wcs-slave.led[1].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 104
+# barcode: ${wcs-slave.barcode[0].id}
+# backSta: 103
+# led: ${wcs-slave.led[1].id}
+# # 鎷ｆ枡鍏ュ簱鍙�2
+# pickSta[1]:
+# staNo: 106
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 105
+# led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
- led: ${wcs-slave.led[0].id}
+ staNo: 204
+ led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 102
- led: ${wcs-slave.led[1].id}
+ staNo: 205
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�3
outSta[2]:
- staNo: 104
- led: ${wcs-slave.led[2].id}
-
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.50
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ staNo: 202
led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
- led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 159
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[5].id}
- backSta: 160
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 107
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
- led: ${wcs-slave.led[2].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[1]:
- staNo: 107
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
- led: ${wcs-slave.led[2].id}
- inSta[2]:
- staNo: 159
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 160
- led: ${wcs-slave.led[5].id}
- # # 鎷ｆ枡鍏ュ簱鍙�1
- # pickSta[1]:
- # staNo: 107
- # barcode: ${wcs-slave.barcode[1].id}
- # led: ${wcs-slave.led[1].id}
- # backSta: 108
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 100
- led: ${wcs-slave.led[0].id}
- outSta[1]:
- staNo: 152
- led: ${wcs-slave.led[3].id}
- outSta[2]:
- staNo: 156
- led: ${wcs-slave.led[4].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.121
+ ip: 172.26.11.43
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 172.26.11.44
+ port: 51236
+ # 鏉＄爜鎵弿浠�3
+ barcode[2]:
+ id: 3
+ ip: 172.26.11.45
port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.101
+ ip: 192.168.5.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 202
+ crnId: 1
# LED2
led[1]:
id: 2
- ip: 10.10.10.102
+ ip: 192.168.5.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
+ staArr: 204
+ crnId: 1
# LED3
led[2]:
id: 3
- ip: 10.10.10.103
+ ip: 192.168.5.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 104
\ No newline at end of file
+ staArr: 205
+ crnId: 1
\ No newline at end of file
--
Gitblit v1.9.1