From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java
index 6f6c7cb..0fd6e36 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java
@@ -9,6 +9,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier.ErpSupplierSaveReqVO;
@@ -25,6 +28,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -70,7 +74,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱渚涘簲鍟�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:supplier:query')")
public CommonResult<ErpSupplierRespVO> getSupplier(@RequestParam("id") Long id) {
ErpSupplierDO supplier = supplierService.getSupplier(id);
return success(BeanUtils.toBean(supplier, ErpSupplierRespVO.class));
@@ -78,7 +81,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱渚涘簲鍟嗗垎椤�")
- @PreAuthorize("@ss.hasPermission('erp:supplier:query')")
public CommonResult<PageResult<ErpSupplierRespVO>> getSupplierPage(@Valid ErpSupplierPageReqVO pageReqVO) {
PageResult<ErpSupplierDO> pageResult = supplierService.getSupplierPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpSupplierRespVO.class));
@@ -104,4 +106,26 @@
BeanUtils.toBean(list, ErpSupplierRespVO.class));
}
-}
\ No newline at end of file
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆渚涘簲鍟嗘ā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<ErpSupplierImportExcelVO> list = Arrays.asList(
+ ErpSupplierImportExcelVO.builder().name("绀轰緥渚涘簲鍟�").contact("").mobile("").telephone("")
+ .email("").fax("").remark("").status(CommonStatusEnum.ENABLE.getStatus()).sort(0)
+ .taxNo("").taxPercent(null).bankName("").bankAccount("").bankAddress("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "渚涘簲鍟嗗鍏ユā鏉�.xls", "渚涘簲鍟嗗垪琛�", ErpSupplierImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆渚涘簲鍟�")
+ @PreAuthorize("@ss.hasPermission('erp:supplier:import')")
+ public CommonResult<ErpSupplierImportRespVO> importExcel(@Valid ErpSupplierImportReqVO importReqVO)
+ throws Exception {
+ List<ErpSupplierImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), ErpSupplierImportExcelVO.class);
+ return success(supplierService.importSupplierList(list, importReqVO));
+ }
+
+}
--
Gitblit v1.9.3