From a04129405c79496236fff3b1fd8de5b70c5b3fda Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 28 四月 2025 08:49:55 +0800
Subject: [PATCH] 双数据源

---
 src/main/resources/application.yml |   91 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0cb061e..93d46fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,23 +10,34 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=asrs
+    jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ytflasrs
     username: sa
     password: sa@123
+
+
   mvc:
     static-path-pattern: /**
   redis:
     host: localhost
     port: 6379
     database: 0
-#    password: xltys1995
+  #    password: xltys1995
   servlet:
     multipart:
       maxFileSize: 100MB
       maxRequestSize: 100MB
+other:
+  datasource:
+    jdbc-url: jdbc:mysql://192.168.5.61:3306/datareports
+    username: liku
+    password: 123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
 
 mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath*:mapper2/*.xml
+  type-aliases-package: com.zy.**
 
 logging:
   path: /stock/out/@pom.build.finalName@/logs
@@ -39,7 +50,7 @@
 
 #License鐩稿叧閰嶇疆
 license:
-  subject: gdkyasrs
+  subject: integrationasrs
   publicAlias: publicCert
   storePass: public_zhongyang_123456789
   licensePath: license.lic
@@ -60,19 +71,81 @@
 # wms鍙傛暟閰嶇疆
 wms-parameter:
   # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
-  automaticFillingBoardStaNosBoolean: true
+  automaticFillingBoardStaNosBoolean: false
   # 鑷姩琛ョ┖鏉跨珯鐐�
   automaticFillingBoardStaNos: 112,101
+  # 鑷姩绉诲簱鍔熻兘寮�鍏�
+  autoLocMoveBoolean: false
+  # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
+  autoLocMoveUnilateralBoolean: false
 
-comb:
-  limit: 5000
+
+
+# 鐢ㄥ弸NC瀵规帴
+NYNC:
+  ip:
+  prot:
+  #1.閿�鍞嚭搴撳崟鍙傜収鍙戣揣鍗曟柊澧�
+  saveRefDelivery: http://${ip}:${port}/nccloud/api/ic/saleout/saveRefDelivery
+  #2.鍏朵粬鍏ュ簱鍗曞弬鐓ц浆搴撴柊澧�
+  saveRefWhsTrans: http://ip:port/nccloud/api/ic/generalin/saveRefWhsTrans
+  #3.鏂板閲囪喘鍏ュ簱鍗�
+  purchasein: http://ip:port/nccloud/api/ic/purchasein/save
+  #4.1鏂板杞簱鍗�
+  whstrans: http://ip:port/nccloud/api/ic/whstrans/save
+  #4.2鍏朵粬鍑哄簱鍗曟柊澧�
+  generalout: http://ip:port/nccloud/api/ic/generalout/save
+  #4.3.鍏朵粬鍏ュ簱鍗曞弬鐓ц浆搴撴柊澧�
+  #saveRefWhsTrans: http://ip:port/nccloud/api/ic/generalin/saveRefWhsTrans
+  #5.1鏂板杞簱鍗�
+  #whstrans: http://ip:port/nccloud/api/ic/whstrans/save
+  #5.2鍏朵粬鍑哄簱鍗曟柊澧�
+  #generalout: http://ip:port/nccloud/api/ic/generalout/save
+  #5.3.鍏朵粬鍏ュ簱鍗曞弬鐓ц浆搴撴柊澧�
+  #saveRefWhsTrans: http://ip:port/nccloud/api/ic/generalin/saveRefWhsTrans
+  #6.璋冩嫧璁㈠崟鏌ヨ
+  #saveRefWhsTrans: http://ip:port/nccloud/api/ic/generalin/saveRefWhsTrans
+  #7.鐩樼偣鍗曟煡璇�
+  invcount: http://ip:port/nccloud/api/ic/invcount/query
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 #erp瀵规帴
 erp:
   #  寮�鍏�
   switch:
+    #璁℃椂鍣ㄤ笂鎶ュ紑鍏�
+    ErpReportOld: false
     #鑾峰彇鍗曟嵁寮�鍏�
-    InboundOrderSwitch: true
+    InboundOrderSwitch: false
     #鐧诲綍鎺ュ彛寮�鍏�
     LoginAuthenticationSwitch: false
     #涓婃姤銆佸鏍稿崟鎹紑鍏�
@@ -91,7 +164,7 @@
     #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
     outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
   #  鐧诲綍璐﹀彿绠$悊
-  login :
+  login:
     acctID: "647e849ab6fa0f"
     username: "llw"
     password: "666666"

--
Gitblit v1.9.1