From 3d3fa72ebf55f841c8ede01c59347af5e44b773b Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/controller/EstimatedReceivableBillController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/EstimatedReceivableBillController.java b/service/src/main/java/com/ruoyi/cwgl/controller/EstimatedReceivableBillController.java
index 1e0150e..42305de 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/EstimatedReceivableBillController.java
+++ b/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));
+ }
+
}
--
Gitblit v1.8.0