From b3bfc19d0f01333411d2a89764a3541daf99d524 Mon Sep 17 00:00:00 2001 From: Felix Morales Date: Wed, 20 Mar 2024 11:31:40 -0500 Subject: [PATCH] Cambiar el tipo de dato de la propiedad Aduana para ser almacenado como una cadena en lugar de como numero --- .../Corresponsalias/ICorresponsaliasTraficosRepository.cs | 4 ++-- Controllers/Corresponsalias/TraficosController.cs | 4 ++-- DTO/Corresponsales/DTOCorresponsalTrafico.cs | 2 +- DTO/Corresponsales/DTORectificacionHistorico.cs | 4 ++-- DTO/Reportes/Alen/DTOReporteFacturasTraficosConsolidados.cs | 2 +- DTO/Reportes/DTOFiltrosTraficosClientes.cs | 2 +- DTO/Reportes/DTOReporteCorresponsales.cs | 2 +- DTO/Reportes/GC50/DTOReporteGC50.cs | 2 +- Models/Catalogos/CatCorresponsales.cs | 2 +- Models/Corresponsales/CorresponsalPedimentosConsolidados.cs | 2 +- Models/Corresponsales/ITrafico.cs | 2 +- .../CorresponsaliasTraficoRectificacionHistorico.cs | 2 +- .../Corresponsalias/CorresponsaliasTraficosRepository.cs | 4 ++-- Services/C1896/SrvUploadTemplete.cs | 2 +- Services/Reportes/Newell/Semanal/ReporteSemanalService.cs | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Contracts/Corresponsalias/ICorresponsaliasTraficosRepository.cs b/Contracts/Corresponsalias/ICorresponsaliasTraficosRepository.cs index f9633d7..52765bb 100644 --- a/Contracts/Corresponsalias/ICorresponsaliasTraficosRepository.cs +++ b/Contracts/Corresponsalias/ICorresponsaliasTraficosRepository.cs @@ -9,7 +9,7 @@ namespace CORRESPONSALBackend.Contracts.Corresponsalias public interface ICorresponsaliasTraficosRepository { public Task Get(int id); - public Task GetByPedimento(int pedimento, int aduana, int patente); + public Task GetByPedimento(int pedimento, string aduana, int patente); public Task GetByReferencia(string referencia); public Task GetAll(int Mode); public Task> GetRectificaciones(int id); @@ -20,6 +20,6 @@ namespace CORRESPONSALBackend.Contracts.Corresponsalias public Task RectificacionHistoricoAppend(DTORectificacionHistorico data); public Task> RectificacionHistoricoGet(int IdTrafico); - public Task ValidaTraficoDuplicado(int aduana, int patente, int pedimento, int idTrafico); + public Task ValidaTraficoDuplicado(string aduana, int patente, int pedimento, int idTrafico); } } \ No newline at end of file diff --git a/Controllers/Corresponsalias/TraficosController.cs b/Controllers/Corresponsalias/TraficosController.cs index 0851ba7..7695023 100644 --- a/Controllers/Corresponsalias/TraficosController.cs +++ b/Controllers/Corresponsalias/TraficosController.cs @@ -69,7 +69,7 @@ namespace CORRESPONSALBackend.Controllers.Corresponsalias [HttpGet] [Route("GetByPedimento")] - public async Task GetByPedimento([FromQuery] int pedimento, int aduana, int patente) + public async Task GetByPedimento([FromQuery] int pedimento, string aduana, int patente) { var entrada = await _Repo.GetByPedimento(pedimento, aduana, patente); return entrada; @@ -165,7 +165,7 @@ namespace CORRESPONSALBackend.Controllers.Corresponsalias [HttpGet] [Route("Duplicado")] - public async Task ValidaTraficoDuplicado(int aduana, int patente, int pedimento, int idTrafico) + public async Task ValidaTraficoDuplicado(string aduana, int patente, int pedimento, int idTrafico) { var referencia = await _Repo.ValidaTraficoDuplicado(aduana, patente, pedimento, idTrafico); return referencia; diff --git a/DTO/Corresponsales/DTOCorresponsalTrafico.cs b/DTO/Corresponsales/DTOCorresponsalTrafico.cs index 15cbac4..d26ce24 100644 --- a/DTO/Corresponsales/DTOCorresponsalTrafico.cs +++ b/DTO/Corresponsales/DTOCorresponsalTrafico.cs @@ -22,7 +22,7 @@ namespace CORRESPONSALBackend.DTO.Corresponsales public int? Estatus { get; set; } = 0; public string sEstatus { get; set; } = null!; public string? Trafico { get; set; } = null!; - public int? Aduana { get; set; } = 0; + public string? Aduana { get; set; } = "0"; public int? Patente { get; set; } = 0; public int? Pedimento { get; set; } = 0; public string? Clave { get; set; } = null!; diff --git a/DTO/Corresponsales/DTORectificacionHistorico.cs b/DTO/Corresponsales/DTORectificacionHistorico.cs index 63ea448..29f0237 100644 --- a/DTO/Corresponsales/DTORectificacionHistorico.cs +++ b/DTO/Corresponsales/DTORectificacionHistorico.cs @@ -6,12 +6,12 @@ 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 string 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 string AduanaH { get; set; } = "0"; public int PatenteH { get; set; } = 0; public int PedimentoH { get; set; } = 0; public string ClaveH { get; set; } = ""; diff --git a/DTO/Reportes/Alen/DTOReporteFacturasTraficosConsolidados.cs b/DTO/Reportes/Alen/DTOReporteFacturasTraficosConsolidados.cs index 150e3bd..b2a3ca3 100644 --- a/DTO/Reportes/Alen/DTOReporteFacturasTraficosConsolidados.cs +++ b/DTO/Reportes/Alen/DTOReporteFacturasTraficosConsolidados.cs @@ -4,7 +4,7 @@ public class DTOReporteFacturasTraficosConsolidados{ public string Cliente { get; set; } public string Proveedor { get; set; } public string Corresponsal { get; set; } - public int Aduana { get; set; } + public string Aduana { get; set; } public int Patente { get; set; } public string Pedimento { get; set; } public int PedimentoMaster { get; set; } diff --git a/DTO/Reportes/DTOFiltrosTraficosClientes.cs b/DTO/Reportes/DTOFiltrosTraficosClientes.cs index d8ee96e..3715665 100644 --- a/DTO/Reportes/DTOFiltrosTraficosClientes.cs +++ b/DTO/Reportes/DTOFiltrosTraficosClientes.cs @@ -9,7 +9,7 @@ namespace CORRESPONSALBackend.DTO.Reportes public int IdCorresponsal { get; set; } = 0; public int Pedimento {get;set;} = 0; public int Patente {get;set;} = 0; - public int Aduana {get;set;} = 0; + public string Aduana {get;set;} = "0"; public string? Referencia { get; set; } = null!; public int IdUsuario {get;set;} = 0; } diff --git a/DTO/Reportes/DTOReporteCorresponsales.cs b/DTO/Reportes/DTOReporteCorresponsales.cs index 0bed2aa..42559ea 100644 --- a/DTO/Reportes/DTOReporteCorresponsales.cs +++ b/DTO/Reportes/DTOReporteCorresponsales.cs @@ -16,7 +16,7 @@ namespace CORRESPONSALBackend.DTO.Reportes public int Modo { get; set; } = 0; public int Pedimento {get;set;} = 0; public int Patente {get;set;} = 0; - public int Aduana {get;set;} = 0; + public string Aduana {get;set;} = "0"; public string? Referencia { get; set; } = null!; } } \ No newline at end of file diff --git a/DTO/Reportes/GC50/DTOReporteGC50.cs b/DTO/Reportes/GC50/DTOReporteGC50.cs index 61644b9..2f4657d 100644 --- a/DTO/Reportes/GC50/DTOReporteGC50.cs +++ b/DTO/Reportes/GC50/DTOReporteGC50.cs @@ -2,7 +2,7 @@ namespace CORRESPONSALBackend.DTO.Reportes.GC50{ public class DTOReporteGC50{ public string Trafico { get; set; } public string Corresponsal { get; set; } - public int Aduana { get; set; } + public string Aduana { get; set; } public int Patente { get; set; } public string PedimentoCorresponsal { get; set; } public string PedimentoCorresponsalR1 { get; set; } diff --git a/Models/Catalogos/CatCorresponsales.cs b/Models/Catalogos/CatCorresponsales.cs index 42bd871..00e8b09 100644 --- a/Models/Catalogos/CatCorresponsales.cs +++ b/Models/Catalogos/CatCorresponsales.cs @@ -5,7 +5,7 @@ namespace CORRESPONSALBackend.Models.Catalogos public int id { set; get; } = 0; public string Nombre { set; get; } = null!; public int Patente { set; get; } = 0; - public int Aduana { set; get; } = 0; + public string Aduana { set; get; } = "0"; public string Correos { set; get; } = null!; } } \ No newline at end of file diff --git a/Models/Corresponsales/CorresponsalPedimentosConsolidados.cs b/Models/Corresponsales/CorresponsalPedimentosConsolidados.cs index 642b84f..4777e98 100644 --- a/Models/Corresponsales/CorresponsalPedimentosConsolidados.cs +++ b/Models/Corresponsales/CorresponsalPedimentosConsolidados.cs @@ -2,7 +2,7 @@ namespace CORRESPONSALBackend.Models.Corresponsales{ public class CorresponsalPedimentosConsolidados{ public int Id { get; set; } public int IdTrafico { get; set; } - public int Aduana { get; set; } + public string Aduana { get; set; } public int Patente { get; set; } public int Pedimento { get; set; } public string Clave { get; set; } diff --git a/Models/Corresponsales/ITrafico.cs b/Models/Corresponsales/ITrafico.cs index 8cd9cbe..8eeff70 100644 --- a/Models/Corresponsales/ITrafico.cs +++ b/Models/Corresponsales/ITrafico.cs @@ -16,7 +16,7 @@ public double? Kilos { get; set; } = 0; public int? Estatus { get; set; } = 0; public string? Trafico { get; set; } = null!; - public int? Aduana { get; set; } = 0; + public string? Aduana { get; set; } = "0"; public int? Patente { get; set; } = 0; public int? Pedimento { get; set; } = 0; public string? Clave { get; set; } = null!; diff --git a/Repository/Corresponsalias/CorresponsaliasTraficoRectificacionHistorico.cs b/Repository/Corresponsalias/CorresponsaliasTraficoRectificacionHistorico.cs index fd23643..630e82c 100644 --- a/Repository/Corresponsalias/CorresponsaliasTraficoRectificacionHistorico.cs +++ b/Repository/Corresponsalias/CorresponsaliasTraficoRectificacionHistorico.cs @@ -5,7 +5,7 @@ namespace CORRESPONSALBackend.Repository.Corresponsalias public int Id { get; set; } = 0; public int Usuario { get; set; } = 0; public int IdTrafico { get; set; } = 0; - public int Aduana { get; set; } = 0; + public string Aduana { get; set; } = "0"; public int Patente { get; set; } = 0; public int Pedimento { get; set; } = 0; public string Clave { get; set; } = null!; diff --git a/Repository/Corresponsalias/CorresponsaliasTraficosRepository.cs b/Repository/Corresponsalias/CorresponsaliasTraficosRepository.cs index c15eb81..946d65d 100644 --- a/Repository/Corresponsalias/CorresponsaliasTraficosRepository.cs +++ b/Repository/Corresponsalias/CorresponsaliasTraficosRepository.cs @@ -39,7 +39,7 @@ namespace CORRESPONSALBackend.Repository.Corresponsalias return entrada.FirstOrDefault(new ITrafico { }); } - public async Task GetByPedimento(int pedimento, int aduana, int patente) + public async Task GetByPedimento(int pedimento, string aduana, int patente) { var query = "[Corresponsales.Trafico.GetByPedimento]"; using var connection = _context.CreateConnection(); @@ -199,7 +199,7 @@ namespace CORRESPONSALBackend.Repository.Corresponsalias return entrada; } - public async Task ValidaTraficoDuplicado(int aduana, int patente, int pedimento, int idTrafico) + public async Task ValidaTraficoDuplicado(string aduana, int patente, int pedimento, int idTrafico) { var query = "[Corresponsales.Trafico.ValidateDuplicity]"; using var connection = _context.CreateConnection(); diff --git a/Services/C1896/SrvUploadTemplete.cs b/Services/C1896/SrvUploadTemplete.cs index 06a1b7a..ac31055 100644 --- a/Services/C1896/SrvUploadTemplete.cs +++ b/Services/C1896/SrvUploadTemplete.cs @@ -95,7 +95,7 @@ namespace CORRESPONSALBackend.Services.C1896 { Registro.Trafico = row.Referencia; Registro.Patente = Int32.Parse(row.Patente); - Registro.Aduana = Int32.Parse(row.Aduana); + Registro.Aduana = row.Aduana; Registro.Pedimento = Int32.Parse(row.Pedimento); Registro.FechaPago = row.FechaPago; Registro.TipoCambio = row.TC; diff --git a/Services/Reportes/Newell/Semanal/ReporteSemanalService.cs b/Services/Reportes/Newell/Semanal/ReporteSemanalService.cs index 4a72fae..7949a4f 100644 --- a/Services/Reportes/Newell/Semanal/ReporteSemanalService.cs +++ b/Services/Reportes/Newell/Semanal/ReporteSemanalService.cs @@ -49,7 +49,7 @@ namespace CORRESPONSALBackend.Services.Reportes.Newell.Semanal{ var aduana = worksheet.Cells[$"A{currentRow}"].Value.ToString(); var patente = worksheet.Cells[$"B{currentRow}"].Value.ToString(); var pedimento = worksheet.Cells[$"C{currentRow}"].Value.ToString(); - var dto = await _traficosRepository.GetByPedimento(int.Parse(pedimento), int.Parse(aduana), int.Parse(patente)); + var dto = await _traficosRepository.GetByPedimento(int.Parse(pedimento), aduana, int.Parse(patente)); worksheet.Cells[$"S{currentRow}"].Value = dto.GC; worksheet.Cells[$"T{currentRow}"].Value = dto.Contenedor; worksheet.Cells[$"U{currentRow}"].Value = dto.CuentaDeGastos;