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 | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f7428f3..a710b73 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8081
servlet:
context-path: /@pom.build.finalName@
@@ -10,15 +10,11 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://192.168.4.191:1433;databasename=integrationasrs
-# username: sa
-# password: sa@123
- url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
+# 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
-# url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
-# username: sa
-# password: Zoneyung@zy56$
mvc:
static-path-pattern: /**
redis:
@@ -45,7 +41,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: integrationasrs
+ subject: jshdasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -56,13 +52,13 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 宸︽繁搴撲綅鎺掑彿
- doubleLocsLeft: 1,5,9,13
+ doubleLocsLeft: 1,5,9,13,17
# 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 4,8,12,16
+ doubleLocsRight: 4,8,12,16,20
# wms鍙傛暟閰嶇疆
wms-parameter:
# 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
@@ -77,6 +73,20 @@
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:
# 寮�鍏�
--
Gitblit v1.9.1