From fcf47692a8115c53855e5f7a593238306cd59e69 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 25 十二月 2025 14:40:24 +0800
Subject: [PATCH] 1.新增拍照 2.初始化
---
src/main/resources/application.yml | 293 +++++++++++++++++++++++----------------------------------
1 files changed, 119 insertions(+), 174 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2b96715..cf5a1e7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9092
+ port: 9093
servlet:
context-path: /@pom.build.finalName@
@@ -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=shhtgcasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jnejc-ljqwms
username: sa
password: sa@123
mvc:
@@ -34,7 +34,9 @@
enable: false
wms:
- url: 127.0.0.1:8080/wms
+ url: 127.0.0.1:8083/ljqwms
+
+zyHikUrl: 10.10.10.200:9091/hik
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -45,7 +47,7 @@
# 宸︽繁搴撲綅鎺掑彿
# doubleLocsLeft: 4,7,11,15,19,23
# 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 3
+ doubleLocsRight: 1
# 宸︽祬搴撲綅鎺掑彿
shallowLocsLeft: 1
# 鍙虫祬搴撲綅鎺掑彿
@@ -55,7 +57,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 172.17.60.10
+ ip: 172.26.1.131
port: 102
rack: 0
slot: 0
@@ -69,211 +71,154 @@
row: 2
bay: 2
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 307
+ row: 1
+ bay: 16
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 304
+ row: 3
+ bay: 1
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 304
- row: 1
- bay: 2
+ row: 3
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1016
-# row: 5
-# bay: 120
-# lev: 1
- # 鍫嗗灈鏈�2
-# crn[1]:
-# id: 2
-# ip: 172.17.60.20
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1023
-# row: 8
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1026
-# row: 9
-# bay: 1
-# lev: 1
- # 鍫嗗灈鏈�3
-# crn[2]:
-# id: 3
-# ip: 172.17.60.30
-# port: 102
-# rack: 0
-# slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1029
-# row: 12
-# bay: 1
-# lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 307
+ row: 1
+ bay: 16
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1032
-# row: 13
-# bay: 1
-# lev: 1
- # 鍫嗗灈鏈�4
-# crn[3]:
-# id: 4
-# ip: 172.17.60.40
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1036
-# row: 16
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1039
-# row: 17
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈�5
-# crn[4]:
-# id: 5
-# ip: 172.17.60.50
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1042
-# row: 20
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1045
-# row: 21
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈�6
-# crn[5]:
-# id: 6
-# ip: 172.17.60.60
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1049
-# row: 24
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1052
-# row: 25
-# bay: 1
-# lev: 1
- # RGV绌挎杞�1
-# rgv[0]:
-# id: 1
-# ip: 172.17.60.82
-# port: 502
-# rack: 0
-# slot: 0
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 301
+ row: 2
+ bay: 1
+ lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 172.17.60.100
+ ip: 172.26.1.141
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 302
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 302
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 1076
-# barcode: ${wcs-slave.barcode[1].id}
-# backSta: 1075
-# led: ${wcs-slave.led[1].id}
+ inSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 302
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 302
led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 302
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 302
led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 306
+ staNo: 303
led: ${wcs-slave.led[0].id}
- # 杈撻�佺嚎2
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 306
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
+ outSta[2]:
+ staNo: 307
+ led: ${wcs-slave.led[2].id}
+# # 杈撻�佺嚎2
# devp[1]:
# id: 2
# ip: 172.17.60.118
# port: 102
# rack: 0
# slot: 0
-# # 鍏ュ簱鍙�1
+## # 鍏ュ簱鍙�1
# inSta[0]:
-# staNo: 1002
-# barcode: ${wcs-slave.barcode[2].id}
-# backSta: 1001
-# led: ${wcs-slave.led[7].id}
-# # 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 1007
-# barcode: ${wcs-slave.barcode[3].id}
-# backSta: 1003
-# led: ${wcs-slave.led[8].id}
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
ip: 10.10.10.121
port: 51236
# 鏉＄爜鎵弿浠�2
-# barcode[1]:
-# id: 2
-# ip: 10.10.10.121
-# port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.121
+ port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.121
+ port: 51236
# # 鏉＄爜鎵弿浠�3
# barcode[2]:
# id: 3
@@ -299,12 +244,12 @@
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 306
# # LED3
-# led[2]:
-# id: 3
-# ip: 172.17.60.181
-# port: 5005
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staArr: 1058
+ led[2]:
+ id: 3
+ ip: 172.17.60.181
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 307
# # LED4
# led[3]:
# id: 4
--
Gitblit v1.9.1