From 3e3e7327d92e11beb0aa46a4915733be37e0d198 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 15:08:15 +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 |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 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 d9adc02..234ca81 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
@@ -154,7 +154,7 @@
     @PostMapping("/matnr/group/bind")
     public R bindMatnrToGroup(@RequestBody MatnrToGroupParams params) {
         if (Objects.isNull(params)) {
-            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+            return  R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
         if (matnrService.bindMatnrs(params)) {
             return R.ok();
@@ -163,6 +163,23 @@
         }
     }
 
+    @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