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/ITmsDispatchOrderService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
index 6acd6c1..70d3f05 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -6,6 +6,7 @@
 import com.ruoyi.tms.domain.TmsDispatchOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.tms.domain.TmsDriverDispatch;
+import com.ruoyi.tms.domain.vo.DpDriverDispatchVo;
 
 /**
  * 璋冨害鍗曠鐞哠ervice鎺ュ彛
@@ -123,5 +124,12 @@
 
 
     public List<TmsDispatchOrder>  initGenerate(List<Integer> ids);
+    public List<TmsDispatchOrder>  initYSGenerate(List<Integer> ids);
+    public List<TmsDispatchOrder>  initYFGenerate(List<Integer> ids);
     public AjaxResult  generateTmsDispatchOrder(List<Integer> ids);
+    public AjaxResult  ysGenerateTmsDispatchOrder(List<Integer> ids);
+    public AjaxResult yfGenerateTmsDispatchOrder(List<Integer> ids);
+    public AjaxResult getServiceProvider(Integer id);
+
+    List<DpDriverDispatchVo> selectDpData();
 }

--
Gitblit v1.8.0