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

zhangback

2025-12-29 13796df077a2ccba587667e233f7cb48ea6c73b6

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java

@@ -19,6 +19,7 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.ISystemDataNoService;
import com.ruoyi.tms.domain.*;
import com.ruoyi.tms.domain.vo.DpDriverDispatchVo;
import com.ruoyi.tms.domain.vo.DriverDispatchVo;
import com.ruoyi.tms.domain.vo.ServiceProviderVo;
import com.ruoyi.tms.mapper.*;
@@ -676,14 +677,25 @@
                    String receiverRegionCode = tmsDispatchOrder.getEndRegionCode();

                    // 查询应收规则
                    TmsQuoteDetail tmsQuoteDetail = tmsQuoteDetailMapper.selectOne(new LambdaQueryWrapper<TmsQuoteDetail>()
                            .eq(TmsQuoteDetail::getVehicleProviderId, vehicleProviderId)
                            .eq(TmsQuoteDetail::getVehicleType, actualVehicleType)
                            .eq(TmsQuoteDetail::getStartRegionCode, shipperRegionCode)
                            .eq(TmsQuoteDetail::getEndRegionCode, receiverRegionCode)
                            .eq(TmsQuoteDetail::getPlanType, 1)
                            .last("limit 1")
                    );
                    TmsQuoteDetail tmsQuoteDetail =
                            tmsQuoteDetailMapper.selectOne(
                                    new LambdaQueryWrapper<TmsQuoteDetail>()
                                            .eq(TmsQuoteDetail::getVehicleType, actualVehicleType)
                                            .eq(TmsQuoteDetail::getStartRegionCode, shipperRegionCode)
                                            .eq(TmsQuoteDetail::getEndRegionCode, receiverRegionCode)
                                            .eq(TmsQuoteDetail::getPlanType, 1)
                                            .exists(
                                                    "SELECT 1 " +
                                                            "FROM tms_quote_plan tqp " +
                                                            "WHERE tqp.id = tms_quote_detail.quote_plan_id " +
                                                            "AND tqp.provider_id = {0} " +
                                                            "AND tqp.plan_type = 1 " +
                                                            "AND tqp.provider_type = 0",
                                                    vehicleProviderId
                                            )
                                            .last("LIMIT 1")
                            );




@@ -1041,4 +1053,9 @@
        }
        return AjaxResult.success();
    }

    @Override
    public List<DpDriverDispatchVo> selectDpData() {
        return tmsDispatchOrderMapper.selectselectDpData();
    }
}