From 3479ad5223c328be72a2b26ab66f9aeee64ec4b5 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 18 十一月 2025 17:40:30 +0800
Subject: [PATCH] 提交
---
admin/config/prod/application-custom.yml | 3 +
admin/config/test/application-custom.yml | 3 +
admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 6 +-
ui/admin-ui3/src/views/tms/otherTmsFinance/index.vue | 5 +-
ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue | 25 +++++++-----
system/src/main/java/com/ruoyi/system/service/impl/SystemDataNoServiceImpl.java | 2
ui/admin-ui3/src/views/tms/paymentTmsFinance/index.vue | 5 +-
admin/src/main/resources/application-custom.yml | 5 ++
tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java | 5 ++
ui/admin-ui3/src/views/tms/collectionTmsFinance/index.vue | 5 +-
ui/admin-ui3/src/views/tms/tmsQuoteDetail/index.vue | 2
tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java | 7 ++-
12 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/admin/config/prod/application-custom.yml b/admin/config/prod/application-custom.yml
index f31bd19..a8fba4d 100644
--- a/admin/config/prod/application-custom.yml
+++ b/admin/config/prod/application-custom.yml
@@ -1,4 +1,7 @@
custom:
+ serialNumber:
+ cache:
+ enabled: true
#鏈嶅姟 鐩稿叧閰嶇疆
server:
name: 绠＄悊绯荤粺 鏈湴鐜
diff --git a/admin/config/test/application-custom.yml b/admin/config/test/application-custom.yml
index 20e04ea..6536c7d 100644
--- a/admin/config/test/application-custom.yml
+++ b/admin/config/test/application-custom.yml
@@ -1,4 +1,7 @@
custom:
+ serialNumber:
+ cache:
+ enabled: true
#鏈嶅姟 鐩稿叧閰嶇疆
server:
name: 绠＄悊绯荤粺 娴嬭瘯鐜
diff --git a/admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index cacdb9f..d4ac2ba 100644
--- a/admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -140,9 +140,9 @@
String url = networkPath + fileName;
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
stringObjectHashMap.put("url", url);
- stringObjectHashMap.put("fileName", fileName);
- stringObjectHashMap.put("newFileName", FileUtils.getName(fileName));
- stringObjectHashMap.put("originalFilename", file.getOriginalFilename());
+ stringObjectHashMap.put("name", FileUtils.getName(fileName));
+// stringObjectHashMap.put("newFileName", FileUtils.getName(fileName));
+// stringObjectHashMap.put("originalFilename", file.getOriginalFilename());
AjaxResult ajax = AjaxResult.success(stringObjectHashMap);
return ajax;
diff --git a/admin/src/main/resources/application-custom.yml b/admin/src/main/resources/application-custom.yml
index 185e5fc..af81639 100644
--- a/admin/src/main/resources/application-custom.yml
+++ b/admin/src/main/resources/application-custom.yml
@@ -1,4 +1,7 @@
custom:
+ serialNumber:
+ cache:
+ enabled: true
#鏈嶅姟 鐩稿叧閰嶇疆
server:
name: 绠＄悊绯荤粺 鏈湴鐜
@@ -20,7 +23,7 @@
multipart:
max-file-size: 2GB # 鍗曚釜鏂囦欢澶у皬
max-request-size: 2GB # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- network-path: "/dev-api/"
+ network-path: "http://localhost:8081/dev-api"
#鏃ュ織 鐩稿叧閰嶇疆
logback:
path: logs/ #鏃ュ織鐩綍
diff --git a/system/src/main/java/com/ruoyi/system/service/impl/SystemDataNoServiceImpl.java b/system/src/main/java/com/ruoyi/system/service/impl/SystemDataNoServiceImpl.java
index 01b1867..3020770 100644
--- a/system/src/main/java/com/ruoyi/system/service/impl/SystemDataNoServiceImpl.java
+++ b/system/src/main/java/com/ruoyi/system/service/impl/SystemDataNoServiceImpl.java
@@ -62,7 +62,7 @@
log.info("{}杩涘叆", Thread.currentThread().getName());
Integer serial = getOrInitSerialNumber(fullKey, baseNo, dayKey);
- redisCache.setCacheObject(fullKey, serial, 1000, TimeUnit.DAYS);
+ redisCache.setCacheObject(fullKey, serial, 1, TimeUnit.DAYS);
return formatSerialNumber(fullKey, serial);
} catch (InterruptedException e) {
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
index 0fb6e6b..44ad3ed 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
@@ -168,6 +168,11 @@
.eq(TmsDriverDispatch::getDriverId, tmsDispatchOrder.getMainDriverId())
.set(TmsDriverDispatch::getStatus, 1)
);
+
+ tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
+ .set(TmsDispatchOrder::getStatus, 6)
+ );
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
index 100a799..0f12827 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
@@ -162,13 +162,13 @@
if (tmsDispatchOrder == null){
throw new RuntimeException("鏈壘鍒拌皟搴﹀崟鏁版嵁");
}
- if (tmsDispatchOrder.getStatus() != 1 && tmsDispatchOrder.getStatus() != 2){
+ if (tmsDispatchOrder.getStatus() != 6){
throw new RuntimeException("璋冨害鍗曟暟鎹姸鎬佸紓甯�");
}
tmsDispatchOrderMapper.update(
new LambdaUpdateWrapper<TmsDispatchOrder>()
.eq(TmsDispatchOrder::getId, dispatchOrderId)
- .set(TmsDispatchOrder::getStatus, 2)
+ .set(TmsDispatchOrder::getStatus, 7)
.set(TmsDispatchOrder::getMainDriverId, null)
.set(TmsDispatchOrder::getMainDriverName, null)
.set(TmsDispatchOrder::getVehicleId, null)
@@ -196,7 +196,7 @@
if (tmsDispatchOrder == null){
throw new RuntimeException("鏈壘鍒拌皟搴﹀崟鏁版嵁");
}
- if (tmsDispatchOrder.getStatus() != 1 && tmsDispatchOrder.getStatus() != 2){
+ if (tmsDispatchOrder.getStatus() != 7){
throw new RuntimeException("璋冨害鍗曟暟鎹姸鎬佸紓甯�");
}
Integer driverId = tmsTrip.getDriverId();
@@ -216,6 +216,7 @@
tmsDispatchOrderMapper.update(
new LambdaUpdateWrapper<TmsDispatchOrder>()
.eq(TmsDispatchOrder::getId, dispatchOrderId)
+ .set(TmsDispatchOrder::getStatus, 2)
.set(TmsDispatchOrder::getMainDriverId, tmsDriver.getId())
.set(TmsDispatchOrder::getMainDriverName, tmsDriver.getDriverName())
.set(TmsDispatchOrder::getVehicleId, tmsVehicle.getId())
diff --git a/ui/admin-ui3/src/views/tms/collectionTmsFinance/index.vue b/ui/admin-ui3/src/views/tms/collectionTmsFinance/index.vue
index a9db3e4..f032ab5 100644
--- a/ui/admin-ui3/src/views/tms/collectionTmsFinance/index.vue
+++ b/ui/admin-ui3/src/views/tms/collectionTmsFinance/index.vue
@@ -273,8 +273,9 @@
type: 'upload',
action: '/common/upload2',
propsHttp:{
- home:'url',
- name:'newFileName',
+ url: 'url',
+ name: 'name',
+ res: 'data',
},
},
feeCreateTime: {
diff --git a/ui/admin-ui3/src/views/tms/otherTmsFinance/index.vue b/ui/admin-ui3/src/views/tms/otherTmsFinance/index.vue
index e087a35..b80319e 100644
--- a/ui/admin-ui3/src/views/tms/otherTmsFinance/index.vue
+++ b/ui/admin-ui3/src/views/tms/otherTmsFinance/index.vue
@@ -277,8 +277,9 @@
type: 'upload',
action: '/common/upload2',
propsHttp:{
- home:'url',
- name:'newFileName',
+ url: 'url',
+ name: 'name',
+ res: 'data',
},
},
feeCreateTime: {
diff --git a/ui/admin-ui3/src/views/tms/paymentTmsFinance/index.vue b/ui/admin-ui3/src/views/tms/paymentTmsFinance/index.vue
index a5f8c78..fa00158 100644
--- a/ui/admin-ui3/src/views/tms/paymentTmsFinance/index.vue
+++ b/ui/admin-ui3/src/views/tms/paymentTmsFinance/index.vue
@@ -273,8 +273,9 @@
type: 'upload',
action: '/common/upload2',
propsHttp:{
- home:'url',
- name:'newFileName',
+ url: 'url',
+ name: 'name',
+ res: 'data',
},
},
feeCreateTime: {
diff --git a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
index f1a5cdd..5858882 100644
--- a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
@@ -1574,8 +1574,9 @@
type: 'upload',
action: '/common/upload2',
propsHttp:{
- home:'url',
- name:'newFileName',
+ url: 'url',
+ name: 'name',
+ res: 'data',
},
},
dataSource: {
@@ -1629,13 +1630,13 @@
voucherUrl: {
label: '琛岀▼鍑瘉',
display: true,
- span: 24,
- accept:'string',dataType: 'string',
+ span: 24,dataType: 'string',
type: 'upload',
action: '/common/upload2',
propsHttp:{
- home:'url',
- name:'newFileName',
+ url: 'url',
+ name: 'name',
+ res: 'data',
},
},
@@ -1676,8 +1677,9 @@
type: 'upload',
action: '/common/upload2',
propsHttp:{
- home:'url',
- name:'newFileName',
+ url: 'url',
+ name: 'name',
+ res: 'data',
},
},
dataSource: {
@@ -1723,12 +1725,13 @@
label: '璐圭敤鍑瘉',
display: true,
span: 24,
- accept:'string',dataType: 'string',
+ accept:'string',dataType: 'object',
type: 'upload',
action: '/common/upload2',
propsHttp:{
- home:'url',
- name:'newFileName',
+ url: 'url',
+ name: 'name',
+ res: 'data',
},
},
diff --git a/ui/admin-ui3/src/views/tms/tmsQuoteDetail/index.vue b/ui/admin-ui3/src/views/tms/tmsQuoteDetail/index.vue
index 093344b..af6036d 100644
--- a/ui/admin-ui3/src/views/tms/tmsQuoteDetail/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsQuoteDetail/index.vue
@@ -528,7 +528,7 @@
vehicleType: {
label: '杞﹀瀷',
display: false,minWidth:150,
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/license_type',
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/vehicle_type',
search: true,
},
transportMode: {
--
Gitblit v1.8.0