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 |    2 ++
 1 files changed, 2 insertions(+), 0 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 6a84d67..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
@@ -167,6 +167,8 @@
         if (tmsTrip.getTripType() == 8 || tmsTrip.getTripType() == 100){
             if (status == 2){
                 tmsDispatchOrder.setStatus(3);
+                tmsDispatchOrder.setOkTime(DateUtils.getNowDate());
+                tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
             }
         }
         tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);

--
Gitblit v1.8.0