From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 10 三月 2025 17:06:37 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 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 4aecd2a..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 @@ -15,14 +15,19 @@ import com.vincent.rsf.server.manager.service.MatnrService; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; 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.*; -@Api(tags = "鐗╂枡琛ㄦ帴鍙�") @RestController +@Api(tags = "鐗╂枡琛ㄦ帴鍙�") public class MatnrController extends BaseController { @Autowired @@ -104,8 +109,9 @@ return R.ok().add(vos); } - + @SecurityRequirement(name = HttpHeaders.AUTHORIZATION) @PreAuthorize("hasAuthority('manager:matnr:list')") + @ApiOperation(value = "鑾峰彇鍒嗙被鐗╂枡鏄庣粏鍒楄〃") @PostMapping("/matnr/group") public R getGroupMatnrs(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); @@ -122,12 +128,22 @@ 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 { ExcelUtil.build(ExcelUtil.create(matnrService.list(), Matnr.class), response); } + @PreAuthorize("hasAuthority('manager:matnr:save')") + @ApiOperation(value = "excel琛ㄦ牸瀵煎叆鐗╂枡淇℃伅") + @PostMapping("/matnr/import") + 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