From ecb613da45feb56b1bb3089ea04d13fc7b5d9159 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 18 一月 2025 11:20:09 +0800
Subject: [PATCH] 清除下发确认位后延迟写入
---
src/main/resources/application.yml | 236 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 161 insertions(+), 75 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c6631fa..6974771 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,9 +7,8 @@
application:
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
+ url: jdbc:sqlserver://172.17.20.240:1433;databasename=sxjzasrs
username: sa
password: sa@123
mvc:
@@ -26,7 +25,7 @@
# field-strategy: 0
logging:
- path: /stock/out/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -34,113 +33,200 @@
swagger:
enable: false
+wms:
+ url: 127.0.0.1:8080/jzwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ # 鍙屾繁
+ doubleDeep: false
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 3
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.3.39
- port: 5015
+ ip: 10.10.10.10
+ port: 0
rack: 0
slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=0
- offset: 1
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 4
- row: 2
+ staNo: 104
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 2
- row: 1
+ staNo: 100
+ row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈�2
- #crn[1]:
- id: 1
- ip: 192.168.3.40
- port: 5015
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=0
- offset: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 8
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
- row: 1
- bay: 1
- lev: 1
- # 杈撻�佺嚎
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 10.10.10.20
+ port: 0
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 204
+ row: 5
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 200
+ row: 4
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ ip: 10.10.10.30
+ port: 0
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 304
+ row: 7
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 300
+ row: 6
+ bay: 0
+ lev: 1
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 192.168.3.65
- port: 6000
+ ip: 10.10.10.100
+ port: 0
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 3
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 7
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 204
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 203
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 3
+ staNo: 104
+ backSta: 103
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 7
+ staNo: 204
+ backSta: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 204
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 1
+ staNo: 101
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 5
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 201
+ led: ${wcs-slave.led[1].id}
+ # 杈撻�佺嚎2
+ devp[1]:
+ id: 2
+ ip: 10.10.10.130
+ port: 0
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 303
+ led: ${wcs-slave.led[3].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[3].id}
+ backSta: 303
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 2
- # 鏉＄爜鎵弿浠�
+ staNo: 304
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[3].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 301
+ led: ${wcs-slave.led[2].id}
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 192.168.2.150
- port: 51236
- # LED
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ # 鏉＄爜鎵弿浠�3
+ barcode[2]:
+ id: 3
+ # 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.107
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 101,104
+ # LED2
+ led[1]:
+ id: 2
+ ip: 10.10.10.105
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 201,204
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.108
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 301
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.109
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 304
\ No newline at end of file
--
Gitblit v1.9.1