From 047545d48c78f39e8cf4082dbcdd2be15654470f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 11 十二月 2025 16:12:20 +0800
Subject: [PATCH] 订单bom界面bom查询bug,部分情况重量不显示bug

---
 north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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..7c8b957 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
@@ -20,40 +20,46 @@
     @ApiOperation("鍩虹鏁版嵁鏌ヨ杩斿洖鎸囧畾鍒�")
     @GetMapping("/BasicWarehouseType/{type}")
     public Result getBasicWarehouseType(@PathVariable String type){
-        return Result.seccess(basicWarehouseTypeService.getBasicWarehouseType(type));
+        return Result.success(basicWarehouseTypeService.getBasicWarehouseType(type));
     }
 
     @ApiOperation("鍩虹鏁版嵁鏌ヨ杩斿洖json瀵硅薄鏍煎紡")
     @GetMapping("/BasicWarehouseTypes/{type}")
     public Result getBasicWarehouseTypes(@PathVariable String type){
-        return Result.seccess(basicWarehouseTypeService.getBasicWarehouseTypes(type));
+        return Result.success(basicWarehouseTypeService.getBasicWarehouseTypes(type));
     }
 
     @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.success(basicWarehouseTypeService.getBasicWarehouse(map));
     }
 
     @ApiOperation("鍩虹鏁版嵁鏂板")
     @SaCheckPermission("warehouseSearchBasicData.add")
     @PostMapping("addBasicWarehouse")
     public Result addBasicWarehouse(@RequestBody Map<String,Object> map){
-        return  Result.seccess(basicWarehouseTypeService.addBasicWarehouse(map));
+        return  Result.success(basicWarehouseTypeService.addBasicWarehouse(map));
     }
     @ApiOperation("鍩虹鏁版嵁淇敼")
     @SaCheckPermission("warehouseSearchBasicData.update")
     @PostMapping("updateBasicWarehouse")
     public Result updateBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
-        return  Result.seccess(basicWarehouseTypeService.updateBasicWarehouse(basicWarehouseType));
+        return  Result.success(basicWarehouseTypeService.updateBasicWarehouse(basicWarehouseType));
     }
 
     @ApiOperation("鍩虹鏁版嵁鍒犻櫎")
     @SaCheckPermission("warehouseSearchBasicData.delete")
     @PostMapping("deleteBasicWarehouse")
     public Result deleteBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
-        return  Result.seccess(basicWarehouseTypeService.deleteBasicWarehouse(basicWarehouseType));
+        return  Result.success(basicWarehouseTypeService.deleteBasicWarehouse(basicWarehouseType));
+    }
+
+    @ApiOperation("鐢ㄦ埛鍩虹鏁版嵁鏌ヨ杩斿洖json瀵硅薄鏍煎紡")
+    @GetMapping("/BasicWarehouseTypeUser/{type}")
+    public Result BasicWarehouseTypeUser(@PathVariable String type){
+        return Result.success(basicWarehouseTypeService.BasicWarehouseTypeUser(type));
     }
 
 }

--
Gitblit v1.8.0