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

sen

2025-08-18 155d0cb16d9549c701d9ad59e519a7fc5bc899a2

 service/src/main/java/com/ruoyi/cwgl/controller/EstimatedReceivableBillController.java

@@ -94,6 +94,27 @@
    {
        return toAjax(estimatedReceivableBillService.updateEstimatedReceivableBill(estimatedReceivableBill));
    }
    /**
     * 修改预估应收账单
     */
    @PreAuthorize("@ss.hasPermi('cwgl:estimatedReceivableBill:edit')")
    @Log(title = "预估应收账单", businessType = BusinessType.UPDATE)
    @PutMapping("name")
    public AjaxResult name(@RequestBody EstimatedReceivableBill estimatedReceivableBill)
    {
        return toAjax(estimatedReceivableBillService.updateEstimatedReceivableBillName(estimatedReceivableBill));
    }

    /**
     * 修改预估应收账单
     */
    @PreAuthorize("@ss.hasPermi('cwgl:estimatedReceivableBill:settlement')")
    @Log(title = "预估应收账单", businessType = BusinessType.UPDATE)
    @PostMapping("settlement")
    public AjaxResult settlement(@RequestBody EstimatedReceivableBill estimatedReceivableBill)
    {
        return toAjax(estimatedReceivableBillService.settlement(estimatedReceivableBill));
    }

    /**
     * 删除预估应收账单
@@ -105,4 +126,16 @@
    {
        return toAjax(estimatedReceivableBillService.deleteEstimatedReceivableBillByIds(ids));
    }

    /**
     * 取消关联
     * @param id
     * @return
     */
    @GetMapping("cancel/relevancy/{id}")
    public AjaxResult cancelRelevancy(@PathVariable("id") Integer id)
    {
        return toAjax(estimatedReceivableBillService.cancelRelevancy(id));
    }

}