diff --git a/Contracts/Catalogos/ITabuladorRepository.cs b/Contracts/Catalogos/ITabuladorRepository.cs index 301769b..fe7dd62 100644 --- a/Contracts/Catalogos/ITabuladorRepository.cs +++ b/Contracts/Catalogos/ITabuladorRepository.cs @@ -3,7 +3,7 @@ namespace CORRESPONSALBackend.Contracts.Catalogos { public interface ITabuladorRepository { - public Task> GetAll(int id, int IdCliente); + public Task> GetAll(int id, int IdCliente, int? idCorresponsal); public Task Append(Tabulador data); public Task Delete(int id); } diff --git a/Controllers/Catalogos/TabuladorController.cs b/Controllers/Catalogos/TabuladorController.cs index 72d70f6..c5f9bdc 100644 --- a/Controllers/Catalogos/TabuladorController.cs +++ b/Controllers/Catalogos/TabuladorController.cs @@ -22,16 +22,16 @@ namespace CORRESPONSALBackend.Controllers.Catalogos [HttpGet] [Route("getAll")] - public async Task> GetAll(int id, int IdCliente) + public async Task> GetAll(int id, int IdCliente, int? idCorresponsal) { - return await _Repo.GetAll(id, IdCliente); + return await _Repo.GetAll(id, IdCliente, idCorresponsal); } [HttpGet] [Route("getByCustomer")] public async Task> GetByCustomer(int IdCliente) { - return await _Repo.GetAll(0, IdCliente); + return await _Repo.GetAll(0, IdCliente, 0); } diff --git a/Models/Catalogos/Tabulador.cs b/Models/Catalogos/Tabulador.cs index a1a53a3..6862824 100644 --- a/Models/Catalogos/Tabulador.cs +++ b/Models/Catalogos/Tabulador.cs @@ -6,5 +6,8 @@ public string Nombre { set; get; } = null!; public int IdCliente { set; get; } = 0; public Boolean Activo { set; get; } = true; + public int? IdCorresponsal {get;set;} = null; + public int? Tipo {get; set;} = 0; + public int? Moneda {get; set;} = 0; } } diff --git a/Models/Catalogos/TabuladorDetalle.cs b/Models/Catalogos/TabuladorDetalle.cs index 36df093..e9415cc 100644 --- a/Models/Catalogos/TabuladorDetalle.cs +++ b/Models/Catalogos/TabuladorDetalle.cs @@ -8,5 +8,6 @@ public string? Concepto { set; get; } = null!; public double Costo { set; get; } = 0; public int Activo { set; get; } = 0; + public double CostoCorresponsal { set; get; } = 0; } } diff --git a/Models/Corresponsales/IPrecuenta.cs b/Models/Corresponsales/IPrecuenta.cs index fce9658..fa7225a 100644 --- a/Models/Corresponsales/IPrecuenta.cs +++ b/Models/Corresponsales/IPrecuenta.cs @@ -9,5 +9,6 @@ public string Concepto { get; set; } = null!; public double Costo { get; set; } = 0; public byte Activo { get; set; } = 0; + public double CostoCorresponsal {get; set;} = 0; } } diff --git a/Repository/Catalogos/TabuladorDetalleRepository.cs b/Repository/Catalogos/TabuladorDetalleRepository.cs index 88c6ebe..8a83a96 100644 --- a/Repository/Catalogos/TabuladorDetalleRepository.cs +++ b/Repository/Catalogos/TabuladorDetalleRepository.cs @@ -21,6 +21,7 @@ namespace CORRESPONSALBackend.Repository.Catalogos data.IdTabulador, data.IdConcepto, data.Costo, + data.CostoCorresponsal }, commandType: CommandType.StoredProcedure); return entrada; diff --git a/Repository/Catalogos/TabuladorRepository.cs b/Repository/Catalogos/TabuladorRepository.cs index c214709..8185ba4 100644 --- a/Repository/Catalogos/TabuladorRepository.cs +++ b/Repository/Catalogos/TabuladorRepository.cs @@ -12,14 +12,15 @@ namespace CORRESPONSALBackend.Repository.Catalogos private readonly DapperContext _context; public TabuladorRepository(DapperContext context) { _context = context; } - public async Task> GetAll(int id, int IdCliente) + public async Task> GetAll(int id, int IdCliente, int? idCorresponsal) { var query = "[Catalogo.Tabulador.Get]"; using var connection = _context.CreateConnection(); var entrada = await connection.QueryAsync(query, new { @id = id, - @IdCliente = IdCliente + @IdCliente = IdCliente, + @IdCorresponsal = idCorresponsal }, commandType: CommandType.StoredProcedure); return entrada; @@ -35,6 +36,9 @@ namespace CORRESPONSALBackend.Repository.Catalogos data.id, data.Nombre, data.IdCliente, + data.IdCorresponsal, + data.Tipo, + data.Moneda }, commandType: CommandType.StoredProcedure); return entrada.First();