From 06e621b20868b97ca7a7f9c63df2f160a827bf6a Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期四, 20 十一月 2025 20:36:10 +0800
Subject: [PATCH] 提交

---
 tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java |    7 ++++---
 1 files changed, 4 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 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())

--
Gitblit v1.8.0