From 03ffc2598a261d1dc19e77b559268bb84032a389 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 21 四月 2026 08:51:45 +0800
Subject: [PATCH] feat(approve): 新增销售审批功能并优化审批流程

---
 src/main/java/com/ruoyi/basic/controller/SupplierManageController.java |   66 ++++++++++++++++++++++++++++----
 1 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index 4a9635c..6385144 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -1,14 +1,26 @@
 package com.ruoyi.basic.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.basic.dto.SupplierManageDto;
+import com.ruoyi.basic.pojo.Customer;
 import com.ruoyi.basic.pojo.SupplierManage;
 import com.ruoyi.basic.service.ISupplierService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.purchase.service.IPurchaseLedgerService;
+import com.ruoyi.purchase.service.impl.PurchaseLedgerServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 @RestController
 @RequestMapping("/system/supplier")
@@ -16,6 +28,8 @@
 
     @Autowired
     private ISupplierService supplierService;
+    @Autowired
+    private IPurchaseLedgerService purchaseLedgerService;
 
     /**
      * 渚涘簲鍟嗘柊澧�
@@ -23,19 +37,22 @@
      * @return
      */
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody SupplierManage supplierManage) {
+    public AjaxResult add(@RequestBody SupplierManageDto supplierManage) {
         supplierService.saveSupplier(supplierManage);
         return AjaxResult.success();
     }
 
     /**
      * 渚涘簲鍟嗗垹闄�
-     * @param id
+     * @param ids
      * @return
      */
     @DeleteMapping("/del")
-    public AjaxResult delSupplier(Integer id) {
-        supplierService.delSupplier(id);
+    public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+        }
+        supplierService.delSupplier(ids);
         return AjaxResult.success();
     }
 
@@ -44,8 +61,8 @@
      * @param id
      * @return
      */
-    @GetMapping("/info")
-    public AjaxResult supplierDetail(Integer id) {
+    @GetMapping("/{id}")
+    public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
         return AjaxResult.success(supplierService.supplierDetail(id));
     }
 
@@ -55,7 +72,8 @@
      * @return
      */
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody SupplierManage supplierManage) {
+    public AjaxResult update(@RequestBody SupplierManageDto supplierManage) {
+        supplierService.supplierUpdate(supplierManage);
         return AjaxResult.success();
     }
 
@@ -75,8 +93,38 @@
      * @param response
      * @param supplierManageDto
      */
-    @GetMapping("/export")
-    public void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto) {
+    @PostMapping("/export")
+    public void supplierExport(HttpServletResponse response,SupplierManageDto supplierManageDto) {
         supplierService.supplierExport(response, supplierManageDto);
     }
+
+    @PostMapping("/downloadTemplate")
+    @Log(title = "渚涘簲鍟�-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+    public void downloadTemplate(HttpServletResponse response) {
+        ExcelUtil<SupplierManage> util = new ExcelUtil<SupplierManage>(SupplierManage.class);
+        util.importTemplateExcel(response, "渚涘簲鍟嗘。妗堟ā鏉�");
+    }
+
+    /**
+     * 渚涘簲鍟嗗鍏�
+     */
+    @PostMapping("/import")
+    @Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
+    public AjaxResult importData(MultipartFile file) {
+        Boolean b = supplierService.importData(file);
+        if (b) {
+            return AjaxResult.success("瀵煎叆鎴愬姛");
+        }
+        return AjaxResult.error("瀵煎叆澶辫触");
+    }
+
+
+    /**
+     * 渚涘簲鍟嗛�夐」鎺ュ彛
+     * @return
+     */
+    @GetMapping("/getOptions")
+    public AjaxResult getOptions() {
+        return AjaxResult.success(supplierService.list());
+    }
 }

--
Gitblit v1.9.3