Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-10-14 81cad8df0f1b33700e7fc80f271eda7f1180efb0

 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));
    }

}