From a935fc71d8e52f2ba10e42cfdb9e75ef9cb32bd7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 09:52:15 +0800
Subject: [PATCH] #修复 初始化时库区关系未绑定
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 1a763ae..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
@@ -7,32 +7,26 @@
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.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
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
@@ -91,7 +85,7 @@
@OperationLog("Update 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/update")
@Transactional(rollbackFor = Exception.class)
- public R update(@RequestBody Map<String, Object> params) {
+ 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("缂栫爜涓嶈兘涓虹┖锛侊紒");
@@ -154,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