From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 136 +++++++++++++++++++++++++++++++++++----------
1 files changed, 105 insertions(+), 31 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..091cf4a 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,29 +1,29 @@
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.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.Matnr;
+import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -40,9 +40,17 @@
@PreAuthorize("hasAuthority('manager:matnr:list')")
@PostMapping("/matnr/page")
public R page(@RequestBody Map<String, Object> map) {
+// if (!Objects.isNull(map.get("groupId"))) {
+// return R.ok(matnrService.getPages(map));
+// } else {
+// BaseParam baseParam = buildParam(map, BaseParam.class);
+// PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
+// return R.ok().add(matnrService.getMatnrPage(pageParam, map));
+// }
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
- return R.ok().add(matnrService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(matnrService.getMatnrPage(pageParam, map));
+
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@@ -60,29 +68,54 @@
@PreAuthorize("hasAuthority('manager:matnr:list')")
@GetMapping("/matnr/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(matnrService.getById(id));
+ return R.ok(matnrService.selectMatnrById(id));
}
@PreAuthorize("hasAuthority('manager:matnr:save')")
@OperationLog("Create 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/save")
- public R save(@RequestBody Matnr matnr) {
- matnr.setCreateBy(getLoginUserId());
- matnr.setCreateTime(new Date());
- matnr.setUpdateBy(getLoginUserId());
- matnr.setUpdateTime(new Date());
- if (!matnrService.save(matnr)) {
- return R.error("Save Fail");
+ public R save(@RequestBody Map<String, Object> matnr) {
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("Save Success").add(matnr);
+ if (Objects.isNull(matnr.get("name"))) {
+ throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnr.get("groupId"))) {
+ throw new CoolException("鐗╂枡鍒嗙粍涓嶈兘涓虹┖锛侊紒");
+ }
+ matnr.put("createBy", getLoginUserId());
+ matnr.put("updateBy", getLoginUserId());
+ return matnrService.saveMatnrs(matnr);
+
}
@PreAuthorize("hasAuthority('manager:matnr:update')")
@OperationLog("Update 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/update")
- public R update(@RequestBody Matnr matnr) {
+ @Transactional(rollbackFor = Exception.class)
+ public R update(@RequestBody Map<String, Object> params) throws Exception {
+ Matnr matnr = JSONObject.parseObject(JSONObject.toJSONString(params), Matnr.class);
+ if (Objects.isNull(matnr.getCode())) {
+ throw new CoolException("缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnr.getName())) {
+ throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
matnr.setUpdateBy(getLoginUserId());
- matnr.setUpdateTime(new Date());
+
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
+ Matnr matnr1 = matnrService.getById(matnr.getId());
+ if (!Objects.isNull(matnr1.getFieldsIndex())) {
+ params.put("fieldsIndex", matnr1.getFieldsIndex());
+ } else {
+ String uuid16 = CommonUtil.randomUUID16();
+ params.put("index", uuid16);
+ matnr.setFieldsIndex(uuid16);
+ }
+ FieldsUtils.updateFieldsValue(params);
+ }
+
if (!matnrService.updateById(matnr)) {
return R.error("Update Fail");
}
@@ -113,7 +146,6 @@
return R.ok().add(vos);
}
- @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
@PreAuthorize("hasAuthority('manager:matnr:list')")
@ApiOperation(value = "鑾峰彇鍒嗙被鐗╂枡鏄庣粏鍒楄〃")
@PostMapping("/matnr/group")
@@ -133,24 +165,66 @@
}
-
@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);
+ @ApiOperation("缁戝畾鐗╂枡鍒嗙粍")
+ @PostMapping("/matnr/group/bind")
+ public R bindMatnrToGroup(@RequestBody MatnrToGroupParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (matnrService.bindMatnrs(params)) {
+ return R.ok();
+ } else {
+ return R.error("鎿嶄綔澶辫触锛侊紒");
+ }
}
- @PreAuthorize("hasAuthority('manager:matnr:save')")
+ @PreAuthorize("hasAuthority('manager:matnr:update')")
+ @ApiOperation("鎵归噺淇敼")
+ @PostMapping("/matnr/batch/update")
+ public R batchUpdate(@RequestBody MatnrToGroupParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getMatnr())) {
+ return R.error("鐗╂枡灞炴�т笉鑳戒负绌猴紒锛�");
+ }
+ if (matnrService.batchUpdate(params)) {
+ return R.ok();
+ }else {
+ return R.error("鎿嶄綔澶辫触锛侊紒");
+ }
+ }
+
+ @PreAuthorize("hasAuthority('manager:matnr:list')")
+ @ApiOperation("瀵煎嚭鐗╂枡淇℃伅")
+ @PostMapping("/matnr/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ List<Matnr> matnrs = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().in(Matnr::getId, map.get("ids")).eq(Matnr::getStatus, 1));
+ } else {
+ matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
+ }
+ ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
+ }
+
+ @PreAuthorize("hasAuthority('manager:matnr:list')")
+ @ApiOperation("涓嬭浇鐗╂枡妯℃澘")
+ @PostMapping("/matnr/template/download")
+ public void download(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class), response);
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:matnr:update')")
@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(MultipartFile file) throws Exception {
+ if (Objects.isNull(file)) {
+ throw new CoolException("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
-
- return R.ok();
+ return matnrService.importExcels(file);
}
}
--
Gitblit v1.9.1