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/TmsDispatchOrderServiceImpl.java

@@ -543,7 +543,7 @@
                    // 出发路线 44,4404,440402,440402102
                    String shipperRegionCode = tmsDispatchOrder.getStartRegionCode();
                    // 目的地路线 81,8100,810000
                    String receiverRegionCode = tmsDispatchOrder.getReceiverRegionCode();
                    String receiverRegionCode = tmsDispatchOrder.getEndRegionCode();

                    // 查询应收规则
                    TmsQuoteDetail tmsQuoteDetail = tmsQuoteDetailMapper.selectOne(new LambdaQueryWrapper<TmsQuoteDetail>()
@@ -673,7 +673,7 @@
                    // 出发路线 44,4404,440402,440402102
                    String shipperRegionCode = tmsDispatchOrder.getStartRegionCode();
                    // 目的地路线 81,8100,810000
                    String receiverRegionCode = tmsDispatchOrder.getReceiverRegionCode();
                    String receiverRegionCode = tmsDispatchOrder.getEndRegionCode();

                    // 查询应收规则
                    TmsQuoteDetail tmsQuoteDetail = tmsQuoteDetailMapper.selectOne(new LambdaQueryWrapper<TmsQuoteDetail>()