Skip to content

Commit

Permalink
Merge pull request #1261 from ZeusAutomacao/ra/fix-passar-mdfe-netcore
Browse files Browse the repository at this point in the history
Criado PR para acompanhamento do MDF-e para ser compatível com .NET Core
  • Loading branch information
robertorp authored Jun 13, 2021
2 parents 1977fa7 + 2f54792 commit f3b3288
Show file tree
Hide file tree
Showing 177 changed files with 1,050 additions and 1,466 deletions.
61 changes: 43 additions & 18 deletions MDFe.AppTeste/MDFeTesteModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -656,8 +656,8 @@ public void CriarEnviar()
CIOT = "123456789123",
CNPJ = "21025760000123"
}
},
valePed = new MDFeValePed
}
/*valePed = new MDFeValePed
{
Disp = new List<MDFeDisp>
{
Expand All @@ -669,7 +669,7 @@ public void CriarEnviar()
vValePed = 100.33m
}
}
}
}*/
},

VeicTracao = new MDFeVeicTracao
Expand Down Expand Up @@ -699,7 +699,6 @@ public void CriarEnviar()
NLacre = "lacre01"
}
}

};
}

Expand Down Expand Up @@ -765,6 +764,30 @@ public void CriarEnviar()

#endregion

#region Produto Predominante

if (MDFeConfiguracao.VersaoWebService.VersaoLayout == VersaoServico.Versao300)
{
mdfe.InfMDFe.prodPred = new prodPred
{
tpCarga = tpCarga.CargaGeral,
xProd = "aaaaaaaaaaaaaaaaaaaaa",
infLotacao = new infLotacao
{
infLocalCarrega = new infLocalCarrega
{
CEP = "75950000"
},
infLocalDescarrega = new infLocalDescarrega
{
CEP = "75950000"
}
}
};
}

#endregion

#region Totais (tot)
mdfe.InfMDFe.Tot.QCTe = 1;
mdfe.InfMDFe.Tot.vCarga = 500.00m;
Expand All @@ -783,10 +806,10 @@ public void CriarEnviar()

mdfe.InfMDFe.infRespTec = new infRespTec
{
CNPJ = "",
email = "",
fone = "",
xContato = ""
CNPJ = "21025760000123",
email = "[email protected]",
fone = "64981081602",
xContato = "roberto alves"
};
#endregion

Expand Down Expand Up @@ -1349,22 +1372,24 @@ private static void CarregarConfiguracoesMDFe(Configuracao config)
{
var configuracaoCertificado = new ConfiguracaoCertificado
{
TipoCertificado = TipoCertificado.A1Repositorio,
Serial = config.CertificadoDigital.NumeroDeSerie,
Senha = config.CertificadoDigital.Senha,
Arquivo = config.CertificadoDigital.CaminhoArquivo,
//Arquivo = config.CertificadoDigital.CaminhoArquivo,
ManterDadosEmCache = config.CertificadoDigital.ManterEmCache,
Serial = config.CertificadoDigital.NumeroDeSerie
};

Utils.Configuracoes.MDFeConfiguracao.ConfiguracaoCertificado = configuracaoCertificado;
Utils.Configuracoes.MDFeConfiguracao.CaminhoSchemas = config.ConfigWebService.CaminhoSchemas;
Utils.Configuracoes.MDFeConfiguracao.CaminhoSalvarXml = config.DiretorioSalvarXml;
Utils.Configuracoes.MDFeConfiguracao.IsSalvarXml = config.IsSalvarXml;
MDFeConfiguracao.ConfiguracaoCertificado = configuracaoCertificado;
MDFeConfiguracao.CaminhoSchemas = config.ConfigWebService.CaminhoSchemas;
MDFeConfiguracao.CaminhoSalvarXml = config.DiretorioSalvarXml;
MDFeConfiguracao.IsSalvarXml = config.IsSalvarXml;

Utils.Configuracoes.MDFeConfiguracao.VersaoWebService.VersaoLayout = config.ConfigWebService.VersaoLayout;
MDFeConfiguracao.VersaoWebService.VersaoLayout = config.ConfigWebService.VersaoLayout;

Utils.Configuracoes.MDFeConfiguracao.VersaoWebService.TipoAmbiente = config.ConfigWebService.Ambiente;
Utils.Configuracoes.MDFeConfiguracao.VersaoWebService.UfEmitente = config.ConfigWebService.UfEmitente;
Utils.Configuracoes.MDFeConfiguracao.VersaoWebService.TimeOut = config.ConfigWebService.TimeOut;
MDFeConfiguracao.VersaoWebService.TipoAmbiente = config.ConfigWebService.Ambiente;
MDFeConfiguracao.VersaoWebService.UfEmitente = config.ConfigWebService.UfEmitente;
MDFeConfiguracao.VersaoWebService.TimeOut = config.ConfigWebService.TimeOut;
MDFeConfiguracao.IsAdicionaQrCode = true;
}

