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

chenlu

2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d

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

@@ -95,39 +95,21 @@
    @SaCheckPermission("CreateOutbound.review")
    @PostMapping("/updateMaterialOutboundToExamine")
    public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateMaterialOutboundToExamine(object)){
            return Result.seccess();

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

        }
        return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
    }

    @ApiOperation("材料出库删除接口")
    @SaCheckPermission("MaterialOutbound.delete")
    @PostMapping("/deleteMaterialOutbound")
    public Result deleteMaterialOutbound( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.deleteMaterialOutbound(object)){

            return Result.seccess();

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

        }
        return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
    }

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

        }
        return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
    }

    @ApiOperation("物料返库新增查询接口")
@@ -141,13 +123,7 @@
    @SaCheckPermission("ReturnToStorageCreate.review")
    @PostMapping("/updateReturningWarehouseToExamine")
    public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateReturningWarehouseToExamine(object)){
            return Result.seccess();

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

        }
        return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
    }