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 | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 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 24e5621..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
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -12,14 +14,20 @@
import com.vincent.rsf.server.manager.entity.Matnr;
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.*;
@RestController
+@Api(tags = "鐗╂枡琛ㄦ帴鍙�")
public class MatnrController extends BaseController {
@Autowired
@@ -52,7 +60,7 @@
}
@PreAuthorize("hasAuthority('manager:matnr:save')")
- @OperationLog("Create 鐗╂枡琛�")
+ @OperationLog("Create 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/save")
public R save(@RequestBody Matnr matnr) {
matnr.setCreateBy(getLoginUserId());
@@ -66,7 +74,7 @@
}
@PreAuthorize("hasAuthority('manager:matnr:update')")
- @OperationLog("Update 鐗╂枡琛�")
+ @OperationLog("Update 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/update")
public R update(@RequestBody Matnr matnr) {
matnr.setUpdateBy(getLoginUserId());
@@ -78,7 +86,7 @@
}
@PreAuthorize("hasAuthority('manager:matnr:remove')")
- @OperationLog("Delete 鐗╂枡琛�")
+ @OperationLog("Delete 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (!matnrService.removeByIds(Arrays.asList(ids))) {
@@ -101,10 +109,41 @@
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);
+ PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
+ LambdaQueryWrapper<Matnr> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(map.get("condition"))) {
+ wrapper.like(Matnr::getName, map.get("condition"));
+ }
+ if (Cools.isEmpty(map.get("groupId"))) {
+ throw new CoolException("鍒嗙被ID涓嶈兘涓虹┖锛侊紒");
+ }
+ wrapper.eq(Matnr::getGroupId, map.get("groupId"));
+ Page<Matnr> matnrPage = matnrService.page(new Page<>(1, 30), wrapper);
+ 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