Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2025-12-16 e1555cbadf7c6bd0f357f6d7bfe5b8d42404411a

 tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java

@@ -50,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);
    }

    /**
     * 导出调度单管理列表
@@ -162,8 +171,40 @@
        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);
    }


}