From 1fd5eac12e532a9906e0c1d57676c692c68d1f32 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 20 五月 2025 17:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index ae7c5e7..650dbaa 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
+import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
+import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
+import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.service.InvoiceLedgerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,14 +22,17 @@
@Autowired
private InvoiceLedgerService invoiceLedgerService;
+ @Autowired
+ private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
/**
* 寮�绁ㄥ彴璐︽柊澧�
- * @param invoiceLedgerDto
+ * @param productDto
* @return
*/
@PostMapping("/saveOrUpdate")
- public AjaxResult invoiceLedgerSaveOrUpdate(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
- invoiceLedgerService.invoiceLedgerSaveOrUpdate(invoiceLedgerDto);
+ public AjaxResult invoiceLedgerSaveOrUpdate(@RequestBody InvoiceRegistrationProductDto productDto) {
+ invoiceLedgerService.invoiceLedgerSaveOrUpdate(productDto);
return AjaxResult.success();
}
@@ -146,4 +152,25 @@
}
}
+ /**
+ * 浜у搧寮�绁ㄨ褰曟煡璇�
+ * @param page
+ * @param registrationProductDto
+ * @return
+ */
+ @GetMapping("/registrationProductPage")
+ public AjaxResult registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
+ return AjaxResult.success(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
+ }
+
+ /**
+ * 浜у搧寮�绁ㄨ鎯�
+ * @param id
+ * @return
+ */
+ @GetMapping("/invoiceLedgerProductInfo")
+ public AjaxResult invoiceLedgerProductDetail(Integer id) {
+ return AjaxResult.success(invoiceLedgerService.invoiceLedgerProductDetail(id));
+ }
+
}
--
Gitblit v1.9.3