protected virtual void OnSucessoSync(RetornoEEnvio e)
Expand Down
13 changes: 13 additions & 0 deletions MDFe.Classes.Standard/MDFe.Classes.Standard.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<Import Project="..\Shared.MDFe.Classes\Shared.MDFe.Classes.projitems" Label="Shared" />

<ItemGroup>
<ProjectReference Include="..\MDFe.Utils.Standard\MDFe.Utils.Standard.csproj" />
</ItemGroup>

</Project>
119 changes: 1 addition & 118 deletions MDFe.Classes/MDFe.Classes.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,125 +38,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Contratos\MDFeModalContainer.cs" />
<Compile Include="Extensoes\ExtevPagtoOperMDFe.cs" />
<Compile Include="Extensoes\ExtMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeConsReciMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeConsSitMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeConsStatServMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeCosMDFeNaoEnc.cs" />
<Compile Include="Extensoes\ExtMDFeEnviMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeEvCancMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeEvEncMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeEventoMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeEvIncDFeMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeEvIncCondutorMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeRetConsMDFeNao.cs" />
<Compile Include="Extensoes\ExtMDFeRetConsReciMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeRetConsSitMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeRetConsStatServ.cs" />
<Compile Include="Extensoes\ExtMDFeRetEnviMDFe.cs" />
<Compile Include="Extensoes\ExtMDFeRetEventoMDFe.cs" />
<Compile Include="Extensoes\ExtVersaoServico.cs" />
<Compile Include="Flags\MDFeCUnid.cs" />
<Compile Include="Flags\MDFeIdentificacaoProcessoEmissao.cs" />
<Compile Include="Flags\MDFeModal.cs" />
<Compile Include="Flags\MDFeRespSeg.cs" />
<Compile Include="Flags\MDFeTipoEmissao.cs" />
<Compile Include="Flags\MDFeTipoEmitente.cs" />
<Compile Include="Flags\MDFeTpCar.cs" />
<Compile Include="Flags\MDFeTpRod.cs" />
<Compile Include="Flags\MDFeTpProp.cs" />
<Compile Include="Flags\MDFeTpTransp.cs" />
<Compile Include="Flags\MDFeTpUnidCarga.cs" />
<Compile Include="Flags\MDFeTpUnidCargaVazia.cs" />
<Compile Include="Flags\MDFeTpUnidTransp.cs" />
<Compile Include="Flags\MDFeVersaoModal.cs" />
<Compile Include="Flags\tpNav.cs" />
<Compile Include="Flags\tpUnidTranspVazia.cs" />
<Compile Include="Informacoes\Comp.cs" />
<Compile Include="Informacoes\ConsultaNaoEncerrados\MDFeCosMDFeNaoEnc.cs" />
<Compile Include="Informacoes\ConsultaProtocolo\MDFeConsSitMDFe.cs" />
<Compile Include="Informacoes\Evento\CorpoEvento\evPagtoOperMDFe.cs" />
<Compile Include="Informacoes\Evento\CorpoEvento\MDFeEvCancMDFe.cs" />
<Compile Include="Informacoes\Evento\CorpoEvento\MDFeEvEncMDFe.cs" />
<Compile Include="Informacoes\Evento\CorpoEvento\MDFeEvIncDFeMDFe.cs" />
<Compile Include="Informacoes\Evento\CorpoEvento\MDFeEvIncCondutorMDFe.cs" />
<Compile Include="Informacoes\Evento\Flags\MDFeTipoEvento.cs" />
<Compile Include="Informacoes\Evento\MDFeDetEvento.cs" />
<Compile Include="Informacoes\Evento\MDFeEventoContainer.cs" />
<Compile Include="Informacoes\Evento\MDFeEventoMDFe.cs" />
<Compile Include="Informacoes\Evento\MDFeInfEvento.cs" />
<Compile Include="Informacoes\indPag.cs" />
<Compile Include="Informacoes\infBanc.cs" />
<Compile Include="Informacoes\infCIOT.cs" />
<Compile Include="Informacoes\infContratante.cs" />
<Compile Include="Informacoes\infEntregaParcial.cs" />
<Compile Include="Informacoes\infLocalCarrega.cs" />
<Compile Include="Informacoes\infLocalDescarrega.cs" />
<Compile Include="Informacoes\infLotacao.cs" />
<Compile Include="Informacoes\infMDFeSupl.cs" />
<Compile Include="Informacoes\infPag.cs" />
<Compile Include="Informacoes\infPrazo.cs" />
<Compile Include="Informacoes\infRespTec.cs" />
<Compile Include="Informacoes\infUnidTranspVazia.cs" />
<Compile Include="Informacoes\MDFe.cs" />
<Compile Include="Informacoes\MDFeAereo.cs" />
<Compile Include="Informacoes\MDFeAquav.cs" />
<Compile Include="Informacoes\MDFeAutXML.cs" />
<Compile Include="Informacoes\MDFeCondutor.cs" />
<Compile Include="Informacoes\MDFeDisp.cs" />
<Compile Include="Informacoes\MDFeEmit.cs" />
<Compile Include="Informacoes\MDFeFerrov.cs" />
<Compile Include="Informacoes\MDFeIde.cs" />
<Compile Include="Informacoes\MDFeInfAdic.cs" />
<Compile Include="Informacoes\MDFeInfCTe.cs" />
<Compile Include="Informacoes\MDFeInfDoc.cs" />
<Compile Include="Informacoes\MDFeInfEmbComb.cs" />
<Compile Include="Informacoes\MDFeInfMDFe.cs" />
<Compile Include="Informacoes\MDFeInfMDFeTransp.cs" />
<Compile Include="Informacoes\MDFeInfModal.cs" />
<Compile Include="Informacoes\MDFeInfMunCarrega.cs" />
<Compile Include="Informacoes\MDFeInfMunDescarga.cs" />
<Compile Include="Informacoes\MDFeInfNFe.cs" />
<Compile Include="Informacoes\MDFeInfPercurso.cs" />
<Compile Include="Informacoes\MDFeInfTermCarreg.cs" />
<Compile Include="Informacoes\MDFeInfTermDescarreg.cs" />
<Compile Include="Informacoes\MDFeInfUnidCarga.cs" />
<Compile Include="Informacoes\MDFeInfUnidCargaVazia.cs" />
<Compile Include="Informacoes\MDFeInfUnidTransp.cs" />
<Compile Include="Informacoes\MDFeLacre.cs" />
<Compile Include="Informacoes\MDFeLacUnidCarga.cs" />
<Compile Include="Informacoes\MDFeLacUnidTransp.cs" />
<Compile Include="Informacoes\MDFePeri.cs" />
<Compile Include="Informacoes\MDFeProp.cs" />
<Compile Include="Informacoes\MDFeRodo.cs" />
<Compile Include="Informacoes\MDFeSeg.cs" />
<Compile Include="Informacoes\MDFeTot.cs" />
<Compile Include="Informacoes\MDFeTrem.cs" />
<Compile Include="Informacoes\MDFeVag.cs" />
<Compile Include="Informacoes\MDFeValePed.cs" />
<Compile Include="Informacoes\MDFeVeicReboque.cs" />
<Compile Include="Informacoes\MDFeVeicTracao.cs" />
<Compile Include="Informacoes\prodPred.cs" />
<Compile Include="Informacoes\RetRecepcao\MDFeConsReciMDFe.cs" />
<Compile Include="Informacoes\StatusServico\MDFeConsStatServMDFe.cs" />
<Compile Include="Informacoes\tpCarga.cs" />
<Compile Include="Informacoes\tpComp.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Retorno\MDFeConsultaNaoEncerrado\MDFeRetConsMDFeNao.cs" />
<Compile Include="Retorno\MDFeConsultaProtocolo\MDFeRetConsSitMDFe.cs" />
<Compile Include="Retorno\MDFeEvento\MDFeRetInfEvento.cs" />
<Compile Include="Retorno\MDFeEvento\MDFeRetEventoMDFe.cs" />
<Compile Include="Retorno\MDFeProcEventoMDFe.cs" />
<Compile Include="Retorno\MDFeProcMDFe.cs" />
<Compile Include="Retorno\MDFeRecepcao\MDFeRetEnviMDFe.cs" />
<Compile Include="Retorno\MDFeRetRecepcao\MDFeInfProtMDFe.cs" />
<Compile Include="Retorno\MDFeRetRecepcao\MDFeProtMDFe.cs" />
<Compile Include="Retorno\MDFeRetRecepcao\MDFeRetConsReciMDFe.cs" />
<Compile Include="Retorno\MDFeStatusServico\MDFeRetConsStatServ.cs" />
<Compile Include="Retorno\RetornoBase.cs" />
<Compile Include="Servicos\Autorizacao\MDFeEnviMDFe.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DFe.Classes\DFe.Classes.csproj">
Expand All @@ -173,6 +55,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="..\Shared.MDFe.Classes\Shared.MDFe.Classes.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
18 changes: 18 additions & 0 deletions MDFe.Servicos.Standard/MDFe.Servicos.Standard.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<Import Project="..\Shared.MDFe.Servicos\Shared.MDFe.Servicos.projitems" Label="Shared" />

