From a76f7b29357729710f9e99f0676af4635b922ea4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 10 九月 2026 11:41:55 +0800
Subject: [PATCH] fix: 更新产品导入的工作表名称

---
 src/main/java/com/ruoyi/basic/controller/ProductController.java |   39 ++++++++++++++++-----------------------
 1 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 5109662..d6c8eda 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -5,17 +5,15 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.basic.dto.ProductDto;
 import com.ruoyi.basic.dto.ProductModelDto;
-import com.ruoyi.basic.dto.ProductModelExportDto;
 import com.ruoyi.basic.dto.ProductTreeDto;
 import com.ruoyi.basic.pojo.ProductModel;
 import com.ruoyi.basic.service.IProductModelService;
 import com.ruoyi.basic.service.IProductService;
 import com.ruoyi.basic.vo.ProductModelVo;
-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.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.sales.pojo.SalesLedgerProduct;
 import com.ruoyi.sales.service.ISalesLedgerProductService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -55,9 +53,8 @@
      */
     @Log(title = "浜у搧", businessType = BusinessType.INSERT)
     @PostMapping("/addOrEditProduct")
-    public R<?> addOrEditProduct(@RequestBody ProductDto productDto) {
-        productService.addOrEditProduct(productDto);
-        return R.ok();
+    public AjaxResult addOrEditProduct(@RequestBody ProductDto productDto) {
+        return toAjax(productService.addOrEditProduct(productDto));
     }
 
     /**
@@ -65,9 +62,8 @@
      */
     @Log(title = "浜у搧瑙勬牸鍨嬪彿", businessType = BusinessType.INSERT)
     @PostMapping("/addOrEditProductModel")
-    public R<?> addOrEditProductModel(@RequestBody ProductModelDto productModelDto) {
-        productModelService.addOrEditProductModel(productModelDto);
-        return R.ok();
+    public AjaxResult addOrEditProductModel(@RequestBody ProductModelDto productModelDto) {
+        return toAjax(productModelService.addOrEditProductModel(productModelDto));
     }
 
     /**
@@ -75,19 +71,18 @@
      */
     @Log(title = "浜у搧", businessType = BusinessType.DELETE)
     @DeleteMapping("/delProduct")
-    public R<?> remove(@RequestBody Long[] ids) {
+    public AjaxResult remove(@RequestBody Long[] ids) {
         if (ids == null || ids.length == 0) {
-            return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+            return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
         // 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧
         LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(SalesLedgerProduct::getProductId, ids);
         List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
         if (salesLedgerProductList.size() > 0) {
-            return R.fail("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+            return AjaxResult.error("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
         }
-        productService.delProductByIds(ids);
-        return R.ok();
+        return toAjax(productService.delProductByIds(ids));
     }
 
     /**
@@ -95,19 +90,18 @@
      */
     @Log(title = "浜у搧瑙勬牸鍨嬪彿", businessType = BusinessType.DELETE)
     @DeleteMapping("/delProductModel")
-    public R<?> delProductModel(@RequestBody Long[] ids) {
+    public AjaxResult delProductModel(@RequestBody Long[] ids) {
         if (ids == null || ids.length == 0) {
-            return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+            return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
         // 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧瑙勬牸鍨嬪彿
         LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(SalesLedgerProduct::getProductModelId, ids);
         List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
         if (salesLedgerProductList.size() > 0) {
-            return R.fail("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+            return AjaxResult.error("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
         }
-        productModelService.delProductModel(ids);
-        return R.ok();
+        return toAjax(productModelService.delProductModel(ids));
     }
 
     /**
@@ -129,8 +123,8 @@
      */
     @PostMapping("/import")
     @Log(title = "瀵煎叆浜у搧", businessType = BusinessType.IMPORT)
-    public R<?> importProductModel(@RequestParam("file") MultipartFile file, Integer productId) {
-        return productModelService.importProductModel(file, productId);
+    public AjaxResult importProductModel(@RequestParam("file") MultipartFile file) {
+        return productModelService.importProductModel(file);
     }
 
     /**
@@ -140,7 +134,6 @@
     @Operation(summary = "浜у搧瀵煎叆妯℃澘")
     @Log(title = "浜у搧瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
     public void importProduct(HttpServletResponse response) {
-        ExcelUtil<ProductModelExportDto> excelUtil = new ExcelUtil<>(ProductModelExportDto.class);
-        excelUtil.importTemplateExcel(response, "浜у搧瑙勬牸瀵煎叆妯℃澘");
+        productService.exportImportTemplate(response);
     }
 }

--
Gitblit v1.9.3