Integrar alterações do Hercules no DFe

.github/workflows/DFe.NET_build.yml → .github/workflows/ZeusFiscal_build.yml

@@ -1,4 +1,4 @@
-name: DFe.NET_build
+name: ZeusFiscal_build
 
 on:
   workflow_dispatch:
@@ -32,6 +32,7 @@ jobs:
 
     - name: Setando Versao
       id: date
+      #run: echo "::set-output name=date::$(date +'%Y.%m.%d.$(printf "%02d" $(date +'%H'))$(printf "%02d" $(date +'%M'))')"
       run: echo "::set-output name=date::$(date +'%Y.%m.%d.%H%M')"
 
     - name: Versao
@@ -74,9 +75,9 @@ jobs:
 
     - name: Pack
       run: | 
-        dotnet pack -o ${{ github.workspace }} -v minimal -c Release -p:NuspecProperties=version=${{ steps.date.outputs.date }} -p:PackageVersion=${{ steps.date.outputs.date }} NuGet\Zeus.Net.NFe.NFCe\Zeus.Net.NFe.NFCe.csproj
-        dotnet pack -o ${{ github.workspace }} -v minimal -c Release -p:NuspecProperties=version=${{ steps.date.outputs.date }} -p:PackageVersion=${{ steps.date.outputs.date }} NuGet\Zeus.Net.MDFe\Zeus.Net.MDFe.csproj
-        dotnet pack -o ${{ github.workspace }} -v minimal -c Release -p:NuspecProperties=version=${{ steps.date.outputs.date }} -p:PackageVersion=${{ steps.date.outputs.date }} NuGet\Zeus.Net.CTe\Zeus.Net.CTe.csproj
+        dotnet pack -o ${{ github.workspace }} -v minimal -c Release -p:NuspecProperties=version=${{ steps.date.outputs.date }} -p:PackageVersion=${{ steps.date.outputs.date }} NuGet\Hercules.NET.NFe.NFCe\Hercules.NET.NFe.NFCe.csproj
+        dotnet pack -o ${{ github.workspace }} -v minimal -c Release -p:NuspecProperties=version=${{ steps.date.outputs.date }} -p:PackageVersion=${{ steps.date.outputs.date }} NuGet\Hercules.NET.MDFe\Hercules.NET.MDFe.csproj
+        dotnet pack -o ${{ github.workspace }} -v minimal -c Release -p:NuspecProperties=version=${{ steps.date.outputs.date }} -p:PackageVersion=${{ steps.date.outputs.date }} NuGet\Hercules.NET.CTe\Hercules.NET.CTe.csproj
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v3
@@ -106,7 +107,7 @@ jobs:
       - name: Push to NuGet Feed
         run: dotnet nuget push *.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
         env:
-          NUGET_AUTH_TOKEN: ${{secrets.NUGET_SECRET_DEPLOY}}
+          NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}}
 
       - name: Discord notification
         continue-on-error: true
@@ -115,4 +116,4 @@ jobs:
           DISCORD_MENSAGEM: ${{ needs.build.outputs.version }}
         uses: Ilshidur/action-discord@master
         with:
-          args: 'Lançado Zeus DFe.NET versão {{ DISCORD_MENSAGEM }} no Nuget! Acesse: https://www.nuget.org/profiles/ZeusNfeNfce'
+          args: 'Lançado Hercules.NET/ZeusFiscal versão {{ DISCORD_MENSAGEM }} no Nuget! Acesse: https://www.nuget.org/profiles/Hercules.NET'

.gitignore

@@ -7,6 +7,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+NFe.sln.DotSettings.user
 *.suo
 *.user
 *.userosscache

CTe.Classes/Servicos/Evento/Flags/CTeTipoEvento.cs

@@ -58,6 +58,8 @@ public enum CTeTipoEvento
         RegistrodePassagem = 310620,
         [XmlEnum("510620")]
         RegistrodePassagemAutomatico = 510620,
+        [XmlEnum("510630")]
+        RegistrodePassagemAutomatico2 = 510630,
         [XmlEnum("310610")]
         MDFeAutorizado = 310610,
         [XmlEnum("310611")]
@@ -88,4 +90,4 @@ public enum CTeTipoEvento
         [XmlEnum("610110")]
         Desacordo = 610110
     }
-}
+}

DFe.Wsdl/Common/SoapUrls.cs

@@ -33,6 +33,8 @@ public string GetSoapUrl(TipoEvento tipoEvento)
                     return "http://www.portalfiscal.inf.br/mdfe/wsdl/MDFeStatusServico";
                 case TipoEvento.MDFeRecepcao:
                     return "http://www.portalfiscal.inf.br/mdfe/wsdl/MDFeRecepcao";
