From 4ef4e287fe6597543a9628b6dae294c19f2b1d9c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 十月 2025 10:50:41 +0800
Subject: [PATCH] 1.新增订单出库挑选功能 2.新增订单明细表
---
src/main/resources/application.yml | 68 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7a7ac42..cedb8f5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 7878
+ port: 8081
servlet:
context-path: /@pom.build.finalName@
@@ -9,16 +9,11 @@
jmx:
enabled: false
datasource:
- # mysql
-# driver-class-name: com.mysql.jdbc.Driver
-# url: jdbc:mysql://127.0.0.1:3306/cool?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://47.97.1.152:51433;databasename=jkasrs
+ #jdbc-url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
+ jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -31,8 +26,22 @@
maxFileSize: 100MB
maxRequestSize: 100MB
+other:
+ datasource:
+ # jdbc-url: jdbc:mysql://127.0.0.1:3306/wmsdata
+ # username: root
+ # password: root
+ #driver-class-name: com.mysql.cj.jdbc.Driver
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# jdbc-url: jdbc:sqlserver://192.168.3.148:1433;databasename=wms_middle
+# username: wms
+# password: wms@aunde
+ jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
+ username: sa
+ password: sa@123
+
mybatis-plus:
- mapper-locations: classpath:mapper/*.xml
+ mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
# configuration:
@@ -47,17 +56,46 @@
swagger:
enable: false
+#License鐩稿叧閰嶇疆
+license:
+ subject: awdasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 3,6,7,10
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
-wms:
- url: http://192.168.1.57:8080/wms
-
+#erp瀵规帴
erp:
- url: http://123.60.34.127:6220/api
+ #鍦板潃
+ 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: "67af18a2bc317c"
+ username: "绔嬪簱"
+ password: "123456"
+ lcid: 2052
+
+rcs:
+ # 鍦板潃
+ address:
+ URL: https://172.17.3.120
+ #浠诲姟涓嬪彂鎺ュ彛
+ reportTask: rcs/rtas/api/robot/controller/task/submit
+ #绔欑偣缁戝畾鍜岃В缁�
+ siteBindAndUnbing: rcs/rtas/api/robot/controller/site/bind
\ No newline at end of file
--
Gitblit v1.9.1