From ca412ade3b178fbc8ba0a4b6215a040acdede954 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 09 十二月 2025 10:29:47 +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 | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 3796580..6acd6c1 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java
@@ -5,6 +5,8 @@
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;
+
/**
* 璋冨害鍗曠鐞哠ervice鎺ュ彛
*
@@ -23,6 +25,19 @@
public AjaxResult confirmOrder(Integer id);
public AjaxResult copyOrder(Integer id);
public AjaxResult okOrder(Integer id);
+ public AjaxResult dropHook(Integer id);
+ public AjaxResult connectHang(TmsDriverDispatch driverDispatch);
+ public int customsOrder(TmsDispatchOrder tmsDispatchOrder);
+ public int loadingOrder(TmsDispatchOrder tmsDispatchOrder);
+
+
+ /**
+ * 琚寚娲捐绋嬪垪琛�
+ * @return
+ */
+ public AjaxResult assignedItineraryList();
+ public AjaxResult assignedItineraryLogList();
+ public AjaxResult selectAssignedItineraryDetail(Integer dispatchId);
/**
* 鏌ヨ璋冨害鍗曠鐞� 璁板綍鏁�
@@ -97,6 +112,7 @@
*/
public int deleteTmsDispatchOrderByIds(Integer[] ids);
+
/**
* 鍒犻櫎璋冨害鍗曠鐞嗕俊鎭�
*
@@ -104,4 +120,8 @@
* @return 缁撴灉
*/
public int deleteTmsDispatchOrderById(Integer id);
+
+
+ public List<TmsDispatchOrder> initGenerate(List<Integer> ids);
+ public AjaxResult generateTmsDispatchOrder(List<Integer> ids);
}
--
Gitblit v1.8.0