提交

zhangback

2025-11-20 06e621b20868b97ca7a7f9c63df2f160a827bf6a

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