Skip to content

Commit 19a41fe

Browse files
adrbarrosadrbarros
authored
Merge pull request #8 from adeniltonbs/master
Update
2 parents 0885527 + e091447 commit 19a41fe

File tree

125 files changed

+1253
-416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1253
-416
lines changed

‎.vs/Zeus NFe/v15/.suo

0 Bytes
Binary file not shown.

‎CTe.AppTeste/CTeTesteModel.cs

+12
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,10 @@ public void CriarEnviarCTe2e3()
10311031
var numeroLote = InputBoxTuche("Número Lote");
10321032

10331033
var servicoRecepcao = new ServicoCTeRecepcao();
1034+
1035+
// Evento executado antes do envio do CT-e para o WebService
1036+
// servicoRecepcao.AntesDeEnviar += AntesEnviarLoteCte;
1037+
10341038
var retornoEnvio = servicoRecepcao.CTeRecepcao(int.Parse(numeroLote), new List<CteEletronico> { cteEletronico });
10351039

10361040
OnSucessoSync(new RetornoEEnvio(retornoEnvio));
@@ -1039,6 +1043,14 @@ public void CriarEnviarCTe2e3()
10391043
new ConfiguracaoDao().SalvarConfiguracao(config);
10401044
}
10411045

1046+
private void AntesEnviarLoteCte(object sender, AntesEnviarRecepcao e)
1047+
{
1048+
e.enviCTe.CTe.ForEach(cte =>
1049+
{
1050+
MessageBoxTuche(cte.Chave());
1051+
});
1052+
}
1053+
10421054

