From e1555cbadf7c6bd0f357f6d7bfe5b8d42404411a Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 16 十二月 2025 17:17:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java |  102 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 102 insertions(+), 0 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java b/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
index f185b9b..de9eb14 100644
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
+++ b/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
@@ -1,6 +1,9 @@
 package com.ruoyi.tms.controller;
 
+import java.util.Arrays;
 import java.util.List;
+
+import com.ruoyi.tms.domain.TmsDriverDispatch;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,6 +50,15 @@
         List<TmsDispatchOrder> list = tmsDispatchOrderService.selectTmsDispatchOrderList(tmsDispatchOrder);
         return getDataTable(list);
     }
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:list')")
+    @GetMapping("/costList")
+    public TableDataInfo costList(TmsDispatchOrder tmsDispatchOrder)
+    {
+        startPage();
+        tmsDispatchOrder.setInStatusList(Arrays.asList(2,3,4,6,7,8,9));
+        List<TmsDispatchOrder> list = tmsDispatchOrderService.selectTmsDispatchOrderList(tmsDispatchOrder);
+        return getDataTable(list);
+    }
 
     /**
      * 瀵煎嚭璋冨害鍗曠鐞嗗垪琛�
@@ -71,6 +83,52 @@
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
         return AjaxResult.success(tmsDispatchOrderService.selectTmsDispatchOrderById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:confirmOrder')")
+    @GetMapping(value = "/confirmOrder/{id}")
+    public AjaxResult confirmOrder(@PathVariable("id") Integer id)
+    {
+        return tmsDispatchOrderService.confirmOrder(id);
+    }
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:copyOrder')")
+    @GetMapping(value = "/copyOrder/{id}")
+    public AjaxResult copyOrder(@PathVariable("id") Integer id)
+    {
+        return tmsDispatchOrderService.copyOrder(id);
+    }
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:okOrder')")
+    @GetMapping(value = "/okOrder/{id}")
+    public AjaxResult okOrder(@PathVariable("id") Integer id)
+    {
+        return tmsDispatchOrderService.okOrder(id);
+    }
+
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:dropHook')")
+    @GetMapping(value = "/dropHook/{id}")
+    public AjaxResult dropHook(@PathVariable("id") Integer id)
+    {
+        return tmsDispatchOrderService.dropHook(id);
+    }
+
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:connectHang')")
+    @PostMapping(value = "/connectHang")
+    public AjaxResult connectHang(@RequestBody TmsDriverDispatch driverDispatch)
+    {
+        return tmsDispatchOrderService.connectHang(driverDispatch);
+    }
+
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:customsOrder')")
+    @PostMapping(value = "/customsOrder")
+    public AjaxResult customsOrder(@RequestBody TmsDispatchOrder tmsDispatchOrder)
+    {
+        return toAjax(tmsDispatchOrderService.customsOrder(tmsDispatchOrder));
+    }
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:loadingOrder')")
+    @PostMapping(value = "/loadingOrder")
+    public AjaxResult loadingOrder(@RequestBody TmsDispatchOrder tmsDispatchOrder)
+    {
+        return toAjax(tmsDispatchOrderService.loadingOrder(tmsDispatchOrder));
     }
 
     /**
@@ -105,4 +163,48 @@
     {
         return toAjax(tmsDispatchOrderService.deleteTmsDispatchOrderByIds(ids));
     }
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:generate')")
+    @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.OTHER)
+	@GetMapping("/initGenerate/{ids}")
+    public AjaxResult initGenerate(@PathVariable Integer[] ids)
+    {
+        return AjaxResult.success(tmsDispatchOrderService.initGenerate(Arrays.asList(ids)));
+    }
+
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:generate')")
+    @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.OTHER)
+	@GetMapping("/initYSGenerate/{ids}")
+    public AjaxResult initYSGenerate(@PathVariable Integer[] ids)
+    {
+        return AjaxResult.success(tmsDispatchOrderService.initYSGenerate(Arrays.asList(ids)));
+    }
+
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:generate')")
+    @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.OTHER)
+	@GetMapping("/initYFGenerate/{ids}")
+    public AjaxResult initYFGenerate(@PathVariable Integer[] ids)
+    {
+        return AjaxResult.success(tmsDispatchOrderService.initYFGenerate(Arrays.asList(ids)));
+    }
+    @GetMapping("/generateTmsDispatchOrder/{ids}")
+    public AjaxResult generateTmsDispatchOrder(@PathVariable Integer[] ids){
+        return tmsDispatchOrderService.generateTmsDispatchOrder(Arrays.asList(ids));
+    }
+    @Log(title = "鐢熸垚搴旀敹璐﹀崟", businessType = BusinessType.OTHER)
+    @GetMapping("/ysGenerateTmsDispatchOrder/{ids}")
+    public AjaxResult ysGenerateTmsDispatchOrder(@PathVariable Integer[] ids){
+        return tmsDispatchOrderService.ysGenerateTmsDispatchOrder(Arrays.asList(ids));
+    }
+    @Log(title = "鐢熸垚搴斾粯璐﹀崟", businessType = BusinessType.OTHER)
+    @GetMapping("/yfGenerateTmsDispatchOrder/{ids}")
+    public AjaxResult yfGenerateTmsDispatchOrder(@PathVariable Integer[] ids){
+        return tmsDispatchOrderService.yfGenerateTmsDispatchOrder(Arrays.asList(ids));
+    }
+
+    @GetMapping("/getServiceProvider/{orderId}")
+    public AjaxResult getServiceProvider(@PathVariable Integer orderId){
+        return tmsDispatchOrderService.getServiceProvider(orderId);
+    }
+
+
 }

--
Gitblit v1.8.0