+                case TipoEvento.MDFeRecepcaoSinc:
+                    return "http://www.portalfiscal.inf.br/mdfe/wsdl/MDFeRecepcaoSinc";
                 case TipoEvento.MDFeRetRecepcao:
                     return "http://www.portalfiscal.inf.br/mdfe/wsdl/MDFeRetRecepcao";
                 case TipoEvento.MDFeNaoEncerrado:

DFe.Wsdl/Common/TipoEvento.cs

@@ -13,6 +13,7 @@ public enum TipoEvento
 
         MDFeStatusServico,
         MDFeRecepcao,
+        MDFeRecepcaoSinc,
         MDFeRetRecepcao,
         MDFeNaoEncerrado,
         MDFeConsulta,

MDFe.AppTeste/MDFeTesteModel.cs

@@ -815,7 +815,7 @@ public void CriarEnviar()
 
             var servicoRecepcao = new ServicoMDFeRecepcao();
 
-            var retornoEnvio = servicoRecepcao.MDFeRecepcao(1, mdfe);
+            var retornoEnvio = servicoRecepcao.MDFeRecepcaoSinc(mdfe);
 
             OnSucessoSync(new RetornoEEnvio(retornoEnvio));
 

MDFe.Classes/Extensoes/ExtMDFeEnviMDFe.cs

@@ -71,6 +71,14 @@ public static XmlDocument CriaXmlRequestWs(this MDFeEnviMDFe enviMDFe)
             return dadosEnvio;
         }
 
+        public static XmlDocument CriaXmlRequestWs(this Informacoes.MDFe mdfe)
+        {
+            var dadosEnvio = new XmlDocument();
+            dadosEnvio.LoadXml(mdfe.XmlString());
+
+            return dadosEnvio;
+        }
+
         public static string XmlString(this MDFeEnviMDFe enviMDFe)
         {
             var xmlString = FuncoesXml.ClasseParaXmlString(enviMDFe);

MDFe.Classes/Retorno/MDFeRetRecepcao/Sincrono/MDFeRetMDFe.cs

@@ -0,0 +1,64 @@
+using DFe.Classes.Entidades;
+using DFe.Classes.Extensoes;
+using DFe.Classes.Flags;
+using DFe.Utils;
+using System;
+using System.Xml.Serialization;
+
+namespace MDFe.Classes.Retorno.MDFeRetRecepcao.Sincrono
+{
+    [Serializable]
+    [XmlRoot(Namespace = "http://www.portalfiscal.inf.br/mdfe", 
+        ElementName = "retMDFe")]
+    public class MDFeRetMDFe: RetornoBase
+    {
+        [XmlAttribute(AttributeName = "versao")]
+        public string Versao { get; set; }
+
+        [XmlElement(ElementName = "tpAmb")]
+        public TipoAmbiente TpAmb { get; set; }
+
+        [XmlElement(ElementName = "verAplic")]
+        public string VerAplic { get; set; }
+
+        [XmlElement(ElementName = "nRec")]
+        public string NRec { get; set; }
+
+        [XmlElement(ElementName = "cStat")]
+        public short CStat { get; set; }
+
+        [XmlElement(ElementName = "xMotivo")]
+        public string XMotivo { get; set; }
+
+        [XmlIgnore]
+        public Estado CUF { get; set; }
+
+        [XmlElement(ElementName = "cUF")]
+        public string CUFProxy
+        {
+            get
+            {
+                return CUF.GetCodigoIbgeEmString();
+            }
+            set { CUF = CUF.CodigoIbgeParaEstado(value); }
+        }
+
+        [XmlElement(ElementName = "protMDFe")]
+        public MDFeProtMDFe ProtMdFe { get; set; }
+
+        public static MDFeRetMDFe LoadXml(string xml)
+        {
+            var retorno = FuncoesXml.XmlStringParaClasse<MDFeRetMDFe>(xml);
+            retorno.RetornoXmlString = xml;
+
+            return retorno;
+        }
+        public static MDFeRetMDFe LoadXml(string xml, Informacoes.MDFe mdfe)
+        {
+            var retorno = LoadXml(xml);
+            retorno.EnvioXmlString = FuncoesXml.ClasseParaXmlString(mdfe);
+
+            return retorno;
+        }       
+    }
+}

MDFe.Servicos/Enderecos/Helper/UrlHelper.cs

@@ -49,7 +49,8 @@ public static UrlMDFe ObterUrlServico(TipoAmbiente ambiente)
                             MDFeRetRecepcao = "https://mdfe.svrs.rs.gov.br/ws/MDFeRetRecepcao/MDFeRetRecepcao.asmx",
                             MDFeConsulta = "https://mdfe.svrs.rs.gov.br/ws/MDFeConsulta/MDFeConsulta.asmx",
                             MDFeRecepcaoEvento = "https://mdfe.svrs.rs.gov.br/ws/MDFeRecepcaoEvento/MDFeRecepcaoEvento.asmx",
-                            MDFeRecepcao = "https://mdfe.svrs.rs.gov.br/ws/MDFerecepcao/MDFeRecepcao.asmx"
+                            MDFeRecepcao = "https://mdfe.svrs.rs.gov.br/ws/MDFerecepcao/MDFeRecepcao.asmx",
+                            MDFeRecepcaoSinc = "https://mdfe.svrs.rs.gov.br/ws/MDFeRecepcaoSinc/MDFeRecepcaoSinc.asmx"
                         };
                     case TipoAmbiente.Homologacao:
                         return new UrlMDFe
