From 6712176496ebf80503c25e90df94cd0727b785f4 Mon Sep 17 00:00:00 2001 From: Felix Morales Date: Wed, 10 Apr 2024 14:30:13 -0500 Subject: [PATCH 1/3] Se agrega la propiedad IdCorresponsal a los tabuladores para hacer la distincion cuando es un tabulador de cliente y cuando es de corresponsal --- Contracts/Catalogos/ITabuladorRepository.cs | 2 +- Controllers/Catalogos/TabuladorController.cs | 6 +++--- DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs | 2 ++ Models/Catalogos/Tabulador.cs | 1 + Repository/Catalogos/TabuladorRepository.cs | 6 ++++-- 5 files changed, 11 insertions(+), 6 deletions(-) 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/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs b/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs index 7107ae9..ef9ca25 100644 --- a/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs +++ b/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs @@ -19,5 +19,7 @@ namespace CORRESPONSALBackend.DTO.Reportes.CuentasCerradas{ public string ValorComercial { get; set; } public string Fracciones { get; set; } public string Caja { get; set; } + public string FechaCruce {get;set;} + public string Semaforo {get;set;} } } \ No newline at end of file diff --git a/Models/Catalogos/Tabulador.cs b/Models/Catalogos/Tabulador.cs index a1a53a3..f17210b 100644 --- a/Models/Catalogos/Tabulador.cs +++ b/Models/Catalogos/Tabulador.cs @@ -6,5 +6,6 @@ public string Nombre { set; get; } = null!; public int IdCliente { set; get; } = 0; public Boolean Activo { set; get; } = true; + public int? IdCorresponsal {get;set;} = null; } } diff --git a/Repository/Catalogos/TabuladorRepository.cs b/Repository/Catalogos/TabuladorRepository.cs index c214709..d962a2d 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,7 @@ namespace CORRESPONSALBackend.Repository.Catalogos data.id, data.Nombre, data.IdCliente, + data.IdCorresponsal }, commandType: CommandType.StoredProcedure); return entrada.First(); From 6ae359d50aeb94c885d1973ba5c6567f84eabd80 Mon Sep 17 00:00:00 2001 From: Felix Morales Date: Wed, 10 Apr 2024 14:33:02 -0500 Subject: [PATCH 2/3] Se quitan propiedades del DTO que no corresponden al desarrollo de esta rama --- DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs b/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs index ef9ca25..7107ae9 100644 --- a/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs +++ b/DTO/Reportes/CuentasCerradas/DTOReporteCuentasCerradas.cs @@ -19,7 +19,5 @@ namespace CORRESPONSALBackend.DTO.Reportes.CuentasCerradas{ public string ValorComercial { get; set; } public string Fracciones { get; set; } public string Caja { get; set; } - public string FechaCruce {get;set;} - public string Semaforo {get;set;} } } \ No newline at end of file From 8f21cff4c235e878ed7ec0169472123322fce32f Mon Sep 17 00:00:00 2001 From: Felix Morales Date: Mon, 15 Apr 2024 16:59:13 -0500 Subject: [PATCH 3/3] Se agregan las propiedades Tipo y Moneda a los tabuladores y la propiedad CostoCorresponsal al detalle de los tabuladores --- Models/Catalogos/Tabulador.cs | 2 ++ Models/Catalogos/TabuladorDetalle.cs | 1 + Models/Corresponsales/IPrecuenta.cs | 1 + Repository/Catalogos/TabuladorDetalleRepository.cs | 1 + Repository/Catalogos/TabuladorRepository.cs | 4 +++- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Models/Catalogos/Tabulador.cs b/Models/Catalogos/Tabulador.cs index f17210b..6862824 100644 --- a/Models/Catalogos/Tabulador.cs +++ b/Models/Catalogos/Tabulador.cs @@ -7,5 +7,7 @@ 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 d962a2d..8185ba4 100644 --- a/Repository/Catalogos/TabuladorRepository.cs +++ b/Repository/Catalogos/TabuladorRepository.cs @@ -36,7 +36,9 @@ namespace CORRESPONSALBackend.Repository.Catalogos data.id, data.Nombre, data.IdCliente, - data.IdCorresponsal + data.IdCorresponsal, + data.Tipo, + data.Moneda }, commandType: CommandType.StoredProcedure); return entrada.First();