From 54e07b96bd7fdae9915fcf06de2a16bcb613aa74 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 06 三月 2026 16:28:37 +0800
Subject: [PATCH] 新增备注日志
---
tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 153 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..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,6 +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;
@@ -20,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
@@ -47,6 +55,17 @@
List<TmsDispatchOrder> list = tmsDispatchOrderService.selectTmsDispatchOrderList(tmsDispatchOrder);
return getDataTable(list);
}
+ @PreAuthorize("@ss.hasPermi('tms:tmsDispatchOrder:list')")
+ @GetMapping("/costList")
+ public TableDataInfo costList(TmsDispatchOrder tmsDispatchOrder)
+ {
+ startPage();
+ 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);
+ }
/**
* 瀵煎嚭璋冨害鍗曠鐞嗗垪琛�
@@ -62,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);
+
+ }
/**
* 鑾峰彇璋冨害鍗曠鐞嗚缁嗕俊鎭�
*/
@@ -71,6 +106,64 @@
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: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')")
+ @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));
}
/**
@@ -95,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));
+ }
+
/**
* 鍒犻櫎璋冨害鍗曠鐞�
*/
@@ -105,4 +214,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