Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2025-12-18 db8e73b120963810d6febdb939612db12d26996e

 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);