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

guoyujie

3 天以前 c4b9a339caff12e95f61c3d5dc950aafcc8c566c

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

@@ -15,43 +15,38 @@
import java.util.Map;

@RestController
@RequestMapping("/MaterialStore")
@RequestMapping("/materialStore")
@Api(value="物料controller",tags={"物料操作接口"})
public class MaterialStoreController {
    @Autowired
    MaterialStoreService materialStoreService;

    @ApiOperation("物料新增接口")
    @SaCheckPermission("CreateIngredients.add")
    @SaCheckPermission("createIngredients.add")
    @PostMapping("/saveMaterialStore")
    public Result saveMaterialStore( @RequestBody Map<String,Object>  object){
        if(materialStoreService.saveMaterialStore(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

        }
        return Result.seccess(materialStoreService.saveMaterialStore(object));
    }

    @ApiOperation("物料查询接口")
    @SaCheckPermission("SelectIngredients.search")
    @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));
    }

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

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

            return Result.seccess();

        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");

        }
        return Result.seccess(materialStoreService.deleteMaterialStore(object));
    }