From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..6c01dea 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -6,8 +6,8 @@
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鎺ュ彛
@@ -28,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);
@@ -66,6 +68,9 @@
*/
public void export(TmsDispatchOrder tmsDispatchOrder, String exportKey) ;
+ public String importData(List<TmsDispatchOrderImport> list);
+ public void importTemplate( String exportKey) ;
+
/**
* 鏂板璋冨害鍗曠鐞�
@@ -90,6 +95,8 @@
* @return 缁撴灉
*/
public int updateTmsDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
+ public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo);
+ public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder);
/**
* 淇敼璋冨害鍗曠鐞哰鎵归噺]
@@ -126,7 +133,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 +142,6 @@
List<DpDriverDispatchVo> selectDpData();
DpDriverDispatchItemVo selectDataByNo(String no);
+
+ List<DpItineraryLogVo> selectItineraryLog();
}
--
Gitblit v1.8.0