From 60b34f0c724917482a0308dd23c68cd38d3e82ce Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 15 五月 2025 16:48:42 +0800
Subject: [PATCH] 供应商id

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java |   92 ++++++++++++++++++++++++----------------------
 1 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 3f325b1..fae38e5 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,47 +1,43 @@
 package com.ruoyi.sales.controller;
 
-import java.util.List;
-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.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.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.service.ISalesLedgerService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 閿�鍞彴璐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 ICommonFileService commonFileService;
 
     /**
      * 鏌ヨ閿�鍞彴璐﹀垪琛�
      */
     @GetMapping("/list")
-    public TableDataInfo list(SalesLedger salesLedger)
-    {
+    public TableDataInfo list(SalesLedgerDto salesLedgerDto) {
         startPage();
-        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedger);
+        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
         return getDataTable(list);
     }
 
@@ -49,11 +45,8 @@
      * 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃
      */
     @GetMapping("/getSalesLedgerWithProducts")
-    public TableDataInfo getSalesLedgerWithProducts()
-    {
-        startPage();
-        List<SalesLedgerDto> list = salesLedgerService.getSalesLedgerWithProducts();
-        return getDataTable(list);
+    public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
+        return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
     }
 
     /**
@@ -61,29 +54,18 @@
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SalesLedger salesLedger)
-    {
-        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedger);
+    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, "閿�鍞彴璐︽暟鎹�");
-    }
-
-    /**
-     * 鑾峰彇閿�鍞彴璐﹁缁嗕俊鎭�
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(salesLedgerService.selectSalesLedgerById(id));
     }
 
     /**
      * 鏂板淇敼閿�鍞彴璐�
      */
     @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));
     }
 
@@ -91,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(commonFileService.deleteSalesLedgerByIds(ids));
+    }
 }

--
Gitblit v1.9.3