From d6a1114f3473f86721176bc9d17ba7f35b0bddb7 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 13 五月 2025 16:53:59 +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/SalesLedgerController.java |   65 ++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 1c934a1..ace01c0 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,19 +1,15 @@
 package com.ruoyi.sales.controller;
 
-import java.util.List;
+import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.sales.dto.SalesLedgerDto;
 import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.service.ISalesLedgerFileService;
 import com.ruoyi.sales.service.ISalesLedgerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -22,23 +18,24 @@
 
 /**
  * 閿�鍞彴璐ontroller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-08
  */
 @RestController
 @RequestMapping("/sales/ledger")
-public class SalesLedgerController extends BaseController
-{
-    @Autowired
+@AllArgsConstructor
+public class SalesLedgerController extends BaseController {
+
     private ISalesLedgerService salesLedgerService;
+
+    private ISalesLedgerFileService salesLedgerFileService;
 
     /**
      * 鏌ヨ閿�鍞彴璐﹀垪琛�
      */
     @GetMapping("/list")
-    public TableDataInfo list(SalesLedgerDto salesLedgerDto)
-    {
+    public TableDataInfo list(SalesLedgerDto salesLedgerDto) {
         startPage();
         List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
         return getDataTable(list);
@@ -48,8 +45,8 @@
      * 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃
      */
     @GetMapping("/getSalesLedgerWithProducts")
-    public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto){
-        return  salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
+    public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
+        return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
     }
 
     /**
@@ -57,8 +54,7 @@
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto)
-    {
+    public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
         List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
         ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
         util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
@@ -68,9 +64,8 @@
      * 鏂板淇敼閿�鍞彴璐�
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.INSERT)
-    @PostMapping ("/addOrUpdateSalesLedger")
-    public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto)
-    {
+    @PostMapping("/addOrUpdateSalesLedger")
+    public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
         return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
     }
 
@@ -78,12 +73,34 @@
      * 鍒犻櫎閿�鍞彴璐�
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
-	@DeleteMapping("/delLedger")
-    public AjaxResult remove(@RequestBody Long[] ids)
-    {
+    @DeleteMapping("/delLedger")
+    public AjaxResult remove(@RequestBody Long[] ids) {
         if (ids == null || ids.length == 0) {
             return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
         return toAjax(salesLedgerService.deleteSalesLedgerByIds(ids));
     }
+
+    /**
+     * 鏌ヨ閿�鍞彴璐︿笉鍒嗛〉
+     * @param salesLedgerDto
+     * @return
+     */
+    @GetMapping("/listNoPage")
+    public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto){
+        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 閿�鍞彴璐﹂檮浠跺垹闄�
+     */
+    @Log(title = "閿�鍞彴璐﹂檮浠跺垹闄�", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delLedgerFile")
+    public AjaxResult delLedgerFile(@RequestBody Long[] ids) {
+        if (ids == null || ids.length == 0) {
+            return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+        }
+        return toAjax(salesLedgerFileService.deleteSalesLedgerByIds(ids));
+    }
 }

--
Gitblit v1.9.3