From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat：反审核操作。可以对已审核的订单进行反审核，反审核的时候可以选择作废还是重新生成一条，并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核，并且需要将对应的入库、出库、发货进行作废。
---
src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
index ae6e02f..2dd49ab 100644
--- a/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
+++ b/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
@@ -24,6 +24,12 @@
@Value("${spring.datasource.druid.maxWait}")
private int maxWait;
+ @Value("${spring.datasource.druid.connectTimeout}")
+ private int connectTimeout;
+
+ @Value("${spring.datasource.druid.socketTimeout}")
+ private int socketTimeout;
+
@Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
private int timeBetweenEvictionRunsMillis;
@@ -54,6 +60,12 @@
/** 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂� */
datasource.setMaxWait(maxWait);
+
+ /** 閰嶇疆椹卞姩杩炴帴瓒呮椂鏃堕棿锛屾娴嬫暟鎹簱寤虹珛杩炴帴鐨勮秴鏃舵椂闂达紝鍗曚綅鏄绉� */
+ datasource.setConnectTimeout(connectTimeout);
+
+ /** 閰嶇疆缃戠粶瓒呮椂鏃堕棿锛岀瓑寰呮暟鎹簱鎿嶄綔瀹屾垚鐨勭綉缁滆秴鏃舵椂闂达紝鍗曚綅鏄绉� */
+ datasource.setSocketTimeout(socketTimeout);
/** 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣 */
datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
--
Gitblit v1.9.3