From b9f26944fbf636d1f20b1674478fedf8d318a74f Mon Sep 17 00:00:00 2001 From: Felix Morales Date: Tue, 16 Jan 2024 12:20:11 -0600 Subject: [PATCH] Agregar multiples rectificaciones a un mismo trafico --- .../ICorresponsaliasTraficosRepository.cs | 4 +-- .../Corresponsalias/TraficosController.cs | 13 ++++++--- .../DTORectificacionHistorico.cs | 11 ++++++++ ...sponsaliasTraficoRectificacionHistorico.cs | 1 + .../CorresponsaliasTraficosRepository.cs | 28 +++++++++++++++---- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/Contracts/Corresponsalias/ICorresponsaliasTraficosRepository.cs b/Contracts/Corresponsalias/ICorresponsaliasTraficosRepository.cs index b85c54c..17a9892 100644 --- a/Contracts/Corresponsalias/ICorresponsaliasTraficosRepository.cs +++ b/Contracts/Corresponsalias/ICorresponsaliasTraficosRepository.cs @@ -17,8 +17,8 @@ namespace CORRESPONSALBackend.Contracts.Corresponsalias public Task Append(ITrafico data); public Task> GetTraficoEstatus(); public Task ValidaTraficoCompleto(DTOTraficoCompleto data); - public Task RectificacionHistoricoAppend(DTORectificacionHistorico data); - public Task RectificacionHistoricoGet(int IdTrafico); + public Task RectificacionHistoricoAppend(DTORectificacionHistorico data); + public Task> RectificacionHistoricoGet(int IdTrafico); public Task ValidaTraficoDuplicado(int aduana, int patente, int pedimento, int idTrafico); } diff --git a/Controllers/Corresponsalias/TraficosController.cs b/Controllers/Corresponsalias/TraficosController.cs index 7b59b08..b1e52ff 100644 --- a/Controllers/Corresponsalias/TraficosController.cs +++ b/Controllers/Corresponsalias/TraficosController.cs @@ -136,15 +136,20 @@ namespace CORRESPONSALBackend.Controllers.Corresponsalias [HttpPost] [Route("Rectificacion/Historico/Append")] - public async Task RectificacionHistoricoAppend(DTORectificacionHistorico data) + public async Task RectificacionHistoricoAppend(DTORectificacionHistorico data) { - var entrada = await _Repo.RectificacionHistoricoAppend(data); - return entrada; + try{ + var entrada = await _Repo.RectificacionHistoricoAppend(data); + return Ok(entrada); + }catch(Exception ex){ + return BadRequest(ex.Message); + } + } [HttpGet] [Route("Rectificacion/Historico/Get")] - public async Task RectificacionHistoricoGet(int IdTrafico) + public async Task> RectificacionHistoricoGet(int IdTrafico) { var entrada = await _Repo.RectificacionHistoricoGet(IdTrafico); return entrada; diff --git a/DTO/Corresponsales/DTORectificacionHistorico.cs b/DTO/Corresponsales/DTORectificacionHistorico.cs index 95e8084..63ea448 100644 --- a/DTO/Corresponsales/DTORectificacionHistorico.cs +++ b/DTO/Corresponsales/DTORectificacionHistorico.cs @@ -5,5 +5,16 @@ namespace CORRESPONSALBackend.DTO.Corresponsales { public int IdTrafico { get; set; } = 0; public int IdUsuario { get; set; } = 0; + public int IdPedimento { get; set; } = 0; + public int Aduana { get; set; } = 0; + public int Patente { get; set; } = 0; + public int Pedimento { get; set; } = 0; + public string Clave { get; set; } = ""; + public string FechaPago { get; set; } = ""; + public int AduanaH { get; set; } = 0; + public int PatenteH { get; set; } = 0; + public int PedimentoH { get; set; } = 0; + public string ClaveH { get; set; } = ""; + public string FechaPagoH { get; set; } = ""; } } \ No newline at end of file diff --git a/Repository/Corresponsalias/CorresponsaliasTraficoRectificacionHistorico.cs b/Repository/Corresponsalias/CorresponsaliasTraficoRectificacionHistorico.cs index 379c408..fd23643 100644 --- a/Repository/Corresponsalias/CorresponsaliasTraficoRectificacionHistorico.cs +++ b/Repository/Corresponsalias/CorresponsaliasTraficoRectificacionHistorico.cs @@ -12,5 +12,6 @@ namespace CORRESPONSALBackend.Repository.Corresponsalias public string FechaPago { get; set; } = null!; public string FHCreacion { get; set; } = null!; public byte Activo { get; set; } = 0; + public int IdPedimentoConsolidado {get;set;} = 0 ; } } \ No newline at end of file diff --git a/Repository/Corresponsalias/CorresponsaliasTraficosRepository.cs b/Repository/Corresponsalias/CorresponsaliasTraficosRepository.cs index aca37c0..289499c 100644 --- a/Repository/Corresponsalias/CorresponsaliasTraficosRepository.cs +++ b/Repository/Corresponsalias/CorresponsaliasTraficosRepository.cs @@ -161,23 +161,39 @@ namespace CORRESPONSALBackend.Repository.Corresponsalias return true; } - public async Task RectificacionHistoricoAppend(DTORectificacionHistorico data) + public async Task RectificacionHistoricoAppend(DTORectificacionHistorico data) { try { var query = "[Corresponsales.Trafico.Rectificacion.Historico.Append]"; using var connection = _context.CreateConnection(); - var entrada = await connection.QueryAsync(query, new { @data.IdTrafico, @data.IdUsuario }, commandType: CommandType.StoredProcedure); - return true; - }catch(Exception ex) { return false; } + var entrada = await connection.QueryFirstAsync(query, new { + @data.IdTrafico, + @data.IdUsuario, + @data.IdPedimento, + @data.Aduana, + @data.Patente, + @data.Pedimento, + @data.Clave, + @data.FechaPago, + @data.AduanaH, + data.PatenteH, + data.PedimentoH, + data.ClaveH, + data.FechaPagoH + }, commandType: CommandType.StoredProcedure); + return entrada; + }catch(Exception ex) { + throw new Exception(ex.Message); + } } - public async Task RectificacionHistoricoGet(int IdTrafico) + public async Task> RectificacionHistoricoGet(int IdTrafico) { var query = "[Corresponsales.Trafico.Rectificacion.Historico.Get]"; using var connection = _context.CreateConnection(); var entrada = await connection.QueryAsync(query, new { @IdTrafico }, commandType: CommandType.StoredProcedure); - return entrada.FirstOrDefault(new CorresponsaliasTraficoRectificacionHistorico { }); + return entrada; } public async Task ValidaTraficoDuplicado(int aduana, int patente, int pedimento, int idTrafico)