From 13796df077a2ccba587667e233f7cb48ea6c73b6 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 29 十二月 2025 16:59:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
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 aaef49c..64cef04 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
@@ -160,9 +160,17 @@
if (tmsDriver == null){
throw new RuntimeException("鏈壘鍒板徃鏈烘暟鎹�");
}
-
-
- tmsDispatchOrder.setStatus(2);
+ Integer status = tmsDispatchOrder.getStatus();
+ if (status == 1){
+ tmsDispatchOrder.setStatus(2);
+ }
+ if (tmsTrip.getTripType() == 8 || tmsTrip.getTripType() == 100){
+ if (status == 2){
+ tmsDispatchOrder.setStatus(3);
+ tmsDispatchOrder.setOkTime(DateUtils.getNowDate());
+ tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
+ }
+ }
tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
tmsTrip.setDriverName(tmsDispatchOrder.getMainDriverName());
tmsTrip.setVehicleId(tmsDispatchOrder.getVehicleId());
--
Gitblit v1.8.0