From 29ccba30133dec6ec0516c0782da5fe7d046848d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 16 十月 2025 10:00:14 +0800
Subject: [PATCH] wcs功能完善
---
src/main/resources/application.yml | 195 +++++++++++++++---------------------------------
1 files changed, 63 insertions(+), 132 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 72a73cb..9282531 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
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=jsjasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 127.0.0.1:8080/ghlnwms
+ url: 127.0.0.1:8080/jsjwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -48,7 +48,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 192.168.5.10
port: 102
rack: 0
slot: 0
@@ -58,39 +58,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 104
row: 3
- bay: 31
+ bay: 1
lev: 1
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 201
- row: 3
- bay: 31
- lev: 6
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
- bay: 31
- lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 201
- row: 3
- bay: 31
- lev: 6
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 3
- bay: 3
+ staNo: 102
+ row: 2
+ bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.20
+ ip: 192.168.5.20
port: 102
rack: 0
slot: 0
@@ -100,161 +82,110 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
- bay: 31
+ staNo: 106
+ row: 6
+ bay: 1
lev: 1
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
- row: 7
- bay: 31
- lev: 6
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 108
row: 7
- bay: 31
- lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
- row: 7
- bay: 31
- lev: 6
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 7
- bay: 27
+ bay: 1
lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.5.40
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
- led: ${wcs-slave.led[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 103
+ staNo: 106
barcode: ${wcs-slave.barcode[1].id}
- backSta: 102
- led: ${wcs-slave.led[1].id}
+ backSta: 105
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
- led: ${wcs-slave.led[0].id}
- emptyInSta[1]:
- staNo: 103
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 102
+ backSta: 103
led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 106
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 105
+ led: ${wcs-slave.led[2].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
+ staNo: 101
led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 102
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 104
- led: ${wcs-slave.led[2].id}
+ staNo: 107
+ led: ${wcs-slave.led[3].id}
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.50
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 201
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 203
-# # 绌烘澘鍏ュ簱鍙�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
-# 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: 305
-# 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: 192.168.5.42
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 192.168.5.43
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: 101
+ 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: 104
+ 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: 106
+ crnId: 2
+ # LED4
+ led[3]:
+ id: 4
+ ip: 192.168.5.107
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 107
+ crnId: 2
\ No newline at end of file
--
Gitblit v1.9.1