10431055
private static int GetRandom()
10441056
{

‎CTe.Classes/Informacoes/Destinatario/enderDest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Destinatario
3939
{

‎CTe.Classes/Informacoes/Destinatario/locEnt.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Destinatario
3939
{

‎CTe.Classes/Informacoes/Emitente/enderEmit.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Emitente
3939
{

‎CTe.Classes/Informacoes/Expedidor/enderExped.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Expedidor
3939
{

‎CTe.Classes/Informacoes/Identificacao/enderToma.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Identificacao
3939
{

‎CTe.Classes/Informacoes/Identificacao/ide.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
using CTe.Classes.Informacoes.Tipos;
3838
using CTe.Classes.Servicos.Tipos;
3939
using DFe.Classes.Entidades;
40-
using DFe.Classes.Extencoes;
40+
using DFe.Classes.Extensoes;
4141
using DFe.Classes.Flags;
4242
using DFe.Utils;
4343

‎CTe.Classes/Informacoes/Identificacao/infPercurso.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Identificacao
3939
{

‎CTe.Classes/Informacoes/Recebedor/enderReceb.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Recebedor
3939
{

‎CTe.Classes/Informacoes/Remetente/enderReme.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Remetente
3939
{

‎CTe.Classes/Informacoes/Remetente/locColeta.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.Remetente
3939
{

‎CTe.Classes/Informacoes/Valores/vPrest.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,21 @@ namespace CTe.Classes.Informacoes.Valores
3939
{
4040
public class vPrest
4141
{
42+
[XmlElement("vTPrest", Order = 0)]
4243
public decimal vTPrest
4344
{
4445
get { return _vTPrest.Arredondar(2); }
4546
set { _vTPrest = value.Arredondar(2); }
4647
}
4748

49+
[XmlElement("vRec", Order = 1)]
4850
public decimal vRec
4951
{
5052
get { return _vRec.Arredondar(2); }
5153
set { _vRec = value.Arredondar(2); }
5254
}
5355

54-
[XmlElement("Comp")]
56+
[XmlElement("Comp", Order = 2)]
5557
public List<Comp> Comp;
5658

5759
private decimal _vTPrest;

‎CTe.Classes/Informacoes/infCTeNormal/docAnteriores/emiDocAnt.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
using System.Collections.Generic;
3535
using System.Xml.Serialization;
3636
using DFe.Classes.Entidades;
37-
using DFe.Classes.Extencoes;
37+
using DFe.Classes.Extensoes;
3838

3939
namespace CTe.Classes.Informacoes.infCTeNormal.docAnteriores
4040
{

‎CTe.Classes/Informacoes/infCTeNormal/infCteSub.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@ public class infCteSub
5252
/// legislação, não utilizar antes de NT
5353
/// específica tratar desse procedimento
5454
/// </summary>
55-
public byte indAlteraToma { get; set; }
55+
public byte? indAlteraToma { get; set; }
56+
57+
/// <summary>
58+
/// Se null, não aparece no xml
59+
/// </summary>
60+
public bool indAlteraTomaSpecified { get { return indAlteraToma.HasValue; } }
61+
5662

5763
/// <summary>
5864
/// Versao 2.0

‎CTe.Classes/Informacoes/infCTeNormal/infCteSubs/refNF.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ public class refNF
4646

4747
public string CPF { get; set; }
4848

49-
public mod mod { get; set; }
49+
/// <summary>
50+
/// Modelos: 01, 1B, 02, 2D, 2E, 04, 06, 07, 08, 8B, 09, 10, 11, 13, 14, 15, 16, 17, 18, 20, 21, 22, 23, 24, 25, 26, 27, 28, 55
51+
/// </summary>
52+
public string mod { get; set; }
5053

5154
public short serie { get; set; }
5255

‎CTe.Classes/Informacoes/infCTeNormal/infModals/ferrov.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
using CTe.Classes.Informacoes.Tipos;
3737
using DFe.Classes;
3838
using DFe.Classes.Entidades;
39-
using DFe.Classes.Extencoes;
39+
using DFe.Classes.Extensoes;
4040

4141
namespace CTe.Classes.Informacoes.infCTeNormal.infModals
4242
{

‎CTe.Classes/Informacoes/infCTeNormal/infModals/rodo.cs

+10
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,15 @@ public string ProxydPrev {
8080
public List<lacRodo> lacRodo { get; set; }
8181

8282
public List<moto> moto { get; set; }
83+
84+
public bool ShouldSerializeveic()
85+
{
86+
return veic != null;
87+
}
88+
89+
public bool ShouldSerializemoto()
90+
{
91+
return moto != null;
92+
}
8393
}
8494
}

‎CTe.Classes/Informacoes/infCTeNormal/infModals/rodoviario/emiOcc.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using System.Xml.Serialization;
3535
using DFe.Classes.Entidades;
36-
using DFe.Classes.Extencoes;
36+
using DFe.Classes.Extensoes;
3737

3838
namespace CTe.Classes.Informacoes.infCTeNormal.infModals.rodoviario
3939
{

‎CTe.Classes/Informacoes/infCTeNormal/infModals/rodoviarioOS/prop.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
using System.Xml.Serialization;
3535
using CTe.Classes.Informacoes.Tipos;
3636
using DFe.Classes.Entidades;
37-
using DFe.Classes.Extencoes;
37+
using DFe.Classes.Extensoes;
3838

3939
namespace CTe.Classes.Informacoes.infCTeNormal.infModals.rodoviarioOS
4040
{

‎CTe.Classes/Informacoes/infCTeNormal/infModals/rodoviarioOS/veic.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
using System.Xml.Serialization;
3535
using CTe.Classes.Informacoes.Tipos;
3636
using DFe.Classes.Entidades;
37-
using DFe.Classes.Extencoes;
37+
using DFe.Classes.Extensoes;
3838

3939
namespace CTe.Classes.Informacoes.infCTeNormal.infModals.rodoviarioOS
4040
{

‎CTe.Servicos/CTe.Servicos.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<Compile Include="Factory\WsdlFactory.cs" />
5555
<Compile Include="Inutilizacao\InutilizacaoServico.cs" />
5656
<Compile Include="Properties\AssemblyInfo.cs" />
57+
<Compile Include="Recepcao\AntesEnviarRecepcao.cs" />
5758
<Compile Include="Recepcao\ServicoCTeRecepcao.cs" />
5859
</ItemGroup>
5960
<ItemGroup>

‎CTe.Servicos/Factory/ClassesFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
using CTe.Classes.Servicos.Recepcao.Retorno;
4343
using CTe.Classes.Servicos.Status;
4444
using CTe.Servicos.Inutilizacao;
45-
using DFe.Classes.Extencoes;
45+
using DFe.Classes.Extensoes;
4646
using CTeEletronica = CTe.Classes.CTe;
4747

4848
namespace CTe.Servicos.Factory

‎CTe.Servicos/Factory/WsdlFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
using CTe.Wsdl.Recepcao;
4242
using CTe.Wsdl.RetRecepcao;
4343
using CTe.Wsdl.Status;
44-
using DFe.Classes.Extencoes;
44+
using DFe.Classes.Extensoes;
4545

4646
namespace CTe.Servicos.Factory
4747
{

‎CTe.Servicos/Recepcao/AntesEnviarRecepcao.cs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using CTe.Classes.Servicos.Recepcao;
3+
4+
namespace CTe.Servicos.Recepcao
5+
{
6+
public class AntesEnviarRecepcao : EventArgs
7+
{
8+
private readonly enviCTe _enviCTe;
9+
10+
public AntesEnviarRecepcao(enviCTe enviCTe)
11+
{
12+
_enviCTe = enviCTe;
13+
}
14+
15+
public enviCTe enviCTe
16+
{
17+
get { return _enviCTe; }
18+
}
19+
}
20+
}

‎CTe.Servicos/Recepcao/ServicoCTeRecepcao.cs

+12
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
/* Rua Comendador Francisco josé da Cunha, 111 - Itabaiana - SE - 49500-000 */
3232
/********************************************************************************/
3333

34+
using System;
3435
using System.Collections.Generic;
3536
using CTe.Classes;
3637
using CTe.Classes.Servicos.Recepcao;
@@ -44,6 +45,8 @@ namespace CTe.Servicos.Recepcao
4445
{
4546
public class ServicoCTeRecepcao
4647
{
48+
public event EventHandler<AntesEnviarRecepcao> AntesDeEnviar;
49+
4750
public retEnviCte CTeRecepcao(int lote, List<CTeEletronico> cteEletronicosList)
4851
{
4952
var instanciaConfiguracao = ConfiguracaoServico.Instancia;
@@ -73,12 +76,21 @@ public retEnviCte CTeRecepcao(int lote, List<CTeEletronico> cteEletronicosList)
7376
enviCte.SalvarXmlEmDisco();
7477

7578
var webService = WsdlFactory.CriaWsdlCteRecepcao();
79+
80+
OnAntesDeEnviar(enviCte);
81+
7682
var retornoXml = webService.cteRecepcaoLote(enviCte.CriaRequestWs());
7783

7884
var retorno = retEnviCte.LoadXml(retornoXml.OuterXml, enviCte);
7985
retorno.SalvarXmlEmDisco();
8086

8187
return retorno;
8288
}
89+
90+
protected virtual void OnAntesDeEnviar(enviCTe enviCTe)
91+
{
92+
var handler = AntesDeEnviar;
93+
if (handler != null) handler(this, new AntesEnviarRecepcao(enviCTe));
94+
}
8395
}
8496
}

0 commit comments

Comments
 (0)