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 | 24 +++++++++++++-----------
1 files changed, 13 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 fa46dd4..be07c44 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -7,13 +7,11 @@
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.*;
/**
* 璋冨害鍗曠鐞哠ervice鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2025-11-04
*/
@@ -21,7 +19,7 @@
{
/**
* 鏌ヨ璋冨害鍗曠鐞�
- *
+ *
* @param id 璋冨害鍗曠鐞咺D
* @return 璋冨害鍗曠鐞�
*/
@@ -55,7 +53,7 @@
/**
* 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
- *
+ *
* @param tmsDispatchOrder 璋冨害鍗曠鐞�
* @return 璋冨害鍗曠鐞嗛泦鍚�
*/
@@ -70,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);
/**
* 鏂板璋冨害鍗曠鐞哰鎵归噺]
*
@@ -89,11 +90,12 @@
/**
* 淇敼璋冨害鍗曠鐞�
- *
+ *
* @param tmsDispatchOrder 璋冨害鍗曠鐞�
* @return 缁撴灉
*/
public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
+ public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo);
public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
/**
@@ -105,7 +107,7 @@
public int updateTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
/**
* 鎵归噺鍒犻櫎璋冨害鍗曠鐞�
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
* @return 缁撴灉
*/
@@ -122,7 +124,7 @@
/**
* 鍒犻櫎璋冨害鍗曠鐞嗕俊鎭�
- *
+ *
* @param id 璋冨害鍗曠鐞咺D
* @return 缁撴灉
*/
--
Gitblit v1.8.0