From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 f081b19..3c141fb 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,10 +1,9 @@
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;
@@ -31,26 +30,36 @@
}
@ApiOperation("鍩虹鏁版嵁鏌ヨ")
- @GetMapping("/getBasicWarehouse")
- public Result getBasicWarehouse(){
- return Result.seccess(basicWarehouseTypeService.getBasicWarehouse());
+ @SaCheckPermission("warehouseSearchBasicData.search")
+ @PostMapping("/getBasicWarehouse")
+ public Result getBasicWarehouse(@RequestBody Map<String,Object> map){
+ return Result.seccess(basicWarehouseTypeService.getBasicWarehouse(map));
}
@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));
}
+ @ApiOperation("鐢ㄦ埛鍩虹鏁版嵁鏌ヨ杩斿洖json瀵硅薄鏍煎紡")
+ @GetMapping("/BasicWarehouseTypeUser/{type}")
+ public Result BasicWarehouseTypeUser(@PathVariable String type){
+ return Result.seccess(basicWarehouseTypeService.BasicWarehouseTypeUser(type));
+ }
+
}
--
Gitblit v1.8.0