@@ -59,7 +60,8 @@ public static UrlMDFe ObterUrlServico(TipoAmbiente ambiente)
                             MDFeRecepcao = "https://mdfe-homologacao.svrs.rs.gov.br/ws/MDFerecepcao/MDFeRecepcao.asmx",
                             MDFeRecepcaoEvento = "https://mdfe-homologacao.svrs.rs.gov.br/ws/MDFeRecepcaoEvento/MDFeRecepcaoEvento.asmx",
                             MDFeRetRecepcao = "https://mdfe-homologacao.svrs.rs.gov.br/ws/MDFeRetRecepcao/MDFeRetRecepcao.asmx",
-                            MDFeStatusServico = "https://mdfe-homologacao.svrs.rs.gov.br/ws/MDFeStatusServico/MDFeStatusServico.asmx"
+                            MDFeStatusServico = "https://mdfe-homologacao.svrs.rs.gov.br/ws/MDFeStatusServico/MDFeStatusServico.asmx",
+                            MDFeRecepcaoSinc = "https://mdfe-homologacao.svrs.rs.gov.br/ws/MDFeRecepcaoSinc/MDFeRecepcaoSinc.asmx"
                         };
             }
 

MDFe.Servicos/Enderecos/UrlMDFe.cs

@@ -36,6 +36,7 @@ public class UrlMDFe
     {
         public string MDFeRecepcao { get; set; }
         public string MDFeRetRecepcao { get; set; }
+        public string MDFeRecepcaoSinc { get; set; }
         public string MDFeRecepcaoEvento { get; set; }
         public string MDFeConsulta { get; set; }
         public string MDFeStatusServico { get; set; }

MDFe.Servicos/Factory/WsdlFactory.cs

@@ -41,6 +41,7 @@
 using MDFe.Wsdl.MDFeConsultaProtoloco;
 using MDFe.Wsdl.MDFeEventos;
 using MDFe.Wsdl.MDFeRecepcao;
+using MDFe.Wsdl.MDFeRecepcao.Sincrono;
 using MDFe.Wsdl.MDFeRetRecepcao;
 
 namespace MDFe.Servicos.Factory
@@ -84,7 +85,17 @@ public static MDFeRecepcao CriaWsdlMDFeRecepcao()
 
             var configuracaoWsdl = CriaConfiguracao(url, versaoServico);
 
-            return new MDFeRecepcao(configuracaoWsdl); ;
+            return new MDFeRecepcao(configuracaoWsdl);
+        }
+
+        public static MDFeRecepcaoSinc CriaWsdlMDFeRecepcaoSinc()
+        {
+            var url = UrlHelper.ObterUrlServico(MDFeConfiguracao.VersaoWebService.TipoAmbiente).MDFeRecepcaoSinc;
+            var versaoServico = MDFeConfiguracao.VersaoWebService.VersaoLayout.GetVersaoString();
+
+            var configuracaoWsdl = CriaConfiguracao(url, versaoServico);
+
+            return new MDFeRecepcaoSinc(configuracaoWsdl);
         }
 
         public static MDFeRetRecepcao CriaWsdlMDFeRetRecepcao()

MDFe.Servicos/RecepcaoMDFe/ServicoMDFeRecepcao.cs

@@ -36,6 +36,7 @@
 using MDFe.Classes.Extencoes;
 using MDFe.Classes.Flags;
 using MDFe.Classes.Retorno.MDFeRecepcao;
+using MDFe.Classes.Retorno.MDFeRetRecepcao.Sincrono;
 using MDFe.Classes.Servicos.Autorizacao;
 using MDFe.Servicos.Factory;
 using MDFe.Utils.Configuracoes;
@@ -87,6 +88,27 @@ public MDFeRetEnviMDFe MDFeRecepcao(long lote, MDFeEletronico mdfe)
             return retorno;
         }
 
