From f21530d33ca23aeeba2ef073ac6b64422e4e26ca Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 12:17:55 +0800
Subject: [PATCH] 库位编号规则和和CTU保持一致
---
rsf-server/src/main/resources/application-prod.yml | 63 +++++++++++++++----------------
1 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/rsf-server/src/main/resources/application-prod.yml b/rsf-server/src/main/resources/application-prod.yml
index d43b3bb..090c1c6 100644
--- a/rsf-server/src/main/resources/application-prod.yml
+++ b/rsf-server/src/main/resources/application-prod.yml
@@ -21,14 +21,14 @@
password: xltys1995
type: com.alibaba.druid.pool.DruidDataSource
druid:
- initial-size: 5
- min-idle: 5
- max-active: 20
- max-wait: 30000
+ initial-size: 3
+ min-idle: 8
+ max-active: 40
+ max-wait: 10000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
test-while-idle: true
- test-on-borrow: true
+ test-on-borrow: false
test-on-return: false
remove-abandoned: true
remove-abandoned-timeout: 1800
@@ -43,6 +43,21 @@
login-username: admin
login-password: admin
enabled: true
+ # 澶氭暟鎹簮锛氶紟鎹�
+ dj-cloud-wms:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://127.0.0.1:3306/rsf_jdxaj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: xltys1995
+ url: jdbc:mysql://192.168.10.108:3306/ilc_wms_prod?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# url: jdbc:mysql://192.168.10.108:3306/ilc_wms_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: "Gsyywm@2020.com"
+ initial-size: 1
+ min-idle: 2
+ max-active: 12
+ max-wait: 10000
servlet:
multipart:
maxFileSize: 100MB
@@ -72,17 +87,6 @@
database: 3
index: 3
-# 浠� cus_item_sync_view锛泆rl 涓嶉厤缃椂浠嶆煡涓诲簱銆傚簱鍚嶄笌璐﹀彿鎸夌敓浜х幆澧冧慨鏀�
-cus-item-sync:
- datasource:
-# url: jdbc:mysql://127.0.0.1:3306/rsf_jdxaj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: xltys1995
-# url: jdbc:mysql://192.168.10.108:3306/ilc_wms_prod?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- url: jdbc:mysql://192.168.10.108:3306/ilc_wms_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: "Gsyywm@2020.com"
- driver-class-name: com.mysql.cj.jdbc.Driver
#骞冲彴鎺ュ彛淇℃伅閰嶇疆(濡傦細ERP, QMS, WCS绛�)
platform:
@@ -94,8 +98,9 @@
port: 8080
#鎺ュ搧閾炬帴鍓嶇紑
pre-path: ""
- # Feign 璋冪敤浜戜粨鏃剁殑鏍瑰湴鍧�銆傛湰鏈烘ā鎷燂細http://127.0.0.1:8086/rsf-server锛圕loudWmsMockController锛�/dapilc/.../cusInventoryCompletionReport 绛夛級
- base-url: http://127.0.0.1:8086/rsf-server
+ # Feign 璋冪敤浜戜粨鏃剁殑鏍瑰湴鍧�銆傛湰鏈烘ā鎷燂細http://127.0.0.1:8086/rsf-server锛圕loudWmsMockController锛欼CusStockService stockIn/Out/TransferCompleted锛�
+ # base-url: http://127.0.0.1:8086/rsf-server
+ base-url: http://192.168.10.108:8180
# 榧庢嵎 DAP ilcwmsplus 瀹屾垚鍙嶉锛�9.1/9.2 缁勫寘鐢級
dap:
org-no: ""
@@ -103,10 +108,13 @@
doc-type-out: ""
doc-type-adj: ""
unit-no: PCS
- #鎺ュ彛鏄庣粏锛堣川妫�绛夛紱鍏ュ嚭搴撳畬鎴愬凡鍥哄畾涓� /dapilc/restful/service/ilcwmsplus/IKWebService/...锛�
+ #鎺ュ彛鏄庣粏锛堣川妫�绛夛紱涓嬫柟 stock-in/out-completed-path 涓� CloudWmsErpFeignClient 涓�鑷达紱璋冩嫧 changeType=3 涓� stockTransferCompleted锛�
api:
notify-inspect: /report/inspect
- in-out-result-path: /dapilc/restful/service/ilcwmsplus/IKWebService/cusInventoryCompletionReport
+ # 鍏�/鍑哄簱瀹屾垚璺緞锛堜笌 CloudWmsErpFeignClient 涓�鑷达紱Feign 鐢� platform.erp.base-url + 涓嬪垪 path锛�
+ stock-in-completed-path: /dapilc/restful/service/ilcwmsplus/ICusStockService/stockInCompleted
+ stock-out-completed-path: /dapilc/restful/service/ilcwmsplus/ICusStockService/stockOutCompleted
+# in-out-result-path: /dapilc/restful/service/ilcwmsplus/IKWebService/cusInventoryCompletionReport
inventory-adjust-path: /api/report/inventoryAdjust
mat-sync-path: /api/mat/sync
rcs:
@@ -132,16 +140,5 @@
# rule-cache-refresh-ms锛氳鍒欒〃缂撳瓨鍒锋柊闂撮殧锛堟绉掞級
http-audit:
enabled: true
- whitelist-only: true
- # false锛�/httpAuditLog銆�/httpAuditRule 涔熶細琚� Filter 璁板綍锛堣皟璇曠敤锛涚敓浜у缓璁� true锛�
- exclude-audit-self-paths: false
- rule-cache-refresh-ms: 60000
- query-response-max-chars: 500
- max-response-store-chars: 65535
- # 瑙勫垯鏈～ request_max_chars 鏃堕粯璁わ紱-1 琛ㄧず璇锋眰浣撳叆搴撲笉鎴柇
- default-request-store-chars: 65535
- path-descriptions:
- "/erp/order": "浜戜粨-璁㈠崟鏌ヨ"
- "/erp/order/add": "浜戜粨-鍗曟嵁涓嬪彂"
- "/erp/order/addAll": "浜戜粨-鎵归噺鍗曟嵁涓嬪彂"
- "/erp/order/cancel": "浜戜粨-鍙栨秷鍗曟嵁"
\ No newline at end of file
+ # 瀹¤鏁版嵁婧愶細primary / dj-cloud-wms
+ datasource: primary
\ No newline at end of file
--
Gitblit v1.9.1