Skip to content

Commit e9e6f6f

Browse files
committed
fix():
envio de cancelamento e encerramento.
1 parent 5854659 commit e9e6f6f

5 files changed

Lines changed: 28 additions & 4 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>br.com.idxtec</groupId>
66
<artifactId>java_mdfe</artifactId>
7-
<version>3.0</version>
7+
<version>3.0.3</version>
88
<packaging>jar</packaging>
99
<name>Java MDFe</name>
1010
<url>http://github.com.br/PauloPenalva/Java_MDFe</url>

src/main/java/br/com/idxtec/mdfe/Mdfe.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package br.com.idxtec.mdfe;
22

33
import br.com.idxtec.mdfe.dom.ConfiguracoesMdfe;
4+
import br.com.idxtec.mdfe.eventos.CancelarMDFe;
5+
import br.com.idxtec.mdfe.eventos.EncerrarMDFe;
46
import br.com.idxtec.mdfe.exceptions.MdfeException;
57
import br.com.idxtec.mdfe.schemas.consultaNaoEncerrado.TRetConsMDFeNaoEnc;
68
import br.com.idxtec.mdfe.schemas.consultaSituacao.TRetConsSitMDFe;
79
import br.com.idxtec.mdfe.schemas.consultaStatus.TRetConsStatServ;
8-
import br.com.idxtec.mdfe.schemas.recepcao.TEnviMDFe;
10+
import br.com.idxtec.mdfe.schemas.eventos.TEvento;
11+
import br.com.idxtec.mdfe.schemas.eventos.TRetEvento;
912
import br.com.idxtec.mdfe.schemas.recepcao.TMDFe;
1013
import br.com.idxtec.mdfe.schemas.recepcao.TRetMDFe;
1114
import br.com.idxtec.mdfe.util.ConfiguracoesUtil;
@@ -38,4 +41,15 @@ public static TRetConsStatServ consultaStatusServico(ConfiguracoesMdfe configura
3841

3942
return ConsultaStatus.consulta(ConfiguracoesUtil.iniciaConfiguracoes(configuracoesMdfe));
4043
}
44+
45+
public static TRetEvento eventoEncerramento(ConfiguracoesMdfe configuracoesMdfe, TEvento envEvento) throws MdfeException {
46+
47+
return EncerrarMDFe.eventoEncerramento(ConfiguracoesUtil.iniciaConfiguracoes(configuracoesMdfe), envEvento, true);
48+
}
49+
50+
public static TRetEvento eventoCancelar(ConfiguracoesMdfe configuracoesMdfe, TEvento envEvento) throws MdfeException {
51+
52+
return CancelarMDFe.eventoCancelamento(ConfiguracoesUtil.iniciaConfiguracoes(configuracoesMdfe), envEvento, true);
53+
}
54+
4155
}

src/main/java/br/com/idxtec/mdfe/util/XmlMdfeUtil.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import br.com.idxtec.mdfe.schemas.consultaStatus.TConsStatServ;
66
import br.com.idxtec.mdfe.exceptions.MdfeException;
77
import br.com.idxtec.mdfe.schemas.eventos.TEvento;
8+
import br.com.idxtec.mdfe.schemas.eventos.TProcEvento;
89
import br.com.idxtec.mdfe.schemas.recepcao.MdfeProc;
910
import br.com.idxtec.mdfe.schemas.recepcao.TMDFe;
1011
import br.com.idxtec.mdfe.schemas.recepcao.TProtMDFe;
@@ -41,6 +42,7 @@ public class XmlMdfeUtil {
4142
private static final String MDFE_PROT = "TProtMDFe";
4243
private static final String MDFE_PROC = "MdfeProc";
4344
private static final String EVENTO = "TEvento";
45+
private static final String EVENTO_PROC = "TProcEvento";
4446

4547

4648
private XmlMdfeUtil() {
@@ -117,6 +119,14 @@ public static <T> String objectToXml(Object obj, Charset encode) throws JAXBExce
117119
TEvento.class,
118120
(TEvento) obj);
119121
break;
122+
123+
case EVENTO_PROC:
124+
context = JAXBContext.newInstance(TProcEvento.class);
125+
element = new JAXBElement<TProcEvento>(
126+
new QName("http://www.portalfiscal.inf.br/mdfe", "retEventoMDFe"),
127+
TProcEvento.class,
128+
(TProcEvento) obj);
129+
break;
120130
default:
121131
throw new MdfeException("Objeto não mapeado no XmlUtil:" + obj.getClass().getSimpleName());
122132

src/test/java/br/com/idxtec/mdfe/TesteEvCancMdfe.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static void main(String[] args) {
5858
evento.setInfEvento(infEvento);
5959
evento.setVersao(ConstantesUtil.VERSAO.MDFE);
6060

61-
TRetEvento retorno = CancelarMDFe.eventoCancelamento(config, evento, true);
61+
TRetEvento retorno = Mdfe.eventoCancelar(config, evento);
6262

6363
log.info("Status: " + retorno.getInfEvento().getCStat());
6464
log.info("Motivo: " + retorno.getInfEvento().getXMotivo());

src/test/java/br/com/idxtec/mdfe/TesteEvEncMdfe.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static void main(String[] args) {
6060
evento.setInfEvento(infEvento);
6161
evento.setVersao(ConstantesUtil.VERSAO.MDFE);
6262

63-
TRetEvento retorno = EncerrarMDFe.eventoEncerramento(config, evento, true);
63+
TRetEvento retorno = Mdfe.eventoEncerramento(config, evento);
6464

6565
if (StatusMdfeEnum.EVENTO_VINCULADO.getCodigo().equals(retorno.getInfEvento().getCStat())) {
6666
log.info("Status: " + retorno.getInfEvento().getCStat());

0 commit comments

Comments
 (0)