+        public MDFeRetMDFe MDFeRecepcaoSinc(MDFeEletronico mdfe)
+        {
+            mdfe.InfMDFe.InfModal.VersaoModal = MDFeVersaoModal.Versao300;
+            mdfe.InfMDFe.Ide.ProxyDhIniViagem = mdfe.InfMDFe.Ide.DhIniViagem.ParaDataHoraStringUtc();
+            mdfe.Assina(GerouChave, this);
+
+            if (MDFeConfiguracao.IsAdicionaQrCode)
+            {
+                mdfe.infMDFeSupl = mdfe.QrCode(MDFeConfiguracao.X509Certificate2);
+            }
+
+            mdfe.Valida();
+            mdfe.SalvarXmlEmDisco();
+
+            var webService = WsdlFactory.CriaWsdlMDFeRecepcaoSinc();
+            var retornoXml = webService.mdfeRecepcao(mdfe.CriaXmlRequestWs());
+
+            var retorno = MDFeRetMDFe.LoadXml(retornoXml.OuterXml, mdfe);
+            return retorno;           
+        }
+
         protected virtual void OnAntesDeEnviar(MDFeEnviMDFe enviMdfe)
         {
             var handler = AntesDeEnviar;

MDFe.Wsdl/MDFeRecepcao/Sincrono/MDFeRecepcaoSinc.cs

@@ -0,0 +1,65 @@
+using CTe.CTeOSDocumento.Common;
+using DFe.Utils;
+using System;
+using System.Net;
+using System.Xml;
+using System.Xml.Serialization;
+
+namespace MDFe.Wsdl.MDFeRecepcao.Sincrono
+{
+    public class MDFeRecepcaoSinc
+    {
+        private readonly SoapEnvelope soapEnvelope;
+
+        //Configurações do WSDL para estabelecimento da comunicação
+        private readonly WsdlConfiguracao configuracao;
+
+        /// <summary>
+        /// Cria o cabeçalho do envelope a ser enviado e atribui as configurações do WSDL.
+        /// </summary>
+        /// <param name="configuracao"></param>
+        public MDFeRecepcaoSinc(WsdlConfiguracao configuracao)
+        {
+            if (configuracao == null)
+                throw new ArgumentNullException();
+
+            this.configuracao = configuracao;
+            soapEnvelope = new SoapEnvelope();
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
+        }
+
+        /// <summary>
+        /// Encapsula os dados da requisição no envelope por meio da serialização das partes e realiza a requisção ao Web Service.
+        /// </summary>
+        /// <param name="mdfeDadosMsg"></param>
+        /// <returns>XmlNode</returns>
+        public XmlNode mdfeRecepcao(XmlNode mdfeDadosMsg)
+        {
+            soapEnvelope.body = new ResponseBody<string>
+            {
+                mdfeDadosMsg = Convert.ToBase64String(Compressao.Zip(mdfeDadosMsg.OuterXml))
+            };
+            return RequestBuilderAndSender.Execute(soapEnvelope, configuracao, TipoEvento.MDFeRecepcaoSinc, "retMDFe");
+        }
+
+        /// <summary>
+        /// Classe base para a serialização no formato do envelope SOAP.
+        /// </summary>
+        [XmlRoot(ElementName = "Envelope", Namespace = "http://www.w3.org/2003/05/soap-envelope")]
+        public class SoapEnvelope : CommonSoapEnvelope
+        {
+
+            [XmlElement(ElementName = "Body", Namespace = "http://www.w3.org/2003/05/soap-envelope")]
+            public ResponseBody<string> body { get; set; }
+        }
+
+        /// <summary>
+        /// Classe para o corpo do Envelope SOAP
+        /// </summary>
+        public class ResponseBody<T> : CommonResponseBody
+        {
+            [XmlElement(Namespace = "http://www.portalfiscal.inf.br/mdfe/wsdl/MDFeRecepcaoSinc")]
+            public T mdfeDadosMsg { get; set; }
+        }
+    }
+}

NFe.AppTeste/MainWindow.xaml

@@ -962,6 +962,10 @@
                         Margin="375,185,0,0" VerticalAlignment="Top" Width="177" Click="BtnConsultaRecibo_Click" />
                     <Button x:Name="BtnConsultaGtin" Content="Consultar Gtin" HorizontalAlignment="Left"
                             Margin="10,210,0,0" VerticalAlignment="Top" Width="177" Click="BtnConsultaGtin_Click" />
+                    <Button x:Name="BtnInsucessoEntrega" Content="Insucesso Entrega NFe" HorizontalAlignment="Left"
+                        Margin="192,210,0,0" VerticalAlignment="Top" Width="177" Click="BtnInsucessoEntrega_Click" />
+                    <Button x:Name="BtnCancInsucessoEntrega" Content="Canc. Insucesso Entrega NFe" HorizontalAlignment="Left"
+                            Margin="375,210,0,0" VerticalAlignment="Top" Width="177" Click="BtnCancInsucessoEntrega_Click" />
                 </Grid>
             </TabItem>