From d1903c17568e1c373ca37a8baddbefbc330d12bf Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 26 五月 2025 16:31:35 +0800 Subject: [PATCH] 开票台账功能修改 --- src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 70 +++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java index 0b101b9..650dbaa 100644 --- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java +++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java @@ -1,15 +1,18 @@ package com.ruoyi.sales.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.basic.dto.SupplierManageDto; 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.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.List; @RestController @@ -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(); } @@ -111,4 +117,60 @@ 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)); + } + + /** + * 鏈湀寮�绁ㄩ噾棰� + */ + @GetMapping("/getInvoiceAmount") + public AjaxResult getInvoiceAmount() { + try { + BigDecimal amount = invoiceLedgerService.getInvoiceAmount(); + return AjaxResult.success(amount != null ? amount : BigDecimal.ZERO); + } catch (Exception e) { + return AjaxResult.error("鑾峰彇寮�绁ㄩ噾棰濆け璐ワ細" + e.getMessage()); + } + } + + /** + * 浜у搧寮�绁ㄨ褰曟煡璇� + * @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