From 23e5035547b997430a8a3e71cee44782011664dc Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 09:50:26 +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 | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 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 cc0980a..19837d8 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,5 +1,6 @@
package com.vincent.rsf.server.manager.controller;
+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;
@@ -11,22 +12,21 @@
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;
import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
import java.util.*;
@RestController
@@ -41,7 +41,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
- return R.ok().add( matnrService.getMatnrPage(pageParam));
+ return R.ok().add(matnrService.getMatnrPage(pageParam));
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@@ -56,44 +56,53 @@
return R.ok().add(matnrService.listByIds(Arrays.asList(ids)));
}
-
@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) {
- if (Objects.isNull(matnr.getName())) {
+ public R save(@RequestBody Map<String, Object> matnr) {
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnr.get("name"))) {
throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(matnr.getCode())) {
- throw new CoolException("缂栫爜涓嶈兘涓虹┖锛侊紒");
- }
- if (Objects.isNull(matnr.getGroupId())) {
+ if (Objects.isNull(matnr.get("groupId"))) {
throw new CoolException("鐗╂枡鍒嗙粍涓嶈兘涓虹┖锛侊紒");
}
+ matnr.put("createBy", getLoginUserId());
+ matnr.put("updateBy", getLoginUserId());
+ return matnrService.saveMatnrs(matnr);
- matnr.setCreateBy(getLoginUserId());
- matnr.setUpdateBy(getLoginUserId());
- if (!matnrService.save(matnr)) {
- return R.error("Save Fail");
- }
- return R.ok("Save Success").add(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 (!matnrService.updateById(matnr)) {
return R.error("Update Fail");
}
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
+ Matnr matnr1 = matnrService.getById(matnr.getId());
+ params.put("fieldsIndex", matnr1.getFieldsIndex());
+ FieldsUtils.updateFieldsValue(params);
+ }
+
return R.ok("Update Success").add(matnr);
}
@@ -139,6 +148,38 @@
return R.ok(new PageResult().setRecords(matnrPage.getRecords()).setTotal(matnrPage.getTotal()));
}
+
+ @PreAuthorize("hasAuthority('manager:matnr:list')")
+ @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: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")
--
Gitblit v1.9.1