From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java
index 6e13d5f..c1740ae 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java
@@ -1,27 +1,61 @@
 package com.example.erp.controller.mm;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.example.erp.common.Result;
+import com.example.erp.entity.mm.BasicWarehouseType;
+import com.example.erp.entity.sd.BasicData;
 import com.example.erp.service.mm.BasicWarehouseTypeService;
 import com.example.erp.service.sd.BasicDateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 @RestController
+@Api(value="浠撳簱鍩虹鏁版嵁controller",tags={"浠撳簱鍩虹鏁版嵁鎿嶄綔鎺ュ彛"})
 @RequestMapping("/BasicWarehouse")
 public class BasicWarehouseTypeController {
     @Autowired
     BasicWarehouseTypeService basicWarehouseTypeService;
+    @ApiOperation("鍩虹鏁版嵁鏌ヨ杩斿洖鎸囧畾鍒�")
     @GetMapping("/BasicWarehouseType/{type}")
     public Result getBasicWarehouseType(@PathVariable String type){
         return Result.seccess(basicWarehouseTypeService.getBasicWarehouseType(type));
     }
 
+    @ApiOperation("鍩虹鏁版嵁鏌ヨ杩斿洖json瀵硅薄鏍煎紡")
     @GetMapping("/BasicWarehouseTypes/{type}")
     public Result getBasicWarehouseTypes(@PathVariable String type){
         return Result.seccess(basicWarehouseTypeService.getBasicWarehouseTypes(type));
     }
 
+    @ApiOperation("鍩虹鏁版嵁鏌ヨ")
+    @SaCheckPermission("warehouseSearchBasicData.search")
+    @GetMapping("/getBasicWarehouse")
+    public Result getBasicWarehouse(){
+        return Result.seccess(basicWarehouseTypeService.getBasicWarehouse());
+    }
+
+    @ApiOperation("鍩虹鏁版嵁鏂板")
+    @SaCheckPermission("warehouseSearchBasicData.add")
+    @PostMapping("addBasicWarehouse")
+    public Result addBasicWarehouse(@RequestBody Map<String,Object> map){
+        return  Result.seccess(basicWarehouseTypeService.addBasicWarehouse(map));
+    }
+    @ApiOperation("鍩虹鏁版嵁淇敼")
+    @SaCheckPermission("warehouseSearchBasicData.update")
+    @PostMapping("updateBasicWarehouse")
+    public Result updateBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
+        return  Result.seccess(basicWarehouseTypeService.updateBasicWarehouse(basicWarehouseType));
+    }
+
+    @ApiOperation("鍩虹鏁版嵁鍒犻櫎")
+    @SaCheckPermission("warehouseSearchBasicData.delete")
+    @PostMapping("deleteBasicWarehouse")
+    public Result deleteBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
+        return  Result.seccess(basicWarehouseTypeService.deleteBasicWarehouse(basicWarehouseType));
+    }
+
 }

--
Gitblit v1.8.0