From 062323dcda647af8adf1bfce3c80e7a2483af204 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 09:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk
---
src/main/resources/application.yml | 66 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ad49c93..b61a1cc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,10 +10,9 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
-# url: jdbc:sqlserver://10.10.0.200:1433;databasename=jkasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=qlasrs-sxk
username: sa
- password: sa@123
+ password: spcyy@2025
mvc:
static-path-pattern: /**
redis:
@@ -27,7 +26,7 @@
maxRequestSize: 100MB
mybatis-plus:
- mapper-locations: classpath:mapper/*.xml
+ mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
# configuration:
@@ -42,12 +41,59 @@
swagger:
enable: false
+#License鐩稿叧閰嶇疆
+license:
+ subject: qlasrs-sxk
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍙屾繁
- doubleDeep: true
- # 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ # 鐢辨祬鍏ユ繁
+ locGroupAscOrder: [
+ {rowList: [1],minBay: 1,maxBay: 16},
+ {rowList: [3,4,5,6],minBay: 1,maxBay: 16},
+ {rowList: [10,9,8,7],minBay: 1,maxBay: 16},
+ {rowList: [10,9,8,7,6,5,4,3],minBay: 17,maxBay: 22},
+ {rowList: [12,13],minBay: 1,maxBay: 22},
+ {rowList: [15,14],minBay: 1,maxBay: 22},
+ {rowList: [17,18,19,20,21,22,23],minBay: 1,maxBay: 22},
+ {rowList: [2],minBay: 1,maxBay: 22},
+ {rowList: [11],minBay: 1,maxBay: 22},
+ {rowList: [16],minBay: 1,maxBay: 22},
+ ]
+#wcs瀵规帴
+wcs:
+ #鍦板潃
+ address:
+ URL: http://127.0.0.1:9092/wcs
+ #鍑哄簱绉诲簱浠诲姟涓嬪彂
+ outboundTaskSend: open/outboundTaskSend
+ deviceStatus : open/deviceStatus
+
+led:
+ ip: 192.168.1.198
+ url: wms
+ port: 8081
+ id: 1002
+
+#erp瀵规帴
+erp:
+ #鍦板潃
+ address:
+ URL: http://192.168.3.102:16001
+ #鐧诲綍鍦板潃
+ loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
+ #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
+ inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
+ #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
+ outaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
+ #鐧诲綍璐﹀彿绠＄悊
+ login :
+ acctID: "640ad1fcc2b286"
+ username: "绔嬪簱"
+ password: "123456"
+ lcid: 2052
\ No newline at end of file
--
Gitblit v1.9.1