From e4e02918457df9368c9a06baa42149b3dbe65adf Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 13 三月 2026 10:00:39 +0800
Subject: [PATCH] 新增日志和前后端
---
tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java | 28 ++++++++++++++++------------
1 files changed, 16 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 56b1df0..648d78d 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -6,13 +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.DpDriverDispatchItemVo;
-import com.ruoyi.tms.domain.vo.DpDriverDispatchVo;
-import com.ruoyi.tms.domain.vo.DpItineraryLogVo;
+import com.ruoyi.tms.domain.TmsPayableFee;
+import com.ruoyi.tms.domain.vo.*;
/**
* 璋冨害鍗曠鐞哠ervice鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2025-11-04
*/
@@ -20,7 +19,7 @@
{
/**
* 鏌ヨ璋冨害鍗曠鐞�
- *
+ *
* @param id 璋冨害鍗曠鐞咺D
* @return 璋冨害鍗曠鐞�
*/
@@ -54,7 +53,7 @@
/**
* 鏌ヨ璋冨害鍗曠鐞嗗垪琛�
- *
+ *
* @param tmsDispatchOrder 璋冨害鍗曠鐞�
* @return 璋冨害鍗曠鐞嗛泦鍚�
*/
@@ -69,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);
/**
* 鏂板璋冨害鍗曠鐞哰鎵归噺]
*
@@ -88,11 +90,13 @@
/**
* 淇敼璋冨害鍗曠鐞�
- *
+ *
* @param tmsDispatchOrder 璋冨害鍗曠鐞�
* @return 缁撴灉
*/
public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
+ public int updateTmsDispatchOrder2(TmsDispatchOrder tmsDispatchOrder);
+ public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo);
public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
/**
@@ -104,7 +108,7 @@
public int updateTmsDispatchOrderBatch(List<TmsDispatchOrder> tmsDispatchOrders);
/**
* 鎵归噺鍒犻櫎璋冨害鍗曠鐞�
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
* @return 缁撴灉
*/
@@ -121,7 +125,7 @@
/**
* 鍒犻櫎璋冨害鍗曠鐞嗕俊鎭�
- *
+ *
* @param id 璋冨害鍗曠鐞咺D
* @return 缁撴灉
*/
@@ -130,7 +134,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);
--
Gitblit v1.8.0