<ItemGroup>
<ProjectReference Include="..\DFe.Classes.Standard\DFe.Classes.Standard.csproj" />
<ProjectReference Include="..\DFe.Utils.Standard\DFe.Utils.Standard.csproj" />
<ProjectReference Include="..\DFe.Wsdl.Standard\DFe.Wsdl.Standard.csproj" />
<ProjectReference Include="..\MDFe.Classes.Standard\MDFe.Classes.Standard.csproj" />
<ProjectReference Include="..\MDFe.Utils.Standard\MDFe.Utils.Standard.csproj" />
<ProjectReference Include="..\MDFe.Wsdl.Standard\MDFe.Wsdl.Standard.csproj" />
</ItemGroup>

</Project>
24 changes: 5 additions & 19 deletions MDFe.Servicos/MDFe.Servicos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConsultaNaoEncerradosMDFe\ServicoMDFeConsultaNaoEncerrados.cs" />
<Compile Include="ConsultaProtocoloMDFe\ServicoMDFeConsultaProtocolo.cs" />
<Compile Include="Enderecos\Helper\UrlHelper.cs" />
<Compile Include="Enderecos\UrlMDFe.cs" />
<Compile Include="EventosMDFe\Contratos\IServicoController.cs" />
<Compile Include="EventosMDFe\EventoCancelar.cs" />
<Compile Include="EventosMDFe\EventoInclusaoDFe.cs" />
<Compile Include="EventosMDFe\EventoEncerramento.cs" />
<Compile Include="EventosMDFe\EventoInclusaoCondutor.cs" />
<Compile Include="EventosMDFe\EventoPagamentoOperacao.cs" />
<Compile Include="EventosMDFe\FactoryEvento.cs" />
<Compile Include="EventosMDFe\ServicoController.cs" />
<Compile Include="EventosMDFe\ServicoMDFeEvento.cs" />
<Compile Include="Factory\ClassesFactory.cs" />
<Compile Include="Factory\WsdlFactory.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RecepcaoMDFe\AntesDeEnviar.cs" />
<Compile Include="RecepcaoMDFe\ServicoMDFeRecepcao.cs" />
<Compile Include="RetRecepcaoMDFe\ServicoMDFeRetRecepcao.cs" />
<Compile Include="StatusServicoMDFe\ServicoMDFeStatusServico.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DFe.Classes\DFe.Classes.csproj">
Expand All @@ -69,6 +50,10 @@
<Project>{B4E1A7A6-5D66-4326-8A8D-39338E6FC84C}</Project>
<Name>DFe.Utils</Name>
</ProjectReference>
<ProjectReference Include="..\DFe.Wsdl\DFe.Wsdl.csproj">
<Project>{DBEE88E7-6003-436E-9810-9ACC662F5851}</Project>
<Name>DFe.Wsdl</Name>
</ProjectReference>
<ProjectReference Include="..\MDFe.Classes\MDFe.Classes.csproj">
<Project>{9794cb98-4691-4218-a127-c573c2e7ff83}</Project>
<Name>MDFe.Classes</Name>
Expand All @@ -83,6 +68,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="..\Shared.MDFe.Servicos\Shared.MDFe.Servicos.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
14 changes: 14 additions & 0 deletions MDFe.Utils.Standard/MDFe.Utils.Standard.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<Import Project="..\Shared.MDFe.Utils\Shared.MDFe.Utils.projitems" Label="Shared" />

<ItemGroup>
<ProjectReference Include="..\DFe.Classes.Standard\DFe.Classes.Standard.csproj" />
<ProjectReference Include="..\DFe.Utils.Standard\DFe.Utils.Standard.csproj" />
</ItemGroup>

</Project>
4 changes: 1 addition & 3 deletions MDFe.Utils/MDFe.Utils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Configuracoes\MDFeConfiguracao.cs" />
<Compile Include="Flags\VersaoServico.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Validacao\Validador.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DFe.Classes\DFe.Classes.csproj">
Expand All @@ -54,6 +51,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="..\Shared.MDFe.Utils\Shared.MDFe.Utils.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
13 changes: 13 additions & 0 deletions MDFe.Wsdl.Standard/MDFe.Wsdl.Standard.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<Import Project="..\Shared.MDFe.Wsdl\Shared.MDFe.Wsdl.projitems" Label="Shared" />

<ItemGroup>
<ProjectReference Include="..\DFe.Wsdl.Standard\DFe.Wsdl.Standard.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit f3b3288

Please sign in to comment.