From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java |   68 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
index 00e1e88..09447b1 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
@@ -1,31 +1,43 @@
 package com.ruoyi.sales.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.sales.dto.InvoiceRegistrationDto;
 import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
+import com.ruoyi.sales.dto.SalesLedgerDto;
 import com.ruoyi.sales.service.InvoiceRegistrationService;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.jsonwebtoken.lang.Collections;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
 @RequestMapping("/invoiceRegistration")
-public class InvoiceRegistrationController {
+@AllArgsConstructor
+public class InvoiceRegistrationController extends BaseController {
 
-    @Autowired
     private InvoiceRegistrationService invoiceRegistrationService;
 
     /**
-     * 寮�绁ㄧ櫥璁版柊澧�
-     * @param invoiceRegistrationDto
+     * 寮�绁ㄧ櫥璁拌褰曟柊澧�
+     * @param salesLedgerDto
      * @return
      */
-    @PostMapping("/add")
-    public AjaxResult invoiceRegistrationAdd(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
-        invoiceRegistrationService.invoiceRegistrationAdd(invoiceRegistrationDto);
-        return AjaxResult.success();
+    @PostMapping("/save")
+    @Log(title = "寮�绁ㄧ櫥璁�", businessType = com.ruoyi.framework.aspectj.lang.enums.BusinessType.INSERT)
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> invoiceRegistrationSave(@RequestBody List<SalesLedgerDto> salesLedgerDto) {
+        if(Collections.isEmpty(salesLedgerDto)) return R.fail("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+        salesLedgerDto.forEach(item ->{
+            invoiceRegistrationService.invoiceRegistrationSave(item);
+        });
+
+        return R.ok();
     }
 
     /**
@@ -34,9 +46,9 @@
      * @return
      */
     @DeleteMapping("/del")
-    public AjaxResult invoiceRegistrationDel(@RequestParam List<Integer> ids) {
+    public R<?> invoiceRegistrationDel(@RequestBody  List<Integer> ids) {
         invoiceRegistrationService.invoiceRegistrationDel(ids);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     /**
@@ -45,9 +57,9 @@
      * @return
      */
     @PostMapping("/update")
-    public AjaxResult invoiceRegistrationUpdate(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
+    public R<?> invoiceRegistrationUpdate(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
         invoiceRegistrationService.invoiceRegistrationUpdate(invoiceRegistrationDto);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     /**
@@ -57,8 +69,8 @@
      * @return
      */
     @GetMapping("/listPage")
-    public AjaxResult invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
-        return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationListPage(page, invoiceRegistrationDto));
+    public R<?> invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
+        return R.ok(invoiceRegistrationService.invoiceRegistrationListPage(page, invoiceRegistrationDto));
     }
 
     /**
@@ -67,7 +79,27 @@
      * @return
      */
     @GetMapping("/productList")
-    public AjaxResult invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
-        return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationProductList(invoiceRegistrationProductDto));
+    public R<?> invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
+        return R.ok(invoiceRegistrationService.invoiceRegistrationProductList(invoiceRegistrationProductDto));
+    }
+
+    /**
+     * 寮�绁ㄧ櫥璁颁骇鍝佽鎯�
+     * @param id
+     * @return
+     */
+    @GetMapping("/detail")
+    public R<?> invoiceRegistrationDetail(Integer id) {
+        return R.ok(invoiceRegistrationService.invoiceRegistrationDetail(id));
+    }
+
+    /**
+     * 寮�绁ㄧ櫥璁板鍑�
+     * @param response
+     * @param invoiceRegistrationDto
+     */
+    @PostMapping("/export")
+    public void invoiceRegistrationExport(HttpServletResponse response, InvoiceRegistrationDto invoiceRegistrationDto) {
+        invoiceRegistrationService.invoiceRegistrationExport(response, invoiceRegistrationDto);
     }
 }

--
Gitblit v1.9.3