From c11e6f07b031eea6c7de4c5508b8dbf0ee01d2c7 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 01 四月 2026 10:08:08 +0800
Subject: [PATCH] 去除不同报价方案，不能添加相同【客户-路线-车型】数据

---
 tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 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 971b748..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,20 +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.TmsPayableFee;
-import com.ruoyi.tms.domain.vo.DpDriverDispatchItemVo;
-import com.ruoyi.tms.domain.vo.DpDriverDispatchVo;
-import com.ruoyi.tms.domain.vo.DpItineraryLogVo;
-import com.ruoyi.tms.domain.vo.TmsDispatchOrderImport;
+import com.ruoyi.tms.domain.vo.*;
 
 /**
  * 璋冨害鍗曠鐞哠ervice鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2025-11-04
  */
@@ -22,7 +20,7 @@
 {
     /**
      * 鏌ヨ璋冨害鍗曠鐞�
-     * 
+     *
      * @param id 璋冨害鍗曠鐞咺D
      * @return 璋冨害鍗曠鐞�
      */
@@ -44,6 +42,7 @@
      */
     public AjaxResult assignedItineraryList();
     public AjaxResult assignedItineraryLogList();
+    public Map<String, Object> assignedItineraryLogListPage(Integer pageNum, Integer pageSize);
     public AjaxResult selectAssignedItineraryDetail(Integer dispatchId);
 
     /**
@@ -56,7 +55,7 @@
 
     /**
      * 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
-     * 
+     *
      * @param tmsDispatchOrder 璋冨害鍗曠鐞�
      * @return 璋冨害鍗曠鐞嗛泦鍚�
      */
@@ -77,12 +76,12 @@
 
     /**
      * 鏂板璋冨害鍗曠鐞�
-     * 
+     *
      * @param tmsDispatchOrder 璋冨害鍗曠鐞�
      * @return 缁撴灉
      */
     public int insertTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
-
+    public int insertTmsDispatchOrder2(TmsDispatchOrder tmsDispatchOrder);
     /**
      * 鏂板璋冨害鍗曠鐞哰鎵归噺]
      *
@@ -93,11 +92,13 @@
 
     /**
      * 淇敼璋冨害鍗曠鐞�
-     * 
+     *
      * @param tmsDispatchOrder 璋冨害鍗曠鐞�
      * @return 缁撴灉
      */
     public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
+    public int updateTmsDispatchOrder2(TmsDispatchOrder tmsDispatchOrder);
+    public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo);
     public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
 
     /**
@@ -109,7 +110,7 @@
     public int updateTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
     /**
      * 鎵归噺鍒犻櫎璋冨害鍗曠鐞�
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
      * @return 缁撴灉
      */
@@ -126,7 +127,7 @@
 
     /**
      * 鍒犻櫎璋冨害鍗曠鐞嗕俊鎭�
-     * 
+     *
      * @param id 璋冨害鍗曠鐞咺D
      * @return 缁撴灉
      */
@@ -146,4 +147,11 @@
     DpDriverDispatchItemVo selectDataByNo(String no);
 
     List<DpItineraryLogVo> selectItineraryLog();
+    
+    /**
+     * 鏍规嵁鍙告満鍚嶇О鏌ヨ涓婁竴娆￠┚椹剁殑杞︾墝鍙�
+     * @param driverName 鍙告満鍚嶇О
+     * @return 杞︾墝鍙�
+     */
+    public TmsDispatchOrder getLastLicensePlateByDriverName(String driverName);
 }

--
Gitblit v1.8.0