From 7b6329313ca3a5e6ff96246eeaf96f839df7760b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/resources/application.yml |   85 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 04bb47d..a710b73 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,9 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
-#    url: jdbc:sqlserver://10.20.192.200:1433;databasename=jkasrs
+#    url: jdbc:sqlserver://127.0.0.1:49847;databasename=jshdasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
+#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
     username: sa
     password: sa@123
   mvc:
@@ -28,30 +29,92 @@
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
-#  global-config:
-#    field-strategy: 0
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 logging:
   path: /stock/out/@pom.build.finalName@/logs
 
 super:
-  pwd: xltys1995
+  pwd: asrs2023
 
 swagger:
   enable: false
+
+#License鐩稿叧閰嶇疆
+license:
+  subject: jshdasrs
+  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,17,20,21,24,25,28,29,32,33,36,37,40,41,44,45,48
+  doubleLocs: 1,4,5,8,9,12,13,16,17,20
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
+  # 宸︽繁搴撲綅鎺掑彿
+  doubleLocsLeft: 1,5,9,13,17
+  # 鍙虫繁搴撲綅鎺掑彿
+  doubleLocsRight: 4,8,12,16,20
+# wms鍙傛暟閰嶇疆
+wms-parameter:
+  # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
+  automaticFillingBoardStaNosBoolean: false
+  # 鑷姩琛ョ┖鏉跨珯鐐�
+  automaticFillingBoardStaNos: 112,101
+  # 鑷姩绉诲簱鍔熻兘寮�鍏�
+  autoLocMoveBoolean: false
+  # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
+  autoLocMoveUnilateralBoolean: false
 
-#鍏ュ簱鏆傚瓨鏁�
-store:
-  bufferCount: 2
+comb:
+  limit: 5000
 
+#arm瀵规帴
+arm:
+  #  鍦板潃
+  address:
+    URL: http://10.10.10.171:7002
+    #鏍规嵁鍙傛暟鑾峰彇鐮佸灈鏁伴噺
+    QuantityOfPalletizing: adaptor/api/wcs/getPalletizingNumber
+#鍒嗘嫞绾垮鎺�
+line:
+  # 鍦板潃
+  address:
+    URL: http://10.10.10.244:8080
+    PATH: orderPakInAll
+
+#erp瀵规帴
+erp:
+  #  寮�鍏�
+  switch:
+    #璁℃椂鍣ㄤ笂鎶ュ紑鍏�
+    ErpReportOld: false
+    #鑾峰彇鍗曟嵁寮�鍏�
+    InboundOrderSwitch: false
+    #鐧诲綍鎺ュ彛寮�鍏�
+    LoginAuthenticationSwitch: false
+    #涓婃姤銆佸鏍稿崟鎹紑鍏�
+    ReviewOrderSwitch: false
+  #  鍦板潃
+  address:
+    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
+    #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
+    outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
+  #  鐧诲綍璐﹀彿绠＄悊
+  login :
+    acctID: "647e849ab6fa0f"
+    username: "llw"
+    password: "666666"
+    lcid: 2052
\ No newline at end of file

--
Gitblit v1.9.1