From 939ee5a461a64b40b23d2b5f51c69dead13ee7e3 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 30 十二月 2025 23:21:03 +0800
Subject: [PATCH] 提交
---
tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 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..d0ac186 100644
--- a/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
+++ b/tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java
@@ -55,7 +55,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);
}
@@ -110,12 +112,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')")
@@ -186,17 +200,25 @@
{
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