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

廖井涛

18 小时以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java

@@ -25,21 +25,35 @@
    @SaCheckPermission("createIngredients.add")
    @PostMapping("/saveMaterialStore")
    public Result saveMaterialStore( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialStoreService.saveMaterialStore(object));
        return Result.success(materialStoreService.saveMaterialStore(object));
    }

    @ApiOperation("物料查询接口")
    @SaCheckPermission("selectIngredients.search")
    @PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
    public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
        return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
        return Result.success(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
    }

    @ApiOperation("产品Bom物料查询接口")
    @SaCheckPermission("selectIngredients.search")
    @PostMapping("/getSelectProductBOM/{pageNum}/{pageSize}")
    public Result getSelectProductBOM(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
        return Result.success(materialStoreService.getSelectProductBOM(pageNum,pageSize,materialStore));
    }

    @ApiOperation("物料查询接口")
    @SaCheckPermission("selectIngredients.search")
    @PostMapping("/getSelectMaterialStore")
    public Result getSelectMaterialStores(@RequestBody MaterialStore materialStore){
        return Result.success(materialStoreService.getSelectMaterialStores(materialStore));
    }

    @ApiOperation("物料删除接口")
    @SaCheckPermission("selectIngredients.delete")
    @PostMapping("/deleteMaterialStore")
    public Result deleteMaterialStore( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialStoreService.deleteMaterialStore(object));
        return Result.success(materialStoreService.deleteMaterialStore(object));
    }