Skip to content

Commit

Permalink
[*] Removido dependencia do DFe.NET e adicionada dependencia de DFeBR…
Browse files Browse the repository at this point in the history 
….Net (https://github.com/dfebr/dfebr-net) devido à estabilidade com o .Net Standard
  • Loading branch information
@marcosgerene
marcosgerene committed May 7, 2020
1 parent c94ff8b commit f1a93a9
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 36 deletions.
64 changes: 47 additions & 17 deletions Gerene.DFe.EscPos.Demo/Gerene.DFe.EscPos.Demo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,33 +45,63 @@
<Reference Include="ACBr.Net.Sat, Version=1.2.7.1, Culture=neutral, PublicKeyToken=d3bb9130f8b775a6, processorArchitecture=MSIL">
<HintPath>..\packages\ACBr.Net.Sat.1.2.7.1\lib\net452\ACBr.Net.Sat.dll</HintPath>
</Reference>
<Reference Include="DFe.Classes, Version=1.0.0.768, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\DFe.Classes.dll</HintPath>
<Reference Include="DFeBR.EmissorNFe, Version=0.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DFeBR.EmissorNFe.0.0.1\lib\netstandard2.0\DFeBR.EmissorNFe.dll</HintPath>
</Reference>
<Reference Include="DFe.Utils, Version=1.0.0.768, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\DFe.Utils.dll</HintPath>
<Reference Include="NetBarcode, Version=1.0.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NetBarcode.1.0.7\lib\netstandard2.0\NetBarcode.dll</HintPath>
</Reference>
<Reference Include="DFe.Wsdl, Version=1.0.0.768, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\DFe.Wsdl.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NFe.Classes, Version=1.0.0.768, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\NFe.Classes.dll</HintPath>
</Reference>
<Reference Include="NFe.Servicos, Version=1.0.0.768, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\NFe.Servicos.dll</HintPath>
</Reference>
<Reference Include="NFe.Utils, Version=1.0.0.768, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\NFe.Utils.dll</HintPath>
</Reference>
<Reference Include="NFe.Wsdl, Version=1.0.0.768, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Zeus.Net.NFe.NFCe.1.0.1.1007\lib\net40\NFe.Wsdl.dll</HintPath>
<Reference Include="QRCoder, Version=1.3.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\QRCoder.1.3.5\lib\net40\QRCoder.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Drawing.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Drawing.Common.4.5.0\lib\net461\System.Drawing.Common.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Net" />
<Reference Include="System.Security" />
<Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Xml, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Xml.4.5.0\lib\net461\System.Security.Cryptography.Xml.dll</HintPath>
</Reference>
<Reference Include="System.Security.Permissions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Permissions.4.5.0\lib\net461\System.Security.Permissions.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down
14 changes: 13 additions & 1 deletion Gerene.DFe.EscPos.Demo/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@
<package id="ACBr.Net.DFe.Core" version="1.2.7.1" targetFramework="net462" />
<package id="ACBr.Net.Integrador" version="1.2.0.6" targetFramework="net462" />
<package id="ACBr.Net.Sat" version="1.2.7.1" targetFramework="net462" />
<package id="DFeBR.EmissorNFe" version="0.0.1" targetFramework="net462" />
<package id="NetBarcode" version="1.0.7" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
<package id="QRCoder" version="1.3.5" targetFramework="net462" />
<package id="System.Drawing.Common" version="4.5.0" targetFramework="net462" />
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
<package id="System.Security.Cryptography.Xml" version="4.5.0" targetFramework="net462" />
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net462" />
<package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net462" />
<package id="Vip.Printer" version="1.0.13" targetFramework="net462" />
<package id="Zeus.Net.NFe.NFCe" version="1.0.1.1007" targetFramework="net462" />
</packages>
2 changes: 1 addition & 1 deletion Gerene.DFe.EscPos/Gerene.DFe.EscPos.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<ItemGroup>
<PackageReference Include="ACBr.Net.Sat" Version="1.2.7.1" />
<PackageReference Include="DFeBR.EmissorNFe" Version="0.0.1" />
<PackageReference Include="Vip.Printer" Version="1.0.13" />
<PackageReference Include="Zeus.Net.NFe.NFCe" Version="1.0.1.1007" />
</ItemGroup>

<ItemGroup>
Expand Down
23 changes: 6 additions & 17 deletions Gerene.DFe.EscPos/NFCePrinter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
using ACBr.Net.Core.Extensions;
using DFe.Classes.Flags;
using DFe.Utils;
using NFe.Utils.InformacoesSuplementares;
using Shared.DFe.Utils;
using System;
using System.Collections.Generic;
using DFeBR.EmissorNFe.Utilidade;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using Vip.Printer;
using Vip.Printer.Enums;

using NotaFiscal = NFe.Classes.nfeProc;

using NotaFiscal = DFeBR.EmissorNFe.Dominio.NotaFiscalEletronica.nfeProc;


namespace Gerene.DFe.EscPos
Expand All @@ -24,7 +15,7 @@ public sealed class NFCePrinter : IDfePrinter
public NFCePrinter()
{
_NFCe = new NotaFiscal();
NomeDaVia = "Via do Consumidor";
NomeDaVia = "Via do Consumidor";
}

#region IDfe
Expand All @@ -43,9 +34,7 @@ public NFCePrinter()

public void Imprimir(string xmlcontent)
{
_NFCe = new NotaFiscal().CarregarDeXmlString(xmlcontent);

_Printer = new Printer(NomeImpressora, TipoImpressora);
_NFCe = Utils.ConverterXMLParaClasse<NotaFiscal>(xmlcontent);

_Printer = new Printer(NomeImpressora, TipoImpressora);

Expand Down Expand Up @@ -90,7 +79,7 @@ public void Imprimir(string xmlcontent)
#endregion

#region Homologação
if (_NFCe.NFe.infNFe.ide.tpAmb == TipoAmbiente.Homologacao)
if (_NFCe.NFe.infNFe.ide.tpAmb == DFeBR.EmissorNFe.Utilidade.Tipos.TipoAmbiente.Homologacao)
{
_Printer.Separator();
_Printer.AlignCenter();
Expand Down Expand Up @@ -349,7 +338,7 @@ public void Imprimir(string xmlcontent)
_Printer.CondensedMode(PrinterModeState.On);

_Printer.Append("Protocolo de autorização");
_Printer.Append($"{_NFCe.protNFe.infProt.nProt} {_NFCe.protNFe.infProt.dhRecbto:@dd/MM/yyyy HH:mm:ss}");
_Printer.Append($"{_NFCe.protNFe.infProt.First().nProt} {_NFCe.protNFe.infProt.First().dhRecbto:@dd/MM/yyyy HH:mm:ss}");

_Printer.CondensedMode(PrinterModeState.Off);
#endregion
Expand Down

1 comment on commit f1a93a9

@marcosgerene
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dfebr/dfebr-net#22

Please sign in to comment.