From 3a65a0aa3f06f46185937034dc256331b8d21b8f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 28 五月 2026 13:27:12 +0800
Subject: [PATCH] 入库库存关联厂家

---
 src/main/java/com/ruoyi/stock/controller/ManufacturerController.java |   39 ++++++++++++++++++---------------------
 1 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/controller/ManufacturerController.java b/src/main/java/com/ruoyi/stock/controller/ManufacturerController.java
index 2c567a4..9fd4e3a 100644
--- a/src/main/java/com/ruoyi/stock/controller/ManufacturerController.java
+++ b/src/main/java/com/ruoyi/stock/controller/ManufacturerController.java
@@ -4,8 +4,9 @@
 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.framework.web.domain.R;
 import com.ruoyi.stock.dto.ManufacturerDto;
+import com.ruoyi.stock.execl.ManufacturerExcelDto;
 import com.ruoyi.stock.pojo.Manufacturer;
 import com.ruoyi.stock.service.ManufacturerService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -42,9 +43,9 @@
     @PostMapping("/add")
     @Log(title = "鍘傚-鏂板", businessType = BusinessType.INSERT)
     @Operation(summary = "鏂板鍘傚")
-    public AjaxResult add(@RequestBody Manufacturer manufacturer) {
+    public R add(@RequestBody Manufacturer manufacturer) {
         manufacturerService.saveManufacturer(manufacturer);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     /**
@@ -55,12 +56,12 @@
     @DeleteMapping("/del")
     @Log(title = "鍘傚-鍒犻櫎", businessType = BusinessType.DELETE)
     @Operation(summary = "鍒犻櫎鍘傚")
-    public AjaxResult delManufacturer(@RequestBody List<Long> ids) {
+    public R delManufacturer(@RequestBody List<Long> ids) {
         if(CollectionUtils.isEmpty(ids)){
-            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+            return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
         manufacturerService.delManufacturer(ids);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     /**
@@ -71,8 +72,8 @@
     @GetMapping("/{id}")
     @Log(title = "鍘傚-璇︽儏", businessType = BusinessType.OTHER)
     @Operation(summary = "鍘傚璇︽儏")
-    public AjaxResult manufacturerDetail(@PathVariable("id") Long id) {
-        return AjaxResult.success(manufacturerService.manufacturerDetail(id));
+    public R manufacturerDetail(@PathVariable("id") Long id) {
+        return R.ok(manufacturerService.manufacturerDetail(id));
     }
 
     /**
@@ -83,9 +84,9 @@
     @PostMapping("/update")
     @Log(title = "鍘傚-淇敼", businessType = BusinessType.UPDATE)
     @Operation(summary = "淇敼鍘傚")
-    public AjaxResult update(@RequestBody Manufacturer manufacturer) {
+    public R update(@RequestBody Manufacturer manufacturer) {
         manufacturerService.manufacturerUpdate(manufacturer);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     /**
@@ -97,8 +98,8 @@
     @GetMapping("/listPage")
     @Log(title = "鍘傚-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
     @Operation(summary = "鍘傚鍒嗛〉鏌ヨ")
-    public AjaxResult manufacturerListPage(Page page, ManufacturerDto manufacturerDto) {
-        return AjaxResult.success(manufacturerService.manufacturerListPage(page, manufacturerDto));
+    public R manufacturerListPage(Page page, ManufacturerDto manufacturerDto) {
+        return R.ok(manufacturerService.manufacturerListPage(page, manufacturerDto));
     }
 
     /**
@@ -121,7 +122,7 @@
     @Log(title = "鍘傚-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
     @Operation(summary = "涓嬭浇鍘傚妯℃澘")
     public void downloadTemplate(HttpServletResponse response) {
-        ExcelUtil<Manufacturer> util = new ExcelUtil<>(Manufacturer.class);
+        ExcelUtil<ManufacturerExcelDto> util = new ExcelUtil<>(ManufacturerExcelDto.class);
         util.importTemplateExcel(response, "鍘傚妗ｆ妯℃澘");
     }
 
@@ -131,12 +132,8 @@
     @PostMapping("/import")
     @Log(title = "鍘傚-瀵煎叆", businessType = BusinessType.IMPORT)
     @Operation(summary = "瀵煎叆鍘傚")
-    public AjaxResult importData(MultipartFile file) {
-        Boolean b = manufacturerService.importData(file);
-        if (b) {
-            return AjaxResult.success("瀵煎叆鎴愬姛");
-        }
-        return AjaxResult.error("瀵煎叆澶辫触");
+    public R importData(MultipartFile file) {
+        return manufacturerService.importData(file);
     }
 
     /**
@@ -146,7 +143,7 @@
     @GetMapping("/getOptions")
     @Log(title = "鍘傚-閫夐」鎺ュ彛", businessType = BusinessType.OTHER)
     @Operation(summary = "鑾峰彇鍘傚閫夐」")
-    public AjaxResult getOptions() {
-        return AjaxResult.success(manufacturerService.list());
+    public R getOptions() {
+        return R.ok(manufacturerService.list());
     }
 }

--
Gitblit v1.9.3