From 81cad8df0f1b33700e7fc80f271eda7f1180efb0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 14 十月 2025 14:51:17 +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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 bacef23..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
@@ -31,9 +31,9 @@
@ApiOperation("鍩虹鏁版嵁鏌ヨ")
@SaCheckPermission("warehouseSearchBasicData.search")
- @GetMapping("/getBasicWarehouse")
- public Result getBasicWarehouse(){
- return Result.seccess(basicWarehouseTypeService.getBasicWarehouse());
+ @PostMapping("/getBasicWarehouse")
+ public Result getBasicWarehouse(@RequestBody Map<String,Object> map){
+ return Result.seccess(basicWarehouseTypeService.getBasicWarehouse(map));
}
@ApiOperation("鍩虹鏁版嵁鏂板")
@@ -56,4 +56,10 @@
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