From 073d2fa1d86fcb998bc27e79cdc3773da7ed8b2b Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 16:37:35 +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 |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 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 1c09655..be07c44 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -6,11 +6,12 @@
 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;
+import com.ruoyi.tms.domain.TmsPayableFee;
+import com.ruoyi.tms.domain.vo.*;
 
 /**
  * 璋冨害鍗曠鐞哠ervice鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2025-11-04
  */
@@ -18,7 +19,7 @@
 {
     /**
      * 鏌ヨ璋冨害鍗曠鐞�
-     * 
+     *
      * @param id 璋冨害鍗曠鐞咺D
      * @return 璋冨害鍗曠鐞�
      */
@@ -27,7 +28,9 @@
     public AjaxResult copyOrder(Integer id);
     public AjaxResult okOrder(Integer id);
     public AjaxResult dropHook(Integer id);
+    public AjaxResult close(Integer id);
     public AjaxResult connectHang(TmsDriverDispatch driverDispatch);
+    public AjaxResult closeOrder(TmsDispatchOrder order);
     public int customsOrder(TmsDispatchOrder tmsDispatchOrder);
     public int loadingOrder(TmsDispatchOrder tmsDispatchOrder);
 
@@ -50,7 +53,7 @@
 
     /**
      * 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
-     * 
+     *
      * @param tmsDispatchOrder 璋冨害鍗曠鐞�
      * @return 璋冨害鍗曠鐞嗛泦鍚�
      */
@@ -65,15 +68,18 @@
      */
     public void export(TmsDispatchOrder tmsDispatchOrder, String exportKey) ;
 
+    public String importData(List<TmsDispatchOrderImport> list);
+    public void importTemplate( String exportKey) ;
+
 
     /**
      * 鏂板璋冨害鍗曠鐞�
-     * 
+     *
      * @param tmsDispatchOrder 璋冨害鍗曠鐞�
      * @return 缁撴灉
      */
     public int insertTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
-
+    public int insertTmsDispatchOrder2(TmsDispatchOrder tmsDispatchOrder);
     /**
      * 鏂板璋冨害鍗曠鐞哰鎵归噺]
      *
@@ -84,11 +90,13 @@
 
     /**
      * 淇敼璋冨害鍗曠鐞�
-     * 
+     *
      * @param tmsDispatchOrder 璋冨害鍗曠鐞�
      * @return 缁撴灉
      */
     public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
+    public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo);
+    public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
 
     /**
      * 淇敼璋冨害鍗曠鐞哰鎵归噺]
@@ -99,7 +107,7 @@
     public int updateTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
     /**
      * 鎵归噺鍒犻櫎璋冨害鍗曠鐞�
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
      * @return 缁撴灉
      */
@@ -116,7 +124,7 @@
 
     /**
      * 鍒犻櫎璋冨害鍗曠鐞嗕俊鎭�
-     * 
+     *
      * @param id 璋冨害鍗曠鐞咺D
      * @return 缁撴灉
      */
@@ -125,11 +133,15 @@
 
     public List<TmsDispatchOrder>  initGenerate(List<Integer> ids);
     public List<TmsDispatchOrder>  initYSGenerate(List<Integer> ids);
-    public List<TmsDispatchOrder>  initYFGenerate(List<Integer> ids);
+    public List<TmsPayableFee>  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);
 
-    DpDriverDispatchVo selectDpData();
+    List<DpDriverDispatchVo> selectDpData();
+
+    DpDriverDispatchItemVo selectDataByNo(String no);
+
+    List<DpItineraryLogVo> selectItineraryLog();
 }

--
Gitblit v1.8.0