From a40df2b322da49368ef82cd4d2fd90b1c76c6c9a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 24 十二月 2025 09:18:43 +0800
Subject: [PATCH] 盘点拣料功能修复
---
src/main/resources/application.yml | 205 +++++++++++++++++++++++++++-----------------------
1 files changed, 111 insertions(+), 94 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 239c8dc..b82ada6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,11 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
- # username: sa
- # password: Zoneyung@zy56$
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=klsasrs2
-# url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jgwms
username: sa
password: sa@123
mvc:
@@ -38,157 +34,178 @@
enable: false
wms:
- url: localhost:8080/klswms
-
-#鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃緭閫佹湁鍏ュ簱浠诲姟锛屽彨鍥炲師鐐�
-crnBackHp:
- enable: false
+ url: 127.0.0.1:8089/jgwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
+
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
- port: 8888
+ ip: 172.26.11.31
+ port: 102
+ rack: 0
+ slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 201
row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.13
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 120
- row: 7
+ staNo: 203
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 205
+ row: 1
+ bay: 9
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
- row: 6
+ staNo: 203
+ row: 1
bay: 1
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.16
- port: 8888
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 133
- row: 11
- bay: 1
+ staNo: 205
+ row: 1
+ bay: 9
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 10
- row: 11
+ 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: 103
+ staNo: 201
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 202
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ 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}
+ led: ${wcs-slave.led[1].id}
+ backSta: 204
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 110
+ staNo: 201
+ barcode: ${wcs-slave.barcode[0].id}
+ 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: 117
+ staNo: 201
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 202
+ led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 124
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 205
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
- staNo: 131
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 136
- barcode: ${wcs-slave.barcode[0].id}
- # 鏉＄爜鎵弿浠�
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 204
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 204
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 205
+ led: ${wcs-slave.led[2].id}
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 202
+ led: ${wcs-slave.led[0].id}
+
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 172.26.11.43
port: 51236
- # LED1
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ 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.60
+ ip: 172.26.11.83
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
+ staArr: 201,202
+ crnId: 1
# LED2
led[1]:
id: 2
- ip: 10.10.10.61
+ ip: 172.26.11.84
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
+ staArr: 203,204
+ crnId: 1
# LED3
led[2]:
id: 3
- ip: 10.10.10.61
+ ip: 172.26.11.85
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 124
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 131
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.61
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 136
\ No newline at end of file
+ staArr: 205
+ crnId: 1
\ No newline at end of file
--
Gitblit v1.9.1