From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 63c5006..8b7e43f 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;
@@ -33,7 +37,7 @@
@Tag(name = "绠＄悊鍚庡彴 - ERP 渚涘簲鍟�")
@RestController
-@RequestMapping("/erp/supplier")
+@RequestMapping({"/erp/supplier", "/purchase/supplier"})
@Validated
public class ErpSupplierController {
@@ -104,4 +108,26 @@
BeanUtils.toBean(list, ErpSupplierRespVO.class));
}
+ @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));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3