From af7a0d4a3991165c4dab36d4eff57d87fa67496e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 03 三月 2025 17:04:09 +0800
Subject: [PATCH] #新增 1. 新增ASN单据 2. 新增PO单据 3. 修改文件上传模板功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index df029e2..6dd9f72 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -132,8 +132,6 @@
return R.ok(new PageResult().setRecords(matnrPage.getRecords()).setTotal(matnrPage.getTotal()));
}
-
-
@PreAuthorize("hasAuthority('manager:matnr:list')")
@PostMapping("/matnr/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
@@ -143,12 +141,11 @@
@PreAuthorize("hasAuthority('manager:matnr:save')")
@ApiOperation(value = "excel琛ㄦ牸瀵煎叆鐗╂枡淇℃伅")
@PostMapping("/matnr/import")
- public R listImport(MultipartFile file) {
- try {
- ExcelImportResult<Matnr> objectExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), Matnr.class, ExcelUtil.getDefaultImportParams());
- } catch (Exception e) {
- throw new RuntimeException(e);
+ public R listImport(@RequestParam MultipartFile file) throws Exception {
+ if (Objects.isNull(file)) {
+ throw new CoolException("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
+ matnrService.importExcels(file);
return R.ok();
}
--
Gitblit v1.9.1