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/controller/TmsDispatchOrderController.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 52 insertions(+), 1 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 de9eb14..2249048 100644
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
+++ b/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
@@ -1,9 +1,13 @@
 package com.ruoyi.tms.controller;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.tms.domain.TmsDriverDispatch;
+import com.ruoyi.tms.domain.vo.TmsDispatchOrderImport;
+import com.ruoyi.tms.domain.vo.YpdddjDispatchOrderVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,6 +27,7 @@
 import com.ruoyi.tms.service.ITmsDispatchOrderService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 璋冨害鍗曠鐞咰ontroller
@@ -55,7 +60,9 @@
     public TableDataInfo costList(TmsDispatchOrder tmsDispatchOrder)
     {
         startPage();
-        tmsDispatchOrder.setInStatusList(Arrays.asList(2,3,4,6,7,8,9));
+        if (tmsDispatchOrder.getInStatusList() == null || tmsDispatchOrder.getInStatusList().isEmpty()){
+            tmsDispatchOrder.setInStatusList(Arrays.asList(2,3,4,6,7,8,9));
+        }
         List<TmsDispatchOrder> list = tmsDispatchOrderService.selectTmsDispatchOrderList(tmsDispatchOrder);
         return getDataTable(list);
     }
@@ -74,7 +81,23 @@
     }
 
 
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate(String exportKey)
+    {
+        tmsDispatchOrderService.importTemplate(exportKey);
+        return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
 
+    }
+    @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        ExcelUtil<TmsDispatchOrderImport> util = new ExcelUtil<TmsDispatchOrderImport>(TmsDispatchOrderImport.class);
+        List<TmsDispatchOrderImport> list = util.importExcel(file.getInputStream());
+        String message = tmsDispatchOrderService.importData(list);
+        return success(message);
+
+    }
     /**
      * 鑾峰彇璋冨害鍗曠鐞嗚缁嗕俊鎭�
      */
@@ -110,12 +133,24 @@
     {
         return tmsDispatchOrderService.dropHook(id);
     }
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:close')")
+    @GetMapping(value = "/checkCloseOrder/{id}")
+    public AjaxResult checkCloseOrder(@PathVariable("id") Integer id)
+    {
+        return tmsDispatchOrderService.close(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:close')")
+    @PostMapping(value = "/closeOrder")
+    public AjaxResult closeOrder(@RequestBody TmsDispatchOrder order)
+    {
+        return tmsDispatchOrderService.closeOrder(order);
     }
 
     @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:customsOrder')")
@@ -153,6 +188,22 @@
         return toAjax(tmsDispatchOrderService.updateTmsDispatchOrder(tmsDispatchOrder));
     }
 
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:edit')")
+    @Log(title = "璋冨害鍗曠鐞�", businessType = BusinessType.UPDATE)
+    @PutMapping("/ypdddj")
+    public AjaxResult ypdddj(@RequestBody YpdddjDispatchOrderVo dispatchOrderVo)
+    {
+        return toAjax(tmsDispatchOrderService.updateTmsDispatchOrder(dispatchOrderVo));
+    }
+
+    @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:edit')")
+    @Log(title = "璋冨害鍗曟墦鍗�", businessType = BusinessType.UPDATE)
+    @PostMapping("printDispatchOrder")
+    public AjaxResult printDispatchOrder(@RequestBody TmsDispatchOrder tmsDispatchOrder)
+    {
+        return toAjax(tmsDispatchOrderService.printDispatchOrder(tmsDispatchOrder));
+    }
+
     /**
      * 鍒犻櫎璋冨害鍗曠鐞�
      */

--
Gitblit v1.8.0