From 63e5d3ff1e5b37254e03cee5383532e2e47c9dea Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 31 三月 2026 17:03:33 +0800
Subject: [PATCH] 导出应收费用对账单

---
 tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 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 4966ab2..ac700d0 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -1,17 +1,18 @@
 package com.ruoyi.tms.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 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.DpDriverDispatchItemVo;
-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
  */
@@ -19,7 +20,7 @@
 {
     /**
      * 鏌ヨ璋冨害鍗曠鐞�
-     * 
+     *
      * @param id 璋冨害鍗曠鐞咺D
      * @return 璋冨害鍗曠鐞�
      */
@@ -28,7 +29,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);
 
@@ -39,6 +42,7 @@
      */
     public AjaxResult assignedItineraryList();
     public AjaxResult assignedItineraryLogList();
+    public Map<String, Object> assignedItineraryLogListPage(Integer pageNum, Integer pageSize);
     public AjaxResult selectAssignedItineraryDetail(Integer dispatchId);
 
     /**
@@ -51,7 +55,7 @@
 
     /**
      * 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
-     * 
+     *
      * @param tmsDispatchOrder 璋冨害鍗曠鐞�
      * @return 璋冨害鍗曠鐞嗛泦鍚�
      */
@@ -66,15 +70,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);
     /**
      * 鏂板璋冨害鍗曠鐞哰鎵归噺]
      *
@@ -85,11 +92,14 @@
 
     /**
      * 淇敼璋冨害鍗曠鐞�
-     * 
+     *
      * @param tmsDispatchOrder 璋冨害鍗曠鐞�
      * @return 缁撴灉
      */
     public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
+    public int updateTmsDispatchOrder2(TmsDispatchOrder tmsDispatchOrder);
+    public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo);
+    public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
 
     /**
      * 淇敼璋冨害鍗曠鐞哰鎵归噺]
@@ -100,7 +110,7 @@
     public int updateTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
     /**
      * 鎵归噺鍒犻櫎璋冨害鍗曠鐞�
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
      * @return 缁撴灉
      */
@@ -117,7 +127,7 @@
 
     /**
      * 鍒犻櫎璋冨害鍗曠鐞嗕俊鎭�
-     * 
+     *
      * @param id 璋冨害鍗曠鐞咺D
      * @return 缁撴灉
      */
@@ -126,7 +136,7 @@
 
     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);
@@ -135,4 +145,13 @@
     List<DpDriverDispatchVo> selectDpData();
 
     DpDriverDispatchItemVo selectDataByNo(String no);
+
+    List<DpItineraryLogVo> selectItineraryLog();
+    
+    /**
+     * 鏍规嵁鍙告満鍚嶇О鏌ヨ涓婁竴娆￠┚椹剁殑杞︾墝鍙�
+     * @param driverName 鍙告満鍚嶇О
+     * @return 杞︾墝鍙�
+     */
+    public TmsDispatchOrder getLastLicensePlateByDriverName(String driverName);
 }

--
Gitblit v1.8.0