From 47768d890fbfc1a5f3e93ca26137847361415e9e Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 28 十月 2025 10:54:16 +0800
Subject: [PATCH] Merge branch 'master' into pim_meet

---
 src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index a42414b..fc19d5d 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -3,12 +3,17 @@
 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.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @RestController
@@ -18,14 +23,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();
     }
 
@@ -76,14 +84,14 @@
     }
 
     /**
-     * 闄勪欢涓嬭浇
+     * 寮�绁ㄥ彴璐﹀鍑�
      * @param response
-     * @param invoiceLedgerDto
+     * @param invoiceRegistrationProductDto
      * @return
      */
-    @GetMapping("/downloadFile")
-    public void invoiceLedgerDownloadFile(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
-        invoiceLedgerService.invoiceLedgerDownload(response, invoiceLedgerDto);
+    @PostMapping("/export")
+    public void invoiceLedgerExport(HttpServletResponse response, InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
+        invoiceLedgerService.invoiceLedgerExport(response, invoiceRegistrationProductDto);
     }
 
     /**
@@ -96,4 +104,90 @@
         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));
+    }
+
+    /**
+     * 鏈湀寮�绁ㄩ噾棰�
+     */
+    @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));
+    }
+
+    /**
+     * 寮�绁ㄥ彴璐﹀垹闄�
+     * @param invoiceRegistrationProductId
+     * @return
+     */
+    @DeleteMapping("delInvoiceLedger/{invoiceRegistrationProductId}")
+    public AjaxResult delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
+        try {
+            invoiceLedgerService.delInvoiceLedger(invoiceRegistrationProductId);
+            return AjaxResult.success();
+        }catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
 }

--
Gitblit v1.9.3