From d3d9a620f39292b61d85087970d9dc81b6369d4c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 07 三月 2025 16:29:46 +0800
Subject: [PATCH] # 新增 1. 新增ASN单据 2. 新增ASN明细单据

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 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..3b4fc39 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
@@ -1,9 +1,5 @@
 package com.vincent.rsf.server.manager.controller;
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
-import cn.afterturn.easypoi.excel.imports.ExcelImportService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vincent.rsf.framework.common.Cools;
@@ -132,8 +128,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 +137,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