From 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 25 十月 2024 12:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs
---
src/main/resources/application.yml | 260 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 212 insertions(+), 48 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0a02570..ba30efc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,14 +1,14 @@
server:
port: 9090
+ servlet:
+ context-path: /@pom.build.finalName@
spring:
application:
-# name: @pom.artifactId@
- name:
+ 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://localhost:1433;databasename=tzhtasrs
username: sa
password: sa@123
mvc:
@@ -21,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
@@ -33,67 +33,231 @@
swagger:
enable: false
+wms:
+ url: 127.0.0.1:8080/htwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
+ # 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.6.1
+ ip: 10.10.10.110
port: 102
rack: 0
- slot: 1
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 101
+ row: 2
+ bay: 1
+ lev: 1
+
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 10.10.10.120
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 5
+ staNo: 105
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 107
+ row: 7
+ bay: 1
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
- # 绔欑偣
+ staNo: 105
+ row: 6
+ bay: 1
+ lev: 1
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 107
+ row: 7
+ bay: 1
+ lev: 1
+ # 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.1.125
- port: 8888
- # 鍏ュ簱鍙�
+ ip: 10.10.10.100
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
inSta[0]:
- staNo: 2
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
- # 鍑哄簱鍙�
+ led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ # 鍏ュ簱鍙�4
+ inSta[3]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[3].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 101
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 103
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 105
+ # 绌烘澘鍏ュ簱鍙�4
+ emptyInSta[3]:
+ staNo: 107
+ # 鍑哄簱鍙�1
outSta[0]:
- staNo: 6
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 100
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 102
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 104
+ # 鍑哄簱鍙�3
+ outSta[3]:
+ staNo: 106
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 2
+ staNo: 101
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�4
+ pickSta[3]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[3].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # LED
+ ip: 10.10.10.105
+ port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.106
+ port: 51236
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.107
+ port: 51236
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.108
+ 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: 10.10.10.201
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 100
+ # LED2
+ led[1]:
+ id: 2
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 102
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.203
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 104
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.204
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 106
+ # LED1
+ led[4]:
+ id: 5
+ ip: 10.10.10.201
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 101
+ # LED2
+ led[5]:
+ id: 6
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 103
+ # LED3
+ led[6]:
+ id: 7
+ ip: 10.10.10.203
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 105
+ # LED4
+ led[7]:
+ id: 8
+ ip: 10.10.10.204
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 107
--
Gitblit v1.9.1