diff --git a/.vs/AMAZONBackend/DesignTimeBuild/.dtbcache.v2 b/.vs/AMAZONBackend/DesignTimeBuild/.dtbcache.v2 index 4e15007..79eb4ed 100644 Binary files a/.vs/AMAZONBackend/DesignTimeBuild/.dtbcache.v2 and b/.vs/AMAZONBackend/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/AMAZONBackend/FileContentIndex/0202cbdd-b767-486e-9dff-a9d11125902c.vsidx b/.vs/AMAZONBackend/FileContentIndex/0202cbdd-b767-486e-9dff-a9d11125902c.vsidx new file mode 100644 index 0000000..6676ef0 Binary files /dev/null and b/.vs/AMAZONBackend/FileContentIndex/0202cbdd-b767-486e-9dff-a9d11125902c.vsidx differ diff --git a/.vs/AMAZONBackend/FileContentIndex/09101eb2-8c39-4997-9bbb-f4c851051775.vsidx b/.vs/AMAZONBackend/FileContentIndex/09101eb2-8c39-4997-9bbb-f4c851051775.vsidx deleted file mode 100644 index 9d03c3f..0000000 Binary files a/.vs/AMAZONBackend/FileContentIndex/09101eb2-8c39-4997-9bbb-f4c851051775.vsidx and /dev/null differ diff --git a/.vs/AMAZONBackend/FileContentIndex/36d9c54f-3dfc-4e10-a158-44b13c6348bf.vsidx b/.vs/AMAZONBackend/FileContentIndex/36d9c54f-3dfc-4e10-a158-44b13c6348bf.vsidx new file mode 100644 index 0000000..010a774 Binary files /dev/null and b/.vs/AMAZONBackend/FileContentIndex/36d9c54f-3dfc-4e10-a158-44b13c6348bf.vsidx differ diff --git a/.vs/AMAZONBackend/FileContentIndex/38f8d4fe-7b51-46e0-9dc9-71693e13388f.vsidx b/.vs/AMAZONBackend/FileContentIndex/38f8d4fe-7b51-46e0-9dc9-71693e13388f.vsidx new file mode 100644 index 0000000..1b39710 Binary files /dev/null and b/.vs/AMAZONBackend/FileContentIndex/38f8d4fe-7b51-46e0-9dc9-71693e13388f.vsidx differ diff --git a/.vs/AMAZONBackend/FileContentIndex/78fabd2c-406f-4194-9286-ddfccec0e988.vsidx b/.vs/AMAZONBackend/FileContentIndex/78fabd2c-406f-4194-9286-ddfccec0e988.vsidx deleted file mode 100644 index 27ea9c4..0000000 Binary files a/.vs/AMAZONBackend/FileContentIndex/78fabd2c-406f-4194-9286-ddfccec0e988.vsidx and /dev/null differ diff --git a/.vs/AMAZONBackend/FileContentIndex/7a693f00-0b2c-46fa-85c7-dccffed04f2e.vsidx b/.vs/AMAZONBackend/FileContentIndex/7a693f00-0b2c-46fa-85c7-dccffed04f2e.vsidx deleted file mode 100644 index a8de3e0..0000000 Binary files a/.vs/AMAZONBackend/FileContentIndex/7a693f00-0b2c-46fa-85c7-dccffed04f2e.vsidx and /dev/null differ diff --git a/.vs/AMAZONBackend/FileContentIndex/8edeb720-1936-46b8-93f1-2967f6e56ac9.vsidx b/.vs/AMAZONBackend/FileContentIndex/8edeb720-1936-46b8-93f1-2967f6e56ac9.vsidx new file mode 100644 index 0000000..5e75b38 Binary files /dev/null and b/.vs/AMAZONBackend/FileContentIndex/8edeb720-1936-46b8-93f1-2967f6e56ac9.vsidx differ diff --git a/.vs/AMAZONBackend/FileContentIndex/ab87a971-1056-4376-a9f1-5009541240dd.vsidx b/.vs/AMAZONBackend/FileContentIndex/ab87a971-1056-4376-a9f1-5009541240dd.vsidx deleted file mode 100644 index 5a1bd52..0000000 Binary files a/.vs/AMAZONBackend/FileContentIndex/ab87a971-1056-4376-a9f1-5009541240dd.vsidx and /dev/null differ diff --git a/.vs/AMAZONBackend/v17/.futdcache.v2 b/.vs/AMAZONBackend/v17/.futdcache.v2 index f0eeb0e..7fd7d11 100644 Binary files a/.vs/AMAZONBackend/v17/.futdcache.v2 and b/.vs/AMAZONBackend/v17/.futdcache.v2 differ diff --git a/.vs/AMAZONBackend/v17/.suo b/.vs/AMAZONBackend/v17/.suo index a0b729d..e6ccc9e 100644 Binary files a/.vs/AMAZONBackend/v17/.suo and b/.vs/AMAZONBackend/v17/.suo differ diff --git a/.vs/ProjectEvaluation/amazonbackend.metadata.v5.2 b/.vs/ProjectEvaluation/amazonbackend.metadata.v5.2 index 0a786d9..f79887a 100644 Binary files a/.vs/ProjectEvaluation/amazonbackend.metadata.v5.2 and b/.vs/ProjectEvaluation/amazonbackend.metadata.v5.2 differ diff --git a/.vs/ProjectEvaluation/amazonbackend.projects.v5.2 b/.vs/ProjectEvaluation/amazonbackend.projects.v5.2 index 385bc51..8e0626d 100644 Binary files a/.vs/ProjectEvaluation/amazonbackend.projects.v5.2 and b/.vs/ProjectEvaluation/amazonbackend.projects.v5.2 differ diff --git a/AMAZONBackend/Clientes/Amazon/Contracts/IAmazonRepository.cs b/AMAZONBackend/Clientes/Amazon/Contracts/IAmazonRepository.cs index 0cff87c..80f21d0 100644 --- a/AMAZONBackend/Clientes/Amazon/Contracts/IAmazonRepository.cs +++ b/AMAZONBackend/Clientes/Amazon/Contracts/IAmazonRepository.cs @@ -36,7 +36,9 @@ namespace AMAZONBackend.Clientes.Amazon.Contracts public Task EnviaEsperaRespuestaAmazon(int id); public Task AssignInvoice(int IdUsuario, int IdFactura); - public Task >Rpt2096InvocePedPagados(DateTime FechaIncio, DateTime FechaFin, int TipoOperacion); + //public Task> Rpt2096InvocePedPagados(string Inicio, string Fin, int TipoOperacion); + + public Task> Rpt2096InvocePedPagados(DateTime Inicio, DateTime Fin, int TipoOperacion); diff --git a/AMAZONBackend/Clientes/Amazon/Model/IRpt2096InvoicePedPagados.cs b/AMAZONBackend/Clientes/Amazon/Model/IRpt2096InvoicePedPagados.cs index dc627bb..281b7db 100644 --- a/AMAZONBackend/Clientes/Amazon/Model/IRpt2096InvoicePedPagados.cs +++ b/AMAZONBackend/Clientes/Amazon/Model/IRpt2096InvoicePedPagados.cs @@ -4,10 +4,21 @@ namespace AMAZONBackend.Clientes.Amazon.Model { public class IRpt2096InvoicePedPagados { + //public string? sNumeroLargo { get; set; } = null; + //public string? sPedimento { get; set; } = null; + //public string dFechaFirmaBanco { get; set; } = null!; + //public string? sClave { get; set;} = null; + //public double nValoresDolares { get; set; } + //public double nValorAduana { get; set; } + //public string? sRazonSocial { get; set; } + //public byte TipoOp { get; set; } + //public int Aduana { get; set; } + + public string? sNumeroLargo { get; set; } = null; public string? sPedimento { get; set; } = null; - public DateTime dFechaFirmaBanco { get; set; } - public string? sClave { get; set;} + public DateTime dFechaFirmaBanco { get; set; } + public string? sClave { get; set; } = null; public double nValoresDolares { get; set; } public double nValorAduana { get; set; } public string? sRazonSocial { get; set; } @@ -17,5 +28,6 @@ namespace AMAZONBackend.Clientes.Amazon.Model + } } diff --git a/AMAZONBackend/Clientes/Amazon/Repository/AmazonRepository.cs b/AMAZONBackend/Clientes/Amazon/Repository/AmazonRepository.cs index 110a995..37a4803 100644 --- a/AMAZONBackend/Clientes/Amazon/Repository/AmazonRepository.cs +++ b/AMAZONBackend/Clientes/Amazon/Repository/AmazonRepository.cs @@ -413,22 +413,45 @@ namespace AMAZONBackend.Clientes.Amazon.Repository } - public async Task > Rpt2096InvocePedPagados( DateTime FechaIncio , DateTime FechaFin , int TipoOperacion ) + //public async Task> Rpt2096InvocePedPagados(string Inicio, string Fin,int TipoOperaciones) + //{ + // var querry = "[Reportes.Web.Clientes.Amazon.Get]"; + // using var connection = _context.CreateConnection(); + // var result = await connection.QueryAsync(querry, new + // { + // @Inicio , + // @Fin , + // @TipoOperaciones + + // }, commandType : CommandType.StoredProcedure); + + // return result.ToList(); + + //} + + + public async Task> Rpt2096InvocePedPagados(DateTime Inicio, DateTime Fin, int TipoOperaciones) { - var querry = " [Reportes.Web.Clientes.Amazon.Get]"; + var querry = "[Reportes.Web.Clientes.Amazon.Get]"; using var connection = _context.CreateConnection(); var result = await connection.QueryAsync(querry, new { - @FechaIncio, - @FechaFin + @Inicio, + @Fin, + @TipoOperaciones - }, commandType : CommandType.StoredProcedure); + }, commandType: CommandType.StoredProcedure); - return result; + return result.ToList(); } + + + + + } } diff --git a/AMAZONBackend/Controllers/Clientes/Amazon/AmazonInvoiceController.cs b/AMAZONBackend/Controllers/Clientes/Amazon/AmazonInvoiceController.cs index 34b81ae..e05ac42 100644 --- a/AMAZONBackend/Controllers/Clientes/Amazon/AmazonInvoiceController.cs +++ b/AMAZONBackend/Controllers/Clientes/Amazon/AmazonInvoiceController.cs @@ -338,30 +338,24 @@ namespace AMAZONBackend.Controllers.Clientes.Amazon - [HttpGet] - [Route(" Rpt2096InvoicePediPagadosGET")] - public async Task>Rpt2096InvocePedPagados(DateTime FechaInicio, DateTime FechaFin, int TipoOperacion) - { - - - DateTime horaInicio = new DateTime(00, 00, 01); - DateTime horafin = new DateTime(23, 59, 59); - - if (FechaInicio == horaInicio) - { - BadRequest(" La Fecha Y Hora no puede ser 00-00-00 "); - } - if (FechaFin == horafin) - { - BadRequest(" La Fecha Y Hora no puede ser 00-00-00 "); - - } - - //await _Repo.Rpt2096InvocePedPagados(FechaInicio, FechaFin, TipoOperacion); - - return await _Repo.Rpt2096InvocePedPagados(FechaInicio, FechaFin, TipoOperacion); + //[HttpGet] + //[Route("Rpt2096InvoicePediPagadosGET")] + //public async Task> Rpt2096InvocePedPagados([FromQuery] string Inicio, string Fin, int TipoOperacion) + //{ + // //DateTime fechaYhora = new DateTime(00, 00, 00, 12, 00, 00); + // var Entrada = await _Repo.Rpt2096InvocePedPagados(Inicio, Fin, TipoOperacion); + // return Entrada; + + //} + [HttpGet] + [Route("Rpt2096InvoicePediPagadosGET")] + public async Task> Rpt2096InvocePedPagados([FromQuery] DateTime Inicio, DateTime Fin , int TipoOperacion ) + { + //DateTime fechaYhora = new DateTime(00, 00, 00, 12, 00, 00); + var Entrada = await _Repo.Rpt2096InvocePedPagados(Inicio, Fin, TipoOperacion); + return Entrada; } diff --git a/AMAZONBackend/bin/Debug/net6.0/AMAZONBackend.dll b/AMAZONBackend/bin/Debug/net6.0/AMAZONBackend.dll index 3b367da..9508941 100644 Binary files a/AMAZONBackend/bin/Debug/net6.0/AMAZONBackend.dll and b/AMAZONBackend/bin/Debug/net6.0/AMAZONBackend.dll differ diff --git a/AMAZONBackend/bin/Debug/net6.0/AMAZONBackend.pdb b/AMAZONBackend/bin/Debug/net6.0/AMAZONBackend.pdb index 44910ed..ad3bd62 100644 Binary files a/AMAZONBackend/bin/Debug/net6.0/AMAZONBackend.pdb and b/AMAZONBackend/bin/Debug/net6.0/AMAZONBackend.pdb differ diff --git a/AMAZONBackend/obj/Debug/net6.0/AMAZONBackend.dll b/AMAZONBackend/obj/Debug/net6.0/AMAZONBackend.dll index 3b367da..9508941 100644 Binary files a/AMAZONBackend/obj/Debug/net6.0/AMAZONBackend.dll and b/AMAZONBackend/obj/Debug/net6.0/AMAZONBackend.dll differ diff --git a/AMAZONBackend/obj/Debug/net6.0/AMAZONBackend.pdb b/AMAZONBackend/obj/Debug/net6.0/AMAZONBackend.pdb index 44910ed..ad3bd62 100644 Binary files a/AMAZONBackend/obj/Debug/net6.0/AMAZONBackend.pdb and b/AMAZONBackend/obj/Debug/net6.0/AMAZONBackend.pdb differ diff --git a/AMAZONBackend/obj/Debug/net6.0/ref/AMAZONBackend.dll b/AMAZONBackend/obj/Debug/net6.0/ref/AMAZONBackend.dll index c073948..ea96af2 100644 Binary files a/AMAZONBackend/obj/Debug/net6.0/ref/AMAZONBackend.dll and b/AMAZONBackend/obj/Debug/net6.0/ref/AMAZONBackend.dll differ diff --git a/AMAZONBackend/obj/Debug/net6.0/refint/AMAZONBackend.dll b/AMAZONBackend/obj/Debug/net6.0/refint/AMAZONBackend.dll index c073948..ea96af2 100644 Binary files a/AMAZONBackend/obj/Debug/net6.0/refint/AMAZONBackend.dll and b/AMAZONBackend/obj/Debug/net6.0/refint/AMAZONBackend.dll differ