From 43721e95b3bb75e5a90a18120aaf12e0b632360a Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 15:08:48 +0800
Subject: [PATCH] 11

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java                 |    2 -
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java        |   34 +----------------
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java  |    2 -
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java           |   19 ---------
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java |    5 --
 5 files changed, 3 insertions(+), 59 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 234ca81..d9adc02 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,28 +154,11 @@
     @PostMapping("/matnr/group/bind")
     public R bindMatnrToGroup(@RequestBody MatnrToGroupParams params) {
         if (Objects.isNull(params)) {
-            return  R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
         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("鎿嶄綔澶辫触锛侊紒");
         }
     }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
index 64aebaf..5a29471 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
@@ -16,7 +16,6 @@
 import com.vincent.rsf.server.manager.service.LocService;
 import com.vincent.rsf.server.manager.service.WarehouseAreasService;
 import com.vincent.rsf.server.system.controller.BaseController;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,7 +24,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
-@Api(tags = "浠撳簱搴撳尯")
 @RestController
 public class WarehouseAreasController extends BaseController {
 
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java
index a36bbe6..f2ef317 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java
@@ -1,6 +1,5 @@
 package com.vincent.rsf.server.manager.controller.params;
 
-import com.vincent.rsf.server.manager.entity.Matnr;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -21,8 +20,4 @@
 
     @ApiModelProperty("鍒嗙粍ID")
     private Long groupId;
-
-    @ApiModelProperty("鐗╂枡灞炴��")
-    private Matnr matnr;
-
 }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
index fd486bd..c765aa6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
@@ -22,6 +22,4 @@
     Matnr selectMatnrById(Long id);
 
     boolean bindMatnrs(MatnrToGroupParams params);
-
-    boolean batchUpdate(MatnrToGroupParams params);
 }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index f8d44ba..23f5eb2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -2,6 +2,8 @@
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -159,38 +161,6 @@
                 .set(Matnr::getGroupCode, groups.getCode()))) {
             throw new CoolException("缁戝畾澶辫触锛侊紒");
         }
-        return true;
-    }
-
-    /**
-     * 鎵归噺淇敼鐗╂枡
-     * @param params
-     * @return
-     */
-    @Override
-    public boolean batchUpdate(MatnrToGroupParams params) {
-        if (Objects.isNull(params.getMatnr())) {
-            throw new CoolException("鐗╂枡灞炴�т笉鑳戒负绌猴紒锛�");
-        }
-        if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
-            throw new CoolException("鎵�閫夌墿鏂欎笉鑳戒负绌猴紒锛�");
-        }
-        Matnr matnr = params.getMatnr();
-        if (!this.update(new LambdaUpdateWrapper<Matnr>().in(Matnr::getId, params.getIds())
-                .set(!Objects.isNull(matnr.getStatus()), Matnr::getStatus, matnr.getStatus())
-                .set(!Objects.isNull(matnr.getFlagCheck()), Matnr::getFlagCheck, matnr.getFlagCheck())
-                .set(!Objects.isNull(matnr.getFlagLabelMange()), Matnr::getFlagLabelMange, matnr.getFlagLabelMange())
-                .set(!Objects.isNull(matnr.getStockLevel()), Matnr::getStockLevel, matnr.getStockLevel())
-                .set(!Objects.isNull(matnr.getShipperId()), Matnr::getShipperId, matnr.getShipperId())
-                .set(!Objects.isNull(matnr.getMinQty()), Matnr::getMinQty, matnr.getMinQty())
-                .set(!Objects.isNull(matnr.getMaxQty()), Matnr::getMaxQty, matnr.getMaxQty())
-                .set(!Objects.isNull(matnr.getValid()), Matnr::getValid, matnr.getValid())
-                .set(!Objects.isNull(matnr.getValidWarn()), Matnr::getValidWarn, matnr.getValidWarn())
-                .set(!Objects.isNull(matnr.getStockUnit()), Matnr::getStockUnit, matnr.getStockUnit())
-        )) {
-            throw new CoolException("鎵归噺鎿嶄綔澶辫触锛侊紒");
-        }
-
         return true;
     }
 

--
Gitblit v1.9.1