From ae6879a7575f79d814c70781e6efc1b6218f3732 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 14 三月 2025 14:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java b/billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java
index c7470bd..c24c956 100644
--- a/billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java
+++ b/billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java
@@ -11,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -28,6 +29,21 @@
@Autowired
private IBsBomChildInfoService bsBomChildInfoService;
+ @PostMapping("/importTemplate")
+ public void importTemplate(HttpServletResponse response)
+ {
+ ExcelUtil<BsBomChildInfo> util = new ExcelUtil<BsBomChildInfo>(BsBomChildInfo.class);
+ util.importTemplateExcel(response, "bom瀛愯〃鏁版嵁");
+ }
+ @PreAuthorize("@ss.hasPermi('bs:bomChildInfo:import')")
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+ {
+ ExcelUtil<BsBomChildInfo> util = new ExcelUtil<BsBomChildInfo>(BsBomChildInfo.class);
+ List<BsBomChildInfo> bomChildList = util.importExcel(file.getInputStream());
+ String message = bsBomChildInfoService.importBomChild(bomChildList, updateSupport, "1");
+ return success(message);
+ }
/**
* 鏌ヨ鍩虹BOM瀛愪俊鎭垪琛�
*/
--
Gitblit v1.9.3