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

guoyujie

7 天以前 1750abd11320f8d09ffe1580b7467dba87c86c89

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

}