From 34669fa71bd2cc4a4ff57d7d2440a95da998b6b5 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 30 三月 2026 15:47:55 +0800
Subject: [PATCH] 修改异步
---
tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 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 71c65e2..5e30f2d 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')")
@@ -152,6 +187,32 @@
{
return toAjax(tmsDispatchOrderService.updateTmsDispatchOrder(tmsDispatchOrder));
}
+ /**
+ * 濉啓瀹為檯杩愯緭璁板綍
+ */
+ @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:edit')")
+ @Log(title = "濉啓瀹為檯杩愯緭璁板綍", businessType = BusinessType.UPDATE)
+ @PutMapping("/record")
+ public AjaxResult record(@RequestBody TmsDispatchOrder tmsDispatchOrder)
+ {
+ 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));
+ }
/**
* 鍒犻櫎璋冨害鍗曠鐞�
@@ -186,17 +247,35 @@
{
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);
+ }
+
+ /**
+ * 鏍规嵁鍙告満鍚嶇О鏌ヨ涓婁竴娆￠┚椹剁殑杞︾墝鍙�
+ */
+ @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:query')")
+ @GetMapping("/getLastLicensePlate/{driverName}")
+ public AjaxResult getLastLicensePlate(@PathVariable String driverName){
+ TmsDispatchOrder tmsDispatchOrder= tmsDispatchOrderService.getLastLicensePlateByDriverName(driverName);
+ return AjaxResult.success(tmsDispatchOrder);
+ }
+
+
}
--
Gitblit v1.8.0