From 5c423ac136ae1e4cd3627fd3a8eb1b26fe5bb3ca Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 14 十月 2025 17:17:18 +0800
Subject: [PATCH] 联调
---
src/main/resources/application.yml | 141 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 128 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 51da8ed..f8accb7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,21 +1,20 @@
server:
port: 9090
+ servlet:
+ context-path: /@pom.build.finalName@
spring:
application:
-# name: @pom.artifactId@
- name:
+ name: @pom.build.finalName@
datasource:
- # mysql
-# driver-class-name: com.mysql.jdbc.Driver
-# url: jdbc:mysql://127.0.0.1:3306/zy_wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: xltys1995
- # sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=cool
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=rqdzasrs
username: sa
password: sa@123
+# driver-class-name: com.oscar.Driver
+# url: jdbc:oscar://127.0.0.1:2003/osrdb?CURRENTSCHEMA=DBO
+# username: SYSDBA
+# password: szoscar55
mvc:
static-path-pattern: /**
redis:
@@ -26,14 +25,130 @@
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
swagger:
- enable: false
\ No newline at end of file
+ enable: false
+
+wms:
+ url: 127.0.0.1:8080/czkhasrs
+
+# 涓嬩綅鏈洪厤缃�
+wcs-slave:
+ #
+ isToOrigin: false
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
+ # 鍫嗗灈鏈�1
+ crn[0]:
+ id: 1
+ ip: 192.168.7.210
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
+ offset: 0
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1006
+ row: 2
+ bay: 11
+ lev: 1
+
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1001
+ row: 2
+ bay: 14
+ lev: 1
+
+ # plc
+ devp[0]:
+ id: 1
+ ip: 192.168.7.230
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 1006
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1005
+ led: ${wcs-slave.led[0].id}
+# # 鍏ュ簱鍙�2
+# inSta[1]:
+# staNo: 223
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 222
+# led: ${wcs-slave.led[1].id}
+ # 鎷f枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 1006
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ backSta: 1005
+# # 鎷f枡鍏ュ簱鍙�2
+# pickSta[1]:
+# staNo: 225
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# backSta: 224
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 1006
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1005
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�2
+ #emptyInSta[1]:
+ #staNo: 223
+ #barcode: ${wcs-slave.barcode[0].id}
+ #backSta: 222
+ #led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 1001
+ # 鏉$爜鎵弿浠�1
+ barcode[0]:
+ id: 1
+ ip: 10.10.10.122
+ port: 51236
+ # LED1
+ led[0]:
+ id: 121
+ ip: 192.168.7.241
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1004
+ crnId: 1
+# # LED2
+ led[1]:
+ id: 123
+ ip: 192.168.7.240
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1005
+ crnId: 1
+ # LED1
+ led[2]:
+ id: 121
+ ip: 192.168.7.241
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1006
+ crnId: 1
+
--
Gitblit v1.9.1