From 5dac37cde0205be965c2b74dd1bddefc7f9cceda Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 26 三月 2025 08:56:57 +0800
Subject: [PATCH] Merge branch 'integrationWms' into mdqzasrs
---
src/main/resources/application.yml | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ed79808..bbdcc4f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=gdykasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqzasrs
username: sa
password: sa@123
mvc:
@@ -39,7 +39,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: gdkyasrs
+ subject: mdqzasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -50,14 +50,23 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
-# doubleLocs: 1,4,11,14,21,24
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 宸︽繁搴撲綅鎺掑彿
- doubleLocsLeft: 1,5,9,13
+ doubleLocsLeft: 1
# 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 4,8,12,16
+ doubleLocsRight: 4
+# wms鍙傛暟閰嶇疆
+wms-parameter:
+ # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
+ automaticFillingBoardStaNosBoolean: false
+ # 鑷姩琛ョ┖鏉跨珯鐐�
+ automaticFillingBoardStaNos: 112,101
+ # 鑷姩绉诲簱鍔熻兘寮�鍏�
+ autoLocMoveBoolean: false
+ # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
+ autoLocMoveUnilateralBoolean: false
comb:
limit: 5000
@@ -66,21 +75,30 @@
erp:
# 寮�鍏�
switch:
- InboundOrderSwitch: true
- LoginAuthenticationSwitch: true
- ReviewOrderSwitch: true
+ #璁℃椂鍣ㄤ笂鎶ュ紑鍏�
+ ErpReportOld: false
+ #鑾峰彇鍗曟嵁寮�鍏�
+ InboundOrderSwitch: false
+ #鐧诲綍鎺ュ彛寮�鍏�
+ LoginAuthenticationSwitch: false
+ #涓婃姤銆佸鏍稿崟鎹紑鍏�
+ ReviewOrderSwitch: false
# 鍦板潃
address:
- URL: http://ht01.wlgear.com:16001
+ URL: http://58.210.10.90:28090
#鐧诲綍鍦板潃
loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
#鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
+ #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
+ outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
+ #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
+ outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
#缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
- outaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
+ outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
# 鐧诲綍璐﹀彿绠＄悊
login :
- acctID: "64c7666b20caf2"
- username: "cs"
- password: "123456"
+ acctID: "647e849ab6fa0f"
+ username: "llw"
+ password: "666666"
lcid: 2052
\ No newline at end of file
--
Gitblit v1.9.1