From c6e32e5da5d30ce2f74f0e32c3290d421c0951f2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 17:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/resources/application.yml | 156 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 130 insertions(+), 26 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e63427b..384e56a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8888
servlet:
context-path: /@pom.build.finalName@
@@ -10,7 +10,9 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=lfdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
+# url: jdbc:sqlserver://10.10.10.235;databasename=jshdasrs
+# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
username: sa
password: sa@123
mvc:
@@ -26,45 +28,147 @@
maxRequestSize: 100MB
mybatis-plus:
- mapper-locations: classpath:mapper/*.xml
-# global-config:
-# field-strategy: 0
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ mapper-locations: classpath:mapper/*.xml
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: 9,12,15,18
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
-#ERP鎺ュ彛
-erp:
- enabled: false
- enabledNew: false
- enabledErpDetTb: true
- # enabled: false
- #鏌ョ湅ERP涓棿琛ㄩ棿闅�
- refreshtime: 0/5 * * * * ?
- db:
- driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.0.13:1433;databasename=DB_2022
- username: sa
- password: Qaz@1234
- useName:
- ip: 192.168.0.13
-
+ # 宸︽繁搴撲綅鎺掑彿
+ doubleLocsLeft: 1,5,9,13,17
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 4,8,12,16,20
+# wms鍙傛暟閰嶇疆
+wms-parameter:
+ # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
+ automaticFillingBoardStaNosBoolean: false
+ # 鑷姩琛ョ┖鏉跨珯鐐�
+ automaticFillingBoardStaNos: 112,101
+ # 鑷姩绉诲簱鍔熻兘寮�鍏�
+ autoLocMoveBoolean: false
+ # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
+ autoLocMoveUnilateralBoolean: false
comb:
- limit: 5000
\ No newline at end of file
+ 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: true
+ #鑾峰彇鍗曟嵁寮�鍏�
+ InboundOrderSwitch: true
+ #鐧诲綍鎺ュ彛寮�鍏�
+ LoginAuthenticationSwitch: true
+ #涓婃姤銆佸鏍稿崟鎹紑鍏�
+ ReviewOrderSwitch: false
+ # 鍦板潃
+ address:
+ URL: https://shyucheng.test.kdgalaxy.com
+ #鐧诲綍鍦板潃
+ loginaddress: /kapi/oauth2/getToken
+ #鍟嗗搧妗ｆ鍦板潃
+ mataddress: /kapi/v2/eap7/basedata/bd_material/batchQuery
+ #璐т富妗ｆ鍦板潃
+ orgaddress: /kapi/v2/basedata/bd_supplier/query
+ #鏀舵枡鍗�-鏌ヨ
+ impurreceivebilladdress: /kapi/v2/im/im_purreceivebill/getList
+ #杩涗粨閫氱煡鍗�
+ impurreceivebilldetl: kapi/v2/eap7/im/im_purreceivebill/query
+ #杩涗粨鍏ュ簱鍗曟柊澧�
+ imPurinbillAdd: /kapi/v2/im/im_purinbill/add
+ #杩涗粨鍏ュ簱鍗曟彁浜�
+ imPurinbillBatchSubmit: /kapi/v2/im/im_purinbill/batchSubmit
+ #杩涗粨鍏ュ簱鍗曞鏍�
+ imPurinbillBatchAudit: /kapi/v2/im/im_purinbill/batchAudit
+ #閿�鍞嚭搴撳崟鏌ヨ
+ imSaloutbill: /kapi/v2/eap7/im/im_saloutbill/query
+ #閿�鍞嚭搴撳崟涓婃姤
+ imSaloutbillReport: /kapi/v2/im/im_saloutbill/batchAudit
+ #閿�鍞��璐ф煡璇�
+ scpSalreturn: /kapi/v2/eap7/scp/scp_salreturn/batchQuery
+ #閿�鍞��璐ц繘浠撳崟
+ scpSalreturnDetl: /kapi/v2/eap7/scp/scp_salreturn/query
+ #閿�鍞��璐т笂鎶�
+ scpSalreturnReport: /kapi/v2/eap7/scp/scp_salreturn/audit
+ #鐢熶骇棰嗘枡鏌ヨ
+ imMdcMftproorder: /kapi/v2/im/im_mdc_mftproorder/batchQuery
+ #鐢熶骇棰嗘枡姹囨姤
+ imMdcMftproorderReport: /kapi/v2/im/im_mdc_mftproorder/batchAudit
+ #鐢熶骇閫�鏂欏崟鏌ヨ
+ imMdcMftreturnorder: /kapi/v2/im/im_mdc_mftreturnorder/batchQuery
+ #鐢熶骇閫�鏂欏崟涓婃姤
+ imMdcMftreturnorderReport: /kapi/v2/im/im_mdc_mftreturnorder/batchAudit
+ #鐢熶骇琛ユ枡鍗�
+ imMdcMftfeedorder: /kapi/v2/im/im_mdc_mftfeedorder/batcheQuery
+ #鐢熶骇琛ユ枡鍗曟眹鎶�
+ imMdcMftfeedorderReport: /kapi/v2/im/im_mdc_mftfeedorder/batchAudit
+ #鐢熶骇杩涗粨鍗曟煡璇�
+ imProductinbill: /kapi/v2/eap7/pom/pom_mftorderreport/query
+ #鐢熶骇杩涗粨鍗曟煡璇笂鎶�
+ imProductinbillReport: /kapi/v2/im/im_productinbill/batchAudit
+ #鍏朵粬鍑哄簱鍗曚笂鎶�
+ imOtheroutbill: /kapi/v2/im/im_otheroutbill/batchSave
+ #鍏朵粬鍑哄簱鍗曟彁浜�
+ imOtheroutbillSubmit: /kapi/v2/im/im_otheroutbill/batchSubmit
+ #鍏朵粬鍑哄簱鍗曞鏍�
+ imOtheroutbillAudi: /kapi/v2/im/im_otheroutbill/batchAudit
+ #鍏朵粬鍏ュ簱鏂板
+ imOtherinbill: /kapi/v2/im/im_otherinbill/batchAdd
+ #鍏朵粬鍏ュ簱鎻愪氦
+ imOtherinbillSubmit: /kapi/v2/im/im_otherinbill/batchSubmit
+ #鍏朵粬鍏ュ簱瀹℃牳
+ imOtherinbillAudit: /kapi/v2/im/im_otherinbill/batchAudit
+ #浜у搧妫�楠屽崟鏌ヨ
+ qcppManuinspec: /kapi/v2/eap7/qcpp/qcpp_manuinspec/query
+
+# #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
+# 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 :
+ xAcfwIdentity: "djF8MTlhNTNhZjJhOWEwMWRlODhlMDF8NDkxNTk0MDU4MTQxNXwus9WaEHKRh0daJe1TWmVoMkv3zQY2knNTZRzaOhRgwnw"
+ clientId: "WMS"
+ clientSecret: "123456789Asd!@123456789"
+ accountId: "2182793143735298048"
+ username: "admin"
\ No newline at end of file
--
Gitblit v1.9.1