From f5c2dc7a5a0f067910d4270a212e04031db3863f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 19 五月 2025 11:31:04 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after
---
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index 6fd4449..99a3ea2 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -23,9 +23,9 @@
* @param invoiceLedgerDto
* @return
*/
- @PostMapping("/add")
- public AjaxResult invoiceLedgerAdd(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
- invoiceLedgerService.invoiceLedgerAdd(invoiceLedgerDto);
+ @PostMapping("/saveOrUpdate")
+ public AjaxResult invoiceLedgerSaveOrUpdate(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
+ invoiceLedgerService.invoiceLedgerSaveOrUpdate(invoiceLedgerDto);
return AjaxResult.success();
}
@@ -35,19 +35,8 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult invoiceLedgerDel(@RequestParam List<Integer> ids) {
+ public AjaxResult invoiceLedgerDel(@RequestBody List<Integer> ids) {
invoiceLedgerService.invoiceLedgerDel(ids);
- return AjaxResult.success();
- }
-
- /**
- * 寮�绁ㄥ彴璐︿慨鏀�
- * @param invoiceLedgerDto
- * @return
- */
- @PostMapping("/update")
- public AjaxResult invoiceLedgerUpdate(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
- invoiceLedgerService.invoiceLedgerUpdate(invoiceLedgerDto);
return AjaxResult.success();
}
@@ -87,14 +76,60 @@
}
/**
- * 闄勪欢涓嬭浇
+ * 寮�绁ㄥ彴璐﹀鍑�
* @param response
* @param invoiceLedgerDto
* @return
*/
- @GetMapping("/downloadFile")
- public void invoiceLedgerDownloadFile(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
- invoiceLedgerService.invoiceLedgerDownload(response, invoiceLedgerDto);
+ @PostMapping("/export")
+ public void invoiceLedgerExport(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
+ invoiceLedgerService.invoiceLedgerExport(response, invoiceLedgerDto);
+ }
+
+ /**
+ * 寮�绁ㄥ彴璐﹁鎯�
+ * @param id
+ * @return
+ */
+ @GetMapping("/info")
+ public AjaxResult invoiceLedgerInfo(Integer id) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerDetail(id));
+ }
+
+ /**
+ * 鏂囦欢鎻愪氦
+ * @param invoiceLedgerDto
+ * @return
+ */
+ @PostMapping("/commitFile")
+ public AjaxResult invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
+ try {
+ invoiceLedgerService.invoiceLedgerCommitFile(invoiceLedgerDto);
+ return AjaxResult.success();
+ }catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 寮�绁ㄥ彴璐︽煡璇�
+ * @param invoiceLedgerDto
+ * @return
+ */
+ @GetMapping("/list")
+ public AjaxResult invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
+ }
+
+ /**
+ * 瀹㈡埛閿�鍞褰�
+ * @param page
+ * @param invoiceLedgerDto
+ * @return
+ */
+ @GetMapping("/salesAccount")
+ public AjaxResult invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
}
}
--
Gitblit v1.9.3