From 77c0b3a6d94eab894dbc7472e530c484dcfc424e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 07 一月 2026 16:59:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jnejc-jgwcs' into jnejc-jgwcs
---
src/main/resources/application.yml | 206 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 152 insertions(+), 54 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ed9f104..b82ada6 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://127.0.0.1:1433;databasename=jgwms
username: sa
password: sa@123
mvc:
@@ -22,11 +21,11 @@
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
- global-config:
- field-strategy: 0
+# global-config:
+# field-strategy: 0
logging:
- path: /stock/out/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -34,80 +33,179 @@
swagger:
enable: false
+wms:
+ url: 127.0.0.1:8089/jgwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
+ # 鍙屾繁
+ doubleDeep: false
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 2
+
+ # 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.3.39
- port: 5015
+ ip: 172.26.11.31
+ port: 102
rack: 0
slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=0
- offset: 1
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 5
+ staNo: 201
row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
+ 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: 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: 192.168.3.65
- port: 6000
+ ip: 172.26.11.41
+ port: 102
rack: 0
- slot: 1
- # 鍏ュ簱鍙�
+ slot: 0
+ # 鍏ュ簱鍙�1
inSta[0]:
- staNo: 2
+ 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: 2
- # 鍑哄簱鍙�
- outSta[0]:
- staNo: 6
- # 鎷ｆ枡鍏ュ簱鍙�
+ 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: 2
- # 鏉＄爜鎵弿浠�
+ staNo: 201
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 202
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 205
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ 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: 192.168.2.150
+ ip: 172.26.11.43
port: 51236
- # LED
+ # 鏉＄爜鎵弿浠�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: 192.168.1.1
- port: 8888
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.1.1
- port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ip: 172.26.11.83
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 201,202
+ crnId: 1
+ # LED2
+ led[1]:
+ id: 2
+ ip: 172.26.11.84
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 203,204
+ crnId: 1
+ # LED3
+ led[2]:
+ id: 3
+ ip: 172.26.11.85
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 205
+ crnId: 1
\ No newline at end of file
--
Gitblit v1.9.1