diff --git a/src/Core/EficazFramework.SPED/Schemas/EFD-Reinf/BaseReturnClasses.cs b/src/Core/EficazFramework.SPED/Schemas/EFD-Reinf/BaseReturnClasses.cs index 80f0d20b..8ed40a0e 100644 --- a/src/Core/EficazFramework.SPED/Schemas/EFD-Reinf/BaseReturnClasses.cs +++ b/src/Core/EficazFramework.SPED/Schemas/EFD-Reinf/BaseReturnClasses.cs @@ -341,8 +341,8 @@ public partial class EventoTotalDadosProcessamento : EfdReinfBindableObject private string nrRecArqBaseField; private string nrProtEntrField; private string nrProtLoteField; - private DateTime dhRecepcaoField; - private DateTime dhProcessField; + private DateTimeOffset dhRecepcaoField; + private DateTimeOffset dhProcessField; private string tpEvField; private string idEvField; private string hashField; @@ -390,7 +390,7 @@ public string nrProtLote /// /// Data e hora da recepcao do evento /// - public DateTime dhRecepcao + public DateTimeOffset dhRecepcao { get => dhRecepcaoField; set @@ -403,7 +403,7 @@ public DateTime dhRecepcao /// /// Data e hora do processamento /// - public DateTime dhProcess + public DateTimeOffset dhProcess { get => dhProcessField; set diff --git a/src/Tests/EficazFramework.Tests/Schemas/EFD-Reinf/R-9005.cs b/src/Tests/EficazFramework.Tests/Schemas/EFD-Reinf/R-9005.cs index e697a68f..04d6b2d9 100644 --- a/src/Tests/EficazFramework.Tests/Schemas/EFD-Reinf/R-9005.cs +++ b/src/Tests/EficazFramework.Tests/Schemas/EFD-Reinf/R-9005.cs @@ -21,14 +21,10 @@ public void ValidaRetornoEnvio(Versao versao) instancia.evtRet.ideRecRetorno.ideStatus.descRetorno.Should().Be("SUCESSO"); instancia.evtRet.infoRecEv.nrRecArqBase.Should().Be("26072-02-4020-2308-26072"); instancia.evtRet.infoRecEv.nrProtLote.Should().Be("2.202309.1247674"); - instancia.evtRet.infoRecEv.dhRecepcao.Date.Should().Be(new DateTime(2023, 09, 11)); - instancia.evtRet.infoRecEv.dhRecepcao.Hour.Should().Be(21); - instancia.evtRet.infoRecEv.dhRecepcao.Minute.Should().Be(43); - instancia.evtRet.infoRecEv.dhRecepcao.Second.Should().Be(41); - instancia.evtRet.infoRecEv.dhProcess.Date.Should().Be(new DateTime(2023, 09, 11)); - instancia.evtRet.infoRecEv.dhProcess.Hour.Should().Be(21); - instancia.evtRet.infoRecEv.dhProcess.Minute.Should().Be(43); - instancia.evtRet.infoRecEv.dhProcess.Second.Should().Be(42); + instancia.evtRet.infoRecEv.dhRecepcao.Should().BeCloseTo(new DateTimeOffset(2023, 09, 11, 21, 43, 41, 877, TimeSpan.FromHours(-3)), + TimeSpan.FromSeconds(1)); + instancia.evtRet.infoRecEv.dhProcess.Should().BeCloseTo(new DateTimeOffset(2023, 09, 11, 21, 43, 42, 591, TimeSpan.FromHours(-3)), + TimeSpan.FromSeconds(1)); instancia.evtRet.infoRecEv.tpEv.Should().Be("4020"); instancia.evtRet.infoRecEv.idEv.Should().Be("ID1000000112116922023091121434100001"); instancia.evtRet.infoRecEv.hash.Should().Be("NBZkwxhz0EL9Uxq0UQxgz/BJZF72DtqKkYB4az7Bqf0="); diff --git a/src/Tests/EficazFramework.Tests/Schemas/EFD-Reinf/R-9015.cs b/src/Tests/EficazFramework.Tests/Schemas/EFD-Reinf/R-9015.cs index dcfcf0c0..3b6e588e 100644 --- a/src/Tests/EficazFramework.Tests/Schemas/EFD-Reinf/R-9015.cs +++ b/src/Tests/EficazFramework.Tests/Schemas/EFD-Reinf/R-9015.cs @@ -26,6 +26,8 @@ public void ValidaFechamentoMovimentoIsento(Versao versao) instancia.evtRetCons.infoRecEv.dhProcess.Hour.Should().Be(22); instancia.evtRetCons.infoRecEv.dhProcess.Minute.Should().Be(5); instancia.evtRetCons.infoRecEv.dhProcess.Second.Should().Be(46); + instancia.evtRetCons.infoRecEv.dhProcess.Should().BeCloseTo(new DateTimeOffset(2023, 08, 17, 22, 5, 46, TimeSpan.FromHours(-3)), + TimeSpan.FromSeconds(1)); instancia.evtRetCons.infoRecEv.tpEv.Should().Be("4099"); instancia.evtRetCons.infoRecEv.idEv.Should().Be("ID1000000112116922023081722054500001"); instancia.evtRetCons.infoRecEv.hash.Should().Be("O/T2ech5LsnIeFah46hJaEVP0vj3VP9d3LMODfqRxyw="); @@ -56,14 +58,10 @@ public void ValidaFechamentoMovimentoTrib(Versao versao) instancia.evtRetCons.ideRecRetorno.ideStatus.descRetorno.Should().Be("SUCESSO"); instancia.evtRetCons.infoRecEv.nrRecArqBase.Should().Be("1971-02-4099-2308-1971"); instancia.evtRetCons.infoRecEv.nrProtLote.Should().Be("2.202309.1214293"); - instancia.evtRetCons.infoRecEv.dhRecepcao.Date.Should().Be(new DateTime(2023, 09, 11)); - instancia.evtRetCons.infoRecEv.dhRecepcao.Hour.Should().Be(7); - instancia.evtRetCons.infoRecEv.dhRecepcao.Minute.Should().Be(17); - instancia.evtRetCons.infoRecEv.dhRecepcao.Second.Should().Be(19); - instancia.evtRetCons.infoRecEv.dhProcess.Date.Should().Be(new DateTime(2023, 09, 11)); - instancia.evtRetCons.infoRecEv.dhProcess.Hour.Should().Be(7); - instancia.evtRetCons.infoRecEv.dhProcess.Minute.Should().Be(17); - instancia.evtRetCons.infoRecEv.dhProcess.Second.Should().Be(19); + instancia.evtRetCons.infoRecEv.dhRecepcao.Should().BeCloseTo(new DateTimeOffset(2023, 09, 11, 7, 17, 19, TimeSpan.FromHours(-3)), + TimeSpan.FromSeconds(1)); + instancia.evtRetCons.infoRecEv.dhProcess.Should().BeCloseTo(new DateTimeOffset(2023, 09, 11, 7, 17, 19, TimeSpan.FromHours(-3)), + TimeSpan.FromSeconds(1)); instancia.evtRetCons.infoRecEv.tpEv.Should().Be("4099"); instancia.evtRetCons.infoRecEv.idEv.Should().Be("ID1000000112116922023091107172200001"); instancia.evtRetCons.infoRecEv.hash.Should().Be("p2H1AcWIrf6sS6oJBk9kDeGrj398KOE7+RPfKLuyXkk=");