fixes bug#21422

qua:
dev:
Feito ajustes no pom para buscar a lib de geração do xml correta.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/GeneradorBoletosCNAB/trunk@105110 d1611594-4594-4d17-8e1d-87c2c4800839

pom.xml

@@ -47,6 +47,16 @@
 			<groupId>br.com.rjconsultores</groupId>
 			<artifactId>jrimum-texgit</artifactId>
 			<version>1.0.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>sun-jaxb-rj</groupId>
+					<artifactId>jaxb-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>sun-jaxb-rj</groupId>
+					<artifactId>jaxb-impl</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>

src/com/rjconsultores/ventaboletos/blocos/santander/CabecalhoRemessaSantander.java

@@ -9,9 +9,10 @@ public class CabecalhoRemessaSantander implements CabecalhoRemessa {
 	private String codigoEmpresa;  
 	private String nomeEmpresa; 
 	private Date dataGravacao; 
-	private Integer codigoTransmissao; 
+	private String codigoTransmissao; 
 	private Integer numeroSequencialRemessa;
 	private Integer numeroSequencialRegistro;
+	private Integer numeroVersao;
 	
 	public String getCodigoEmpresa() {
 		return codigoEmpresa;
@@ -37,11 +38,11 @@ public class CabecalhoRemessaSantander implements CabecalhoRemessa {
 		this.dataGravacao = dataGravacao;
 	}
 	
-	public Integer getCodigoTransmissao() {
+	public String getCodigoTransmissao() {
 		return codigoTransmissao;
 	}
 	
-	public void setCodigoTransmissao(Integer codigoTransmissao) {
+	public void setCodigoTransmissao(String codigoTransmissao) {
 		this.codigoTransmissao = codigoTransmissao;
 	}
 	
@@ -60,4 +61,15 @@ public class CabecalhoRemessaSantander implements CabecalhoRemessa {
 	public void setNumeroSequencialRegistro(Integer numeroSequencialRegistro) {
 		this.numeroSequencialRegistro = numeroSequencialRegistro;
 	}
+
+	public Integer getNumeroVersao() {
+		return numeroVersao;
+	}
+
+	public void setNumeroVersao(Integer numeroVersao) {
+		this.numeroVersao = numeroVersao;
+	}
+
+
+	
 }

src/com/rjconsultores/ventaboletos/blocos/santander/DetalheObrigatorioSantander.java

@@ -12,14 +12,16 @@ public class DetalheObrigatorioSantander implements DetalheObrigatorio, Cloneabl
 	
 	private Integer idBoletoFechamento;
 	private TipoInscricaoPagador tipoInscricao;
-	private Long numeroInscricao;
+	private String numeroInscricao;
-	private Integer codigoTransmissao;
+	private String codigoTransmissao;
 	private String numControleDoParticipante;
 	private String nossoNumeroComDigito;
 	private String carteira;
 	private String agencia;
+	private String agenciaCobradora;
 	private String contacorrente;
 	private String dvConta;
+	private String dvAgencia;
 	private Integer QtdPagamento = 0;
 	private Integer codigoDeOcorrencia = 0;
 	private Date dataOcorrencia;
@@ -49,6 +51,9 @@ public class DetalheObrigatorioSantander implements DetalheObrigatorio, Cloneabl
 	private Integer numeroSequencialRegistro;
 	private DadosBoleto dadosBoleto;
 	private RateioDeCredito rateioDeCredito;
+	private String numeroInscricaoSacado;
+	private String codigoEmpresa;
+
 	
 	@Override
 	public void setIdBoletoFechamento(Integer id) {
@@ -71,16 +76,16 @@ public class DetalheObrigatorioSantander implements DetalheObrigatorio, Cloneabl
 	public void setTipoInscricao(TipoInscricaoPagador tipoInscricao) {
 		this.tipoInscricao = tipoInscricao;
 	}
-	public Long getNumeroInscricao() {
+	public String getNumeroInscricao() {
 		return numeroInscricao;
 	}
-	public void setNumeroInscricao(Long numeroInscricao) {
+	public void setNumeroInscricao(String numeroInscricao) {
 		this.numeroInscricao = numeroInscricao;
 	}
-	public Integer getCodigoTransmissao() {
+	public String getCodigoTransmissao() {
 		return codigoTransmissao;
 	}
-	public void setCodigoTransmissao(Integer codigoTransmissao) {
+	public void setCodigoTransmissao(String codigoTransmissao) {
 		this.codigoTransmissao = codigoTransmissao;
 	}
 	public String getNumControleDoParticipante() {
@@ -309,6 +314,30 @@ public class DetalheObrigatorioSantander implements DetalheObrigatorio, Cloneabl
 	public void setSacadorAvalista(String sacadorAvalista) {
 		this.sacadorAvalista = sacadorAvalista;
 	}
+	public String getNumeroInscricaoSacado() {
+		return numeroInscricaoSacado;
+	}
+	public void setNumeroInscricaoSacado(String numeroInscricaoSacado) {
+		this.numeroInscricaoSacado = numeroInscricaoSacado;
+	}
+	public String getAgenciaCobradora() {
+		return agenciaCobradora;
+	}
+	public void setAgenciaCobradora(String agenciaCobradora) {
+		this.agenciaCobradora = agenciaCobradora;
+	}
+	public String getDvAgencia() {
+		return dvAgencia;
+	}
+	public void setDvAgencia(String dvAgencia) {
+		this.dvAgencia = dvAgencia;
+	}
+	public String getCodigoEmpresa() {
+		return codigoEmpresa;
+	}
+	public void setCodigoEmpresa(String codigoEmpresa) {
+		this.codigoEmpresa = codigoEmpresa;
+	}
 
 	
 }

src/com/rjconsultores/ventaboletos/layouts/SantanderFlatFile.java

@@ -1,5 +1,6 @@
 package com.rjconsultores.ventaboletos.layouts;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
 
@@ -20,8 +21,13 @@ import com.rjconsultores.ventaboletos.utils.FormataUtil;
 
 public class SantanderFlatFile extends AbstractFlatFile implements RemessaInterface {
 	
+	private static BigDecimal valorTotal = BigDecimal.ZERO;
+	private static Integer quantidadeRegistro = 0;
+
 	public SantanderFlatFile() {
 		super(BancoLayout.SANTANDER_400_Envio);
+		valorTotal = BigDecimal.ZERO;
+	    quantidadeRegistro = 0;
 	}
 	
 	@Override
@@ -32,12 +38,14 @@ public class SantanderFlatFile extends AbstractFlatFile implements RemessaInterf
 		CabecalhoRemessaSantander cabecalhoRemessa = (CabecalhoRemessaSantander) cabecalhoRemessaParam;
 		
         header.setValue("CodigoDaEmpresa", FormataUtil.formatarValorPorTamanho(cabecalhoRemessa.getCodigoEmpresa().toString(), 20));  
-        header.setValue("NomeDaEmpresa", FormataUtil.formatarValorPorTamanho(cabecalhoRemessa.getNomeEmpresa(), 30));  
+        header.setValue("NomeCedente", FormataUtil.formatarValorPorTamanho(cabecalhoRemessa.getNomeEmpresa(), 30));  
         header.setValue("CodigoTransmissao", FormataUtil.formatarValorPorTamanho(cabecalhoRemessa.getCodigoTransmissao().toString(), 20));  
-        header.setValue("DataGravacaoArquivo", FormataUtil.formataDataToString(cabecalhoRemessa.getDataGravacao(), "000000", "ddMMyy"));   
+        header.setValue("DataGravacao", FormataUtil.formataDataToString(cabecalhoRemessa.getDataGravacao(), "000000", "ddMMyy"));   
         header.setValue("NumeroSequencialRemessa", FormataUtil.formatarValorPorTamanho(cabecalhoRemessa.getNumeroSequencialRemessa().toString(), 7));  
         header.setValue("NumeroSequencialRegistro", FormataUtil.formatarValorPorTamanho(cabecalhoRemessa.getNumeroSequencialRegistro().toString(), 6)); 
         
+        quantidadeRegistro = quantidadeRegistro + 1;
+        
         getFlatFile().addRecord(header);   
     } 
 	
@@ -49,14 +57,18 @@ public class SantanderFlatFile extends AbstractFlatFile implements RemessaInterf
 		DetalheObrigatorioSantander titulo = (DetalheObrigatorioSantander) tituloParam;
 		
 		transacaoTitulos.setValue("TipoInscricao", FormataUtil.formatarValorPorTamanho(titulo.getTipoInscricao().toString(), 2));
-		transacaoTitulos.setValue("NumeroInscricao", FormataUtil.formatarValorPorTamanho(titulo.getNumeroInscricao().toString(), 14));
+		transacaoTitulos.setValue("NumeroInscricao", FormataUtil.formatarValorPorTamanho(titulo.getNumeroInscricaoSacado().toString(), 14));
 		transacaoTitulos.setValue("CodigoTransmissao", FormataUtil.formatarValorPorTamanho(titulo.getCodigoTransmissao().toString(), 20));
 		transacaoTitulos.setValue("NumControleDoParticipante", FormataUtil.formatarValorPorTamanho(titulo.getNumControleDoParticipante(), 25));
-		transacaoTitulos.setValue("NossoNumeroComDigito", FormataUtil.formatarValorPorTamanho(titulo.getNossoNumeroComDigito(), 9));
+		transacaoTitulos.setValue("NossoNumeroComDigito", FormataUtil.formatarValorPorTamanho(titulo.getNossoNumeroComDigito(), 8));
 		transacaoTitulos.setValue("Carteira", FormataUtil.formatarValorPorTamanho(titulo.getCarteira(), 3));
-		transacaoTitulos.setValue("Agencia", FormataUtil.formatarValorPorTamanho(titulo.getAgencia(), 5));
+		transacaoTitulos.setValue("Agencia", FormataUtil.formatarValorPorTamanho(titulo.getAgencia(), 4));
-		transacaoTitulos.setValue("Contacorrente", FormataUtil.formatarValorPorTamanho(titulo.getContacorrente(), 7));
+		transacaoTitulos.setValue("DVAgencia", FormataUtil.formatarValorPorTamanho(titulo.getDvAgencia(), 1));
+		transacaoTitulos.setValue("CodigoEmpresa", FormataUtil.formatarValorPorTamanho(titulo.getCodigoEmpresa(), 7));
+		transacaoTitulos.setValue("ContaCorrente", FormataUtil.formatarValorPorTamanho(titulo.getContacorrente(), 7)); 
 		transacaoTitulos.setValue("DvConta", FormataUtil.formatarValorPorTamanho(titulo.getDvConta(), 1));
+		transacaoTitulos.setValue("ContaCobrancaBeneficiario", FormataUtil.formatarValorPorTamanho(titulo.getContacorrente(), 8));
+		transacaoTitulos.setValue("DvContaCobrancaBeneficiario", FormataUtil.formatarValorPorTamanho(titulo.getDvConta(), 1));
 		
 		transacaoTitulos.setValue("Filler1", FormataUtil.formatarValorPorTamanho("0", 8));
 		
@@ -65,11 +77,15 @@ public class SantanderFlatFile extends AbstractFlatFile implements RemessaInterf
 		transacaoTitulos.setValue("Vencimento", FormataUtil.formataDataToString(titulo.getVencimento(), "000000", "ddMMyy"));
 		transacaoTitulos.setValue("Valor", titulo.getValor());
 		transacaoTitulos.setValue("EspecieDeTitulo", FormataUtil.formatarValorPorTamanho(titulo.getEspecieDeTitulo(), 2));
+		transacaoTitulos.setValue("NumeroInscricaoPagador", FormataUtil.formatarValorPorTamanho(titulo.getNumeroInscricao().toString(), 14));
+		transacaoTitulos.setValue("AgenciaCobradora", FormataUtil.formatarValorPorTamanho(titulo.getAgenciaCobradora(), 4));
+		transacaoTitulos.setValue("DVAgenciaCobradora", FormataUtil.formatarValorPorTamanho(titulo.getDvAgencia(), 1));
+
 		transacaoTitulos.setValue("Emissao", FormataUtil.formataDataToString(titulo.getEmissao(), "000000", "ddMMyy"));
 		transacaoTitulos.setValue("Instrucao1", FormataUtil.formatarValorPorTamanho(titulo.getInstrucao1(), 2));
 		transacaoTitulos.setValue("Instrucao2", FormataUtil.formatarValorPorTamanho(titulo.getInstrucao2(), 2));
 		transacaoTitulos.setValue("ValorAtraso", titulo.getValorAtraso());
-		transacaoTitulos.setValue("DataLimiteDesconto", FormataUtil.formataData(titulo.getDataLimiteDesconto()));
+//		transacaoTitulos.setValue("DataLimiteDesconto", FormataUtil.formataData(titulo.getDataLimiteDesconto()));
 		transacaoTitulos.setValue("ValorDesconto", titulo.getValorDesconto());
 		transacaoTitulos.setValue("ValorIOF", titulo.getValorIOF());
 		transacaoTitulos.setValue("ValorAbatimentoConcedido", titulo.getValorAbatimentoConcedido());
@@ -83,6 +99,10 @@ public class SantanderFlatFile extends AbstractFlatFile implements RemessaInterf
 		transacaoTitulos.setValue("Estado", FormataUtil.formatarValorPorTamanho(titulo.getEstado(), 2));
 		transacaoTitulos.setValue("SacadorAvalista", FormataUtil.formatarValorPorTamanho(titulo.getSacadorAvalista(), 30));
 		transacaoTitulos.setValue("NumeroSequencialRegistro", FormataUtil.formatarValorPorTamanho(titulo.getNumeroSequencialRegistro().toString(), 6));
+		transacaoTitulos.setValue("Complemento", FormataUtil.formatarValorPorTamanho(titulo.getContacorrente().substring(titulo.getContacorrente().length()-1, titulo.getContacorrente().length()).concat(titulo.getDvConta()),2));
+
+		valorTotal = valorTotal.add(titulo.getValor());
+		quantidadeRegistro = quantidadeRegistro + 1;
 	
 		DadosBoleto dadosBoleto = titulo.getDadosBoleto();
 		
@@ -119,8 +139,11 @@ public class SantanderFlatFile extends AbstractFlatFile implements RemessaInterf
 		Record trailer = getFlatFile().createRecord("Trailler");  
 		
         trailer.setValue("NumeroSequencialRegistro", FormataUtil.formatarValorPorTamanho(trailler.getNumeroSequencialRegistro().toString(), 6)); 
+        trailer.setValue("QuantidadeRegistro",quantidadeRegistro+1); 
+        trailer.setValue("ValorTotal", valorTotal); 
         
         getFlatFile().addRecord(trailer); 
+
 	}
 
 	@Override

src/layouts/LayoutBBCNAB240Envio.txg.xml

@@ -1,5 +1,7 @@
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd" version="1.0-academic">
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-	<FlatFile>
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
+            version="1.0-academic">	<FlatFile>
 		<layout>
 			<name>Arquivo-Remessa_BBCNAB240</name>
 			<version>Version 01, Published: 2012/05/25</version>

src/layouts/LayoutBBCNAB400Envio.txg.xml

@@ -1,5 +1,8 @@
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd" version="1.0-academic">
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-	<FlatFile>
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
+            version="1.0-academic">
+    <FlatFile>
 		<layout>
 			<name>Arquivo-Remessa_BBCNAB240</name>
 			<version>Version 01, Published: 2012/05/25</version>

src/layouts/LayoutBradescoCNAB400Envio.txg.xml

@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
-
 	<FlatFile>
 		<layout>
 			<name>Arquivo-Remessa_BradescoCNAB400</name>

src/layouts/LayoutBradescoCNAB400Retorno.txg.xml

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
 
 	<FlatFile>
 		<layout>

src/layouts/LayoutBradescoCNAB400RetornoParaLer.txg.xml

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
 
 	<FlatFile>
 		<layout>

src/layouts/LayoutBradescoCNAB400RetornoParaReEscrever.txg.xml

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
 
 	<FlatFile>
 		<layout>

src/layouts/LayoutItauCNAB400Envio.txg.xml

@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
-
 	<FlatFile>
 		<layout>
 			<name>Arquivo-Remessa_ItauCNAB400</name>

src/layouts/LayoutItauCNAB400Retorno.txg.xml

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
 
 	<FlatFile>
 		<layout>

src/layouts/LayoutMercantilCNAB400Envio.txg.xml

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
 
 	<FlatFile>
 		<layout>

src/layouts/LayoutSantanderCNAB400Envio.txg.xml

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
 
 	<FlatFile>
 		<layout>
@@ -36,14 +35,14 @@
 					<Field name="LiteralRemessa"			length="7" value="REMESSA" />
 					<Field name="CodigoDeServico"			length="2" value="01" />
 					<Field name="LiteralServico"			length="15" value="COBRANCA" />
-					<Field name="CodigoTransmissao"			length="20" type="INTEGER" />
+					<Field name="CodigoTransmissao"			length="20" type="CHARACTER" />
 					<Field name="NomeCedente"				length="30" type="CHARACTER" />
 					<Field name="CodigoBanco"				length="3" value="033" />
 					<Field name="NomeBanco"					length="15" value="SANTANDER" />
 					<Field name="DataGravacao"				length="6" type="DATE" format="DATE_DDMMYY" />
-					<Field name="Zeros"						length="16" value="00"  />
+					<Field name="Zeros"						length="16" type="INTEGER" padding="ZERO_LEFT" />
-					<Field name="Brancos"					length="274" blankAccepted="true" /><!--Enviar 274 Brancos -->
+					<Field name="Brancos"					length="275" blankAccepted="true" /><!--Enviar 274 Brancos -->
-					<Field name="NumeroVersao"				length="3" blankAccepted="true" /><!--Opcional -->
+					<Field name="NumeroVersao"				length="3" type="INTEGER" padding="ZERO_LEFT" /><!--Opcional -->
 					<Field name="NumeroSequencialRegistro"	length="6" type="INTEGER" padding="ZERO_LEFT" /> 
 				</GroupOfFields>
 			</Record>
@@ -52,36 +51,40 @@
 					<IdType name="IDReg"					length="1" position="1"  value="1"/>
 					<Field name="TipoInscricao"				length="2"	type="INTEGER" />
 					<Field name="NumeroInscricao"			length="14" type="INTEGER" /><!-- CNPJ EMPRESA -->
-					<Field name="CodigoTransmissao"			length="20" type="INTEGER" />
+					<Field name="Agencia"					length="3"	 /> 
-					<Field name="NumControleParticipante" 	length="25" type="CHARACTER" />
+					<Field name="DVAgencia"					length="1"	 /> 
-					<Field name="NossoNumero"				length="8"	type="INTEGER" />
+					<Field name="CodigoEmpresa"				length="8"	type="INTEGER" padding="ZERO_LEFT" />
+					<Field name="ContaCorrente"          	length="8"	type="INTEGER" padding="ZERO_LEFT" /> 
+					<Field name="NumControleDoParticipante"  length="25" type="INTEGER"  padding="ZERO_LEFT" />
+					<Field name="NossoNumeroComDigito"		length="8"	type="INTEGER" />
 					<Field name="DataSegundoDesconto"		length="6"	type="DATE" format="DATE_DDMMYY" padding="ZERO_LEFT" />
 					<Field name="Brancos1"					length="1"	type="CHARACTER" blankAccepted="true" /><!--Enviar 1 Brancos -->
 					<Field name="MultaInformacao"			length="1"	type="INTEGER" />
-					<Field name="MultaPercentual"			length="4"	type="CHARACTER" />										
+					<Field name="MultaPercentual"			length="4"	type="INTEGER" padding="ZERO_LEFT"/>										
-					<Field name="UnidadeMoeda"				length="2"	type="INTEGER" value="00" /> 
+					<Field name="UnidadeMoeda"				length="2"	value="00" /> 
-					<Field name="ValorTitulo"				length="13" type="INTEGER" /> 										
+					<Field name="ValorTitulo"				length="13" type="INTEGER"  padding="ZERO_LEFT"  /> 										
 					<Field name="Brancos2"					length="4"	type="CHARACTER" blankAccepted="true"  /><!--Enviar 4 Brancos -->
 					<Field name="MultaDataCobranca"			length="6"	type="DATE" format="DATE_DDMMYY" padding="ZERO_LEFT" />
-					<Field name="CodigoCarteira"			length="1"	type="INTEGER" />
+					<Field name="CodigoCarteira"			length="1"	value="5" />
-					<Field name="CodigoDeOcorrencia"		length="2"	type="INTEGER" padding="ZERO_LEFT" />
+					<Field name="CodigoDeOcorrencia"		length="2"	value="01" />
 					<Field name="NumeroDoDocumento"			length="10" type="CHARACTER" />
-					<Field name="DataVencimento"			length="6"	type="DATE" format="DATE_DDMMYY" padding="ZERO_LEFT" />
+					<Field name="Vencimento"			    length="6"	type="DATE" format="DATE_DDMMYY" padding="ZERO_LEFT" />
 					<Field name="Valor"						length="13" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT" /> 
-					<Field name="CodigoBanco"				length="3"	type="INTEGER" value="033"/>
+					<Field name="CodigoBanco"				length="3" value="033" />
-					<Field name="Agencia"					length="5"	type="INTEGER" padding="ZERO_LEFT" /> <!--Opcional Default 00000 -->
+					<Field name="AgenciaCobradora"			length="4"	type="INTEGER" padding="ZERO_LEFT" /> 
-					<Field name="EspecieDeTitulo"			length="2"	type="CHARACTER" padding="ZERO_LEFT" />
+					<Field name="DVAgenciaCobradora"		length="1"	 /> 
+					<Field name="EspecieDeTitulo"			length="2"  value="01" />
 					<Field name="Aceite"					length="1"	type="CHARACTER" value="N" /><!-- A = Aceite N = Não Aceite -->
 					<Field name="Emissao"					length="6"	type="DATE" format="DATE_DDMMYY" padding="ZERO_LEFT" />
-					<Field name="Instrucao1"				length="2"	type="CHARACTER" />
+					<Field name="Instrucao1"				length="2" type="INTEGER"  padding="ZERO_LEFT"/>
-					<Field name="Instrucao2"				length="2"	type="CHARACTER" />
+					<Field name="Instrucao2"				length="2" type="INTEGER"  padding="ZERO_LEFT"/>
 					<Field name="JurosDeMora"				length="13" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT" />
-					<Field name="DataLimiteDesconto"		length="6"	type="DATE" format="DATE_DDMMYY" padding="ZERO_LEFT" />
+					<Field name="DataLimiteDesconto"		length="6"	type="INTEGER"  padding="ZERO_LEFT" />
 					<Field name="DescontoConcedido"			length="13" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT" />
 					<Field name="IOF_Devido"				length="13" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT" />
 					<Field name="AbatimentoConcedido"		length="13" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT" />
-					<Field name="TipoInscricaoSacado"		length="2"	type="INTEGER" padding="ZERO_LEFT" />
+					<Field name="TipoInscricaoSacado"		length="2"	value="02"  />
-					<Field name="NumeroInscricaoSacado"		length="14" type="INTEGER" padding="ZERO_LEFT" />
+					<Field name="NumeroInscricaoPagador"		length="14" type="CHARACTER" />
 					<Field name="NomeSacado"				length="40" type="CHARACTER" />
 					<Field name="EnderecoSacado"			length="40" type="CHARACTER" />
 					<Field name="BairroSacado"				length="12" type="CHARACTER" />
@@ -91,20 +94,23 @@
 					<Field name="Estado"					length="2"	type="CHARACTER" />
 					<Field name="SacadorAvalista"			length="30" type="CHARACTER" />
 					<Field name="Brancos3"					length="1"	type="CHARACTER" blankAccepted="true" /><!--Enviar 1 Brancos -->	
-					<Field name="IdentificadorComplemento"	length="1"	type="CHARACTER" />
+					<Field name="IdentificadorComplemento"	length="1"	type="CHARACTER"  value="I"/>
 					<Field name="Complemento"				length="2"	type="INTEGER" />
 					<Field name="Brancos4"					length="6"	type="CHARACTER" blankAccepted="true" /><!--Enviar 6 Branco -->
-					<Field name="NumeroDiasProtesto"		length="2"	type="INTEGER" /><!--Quando tiver registro no instrução -->
+					<Field name="NumeroDiasProtesto"		length="2"	type="INTEGER" padding="ZERO_LEFT"/><!--Quando tiver registro no instrução -->
 					<Field name="Brancos5"					length="1"	type="CHARACTER" blankAccepted="true" /><!--Enviar 1 Brancos -->
 					<Field name="NumeroSequencialRegistro"	length="6"	type="INTEGER" padding="ZERO_LEFT" />
+					
+					
+					
 				</GroupOfFields>
 			</Record>		
 			<Record name="Trailler">
 				<GroupOfFields>
 					<IdType name="IDReg"					length="1" value="9" position="1" />
-					<Field name="QuantidadeRegistro"		length="6"	type="INTEGER" />
+					<Field name="QuantidadeRegistro"		length="6"	type="INTEGER" padding="ZERO_LEFT"/>
-					<Field name="DescontoConcedido"			length="13" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT" />
+					<Field name="ValorTotal"			    length="13" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT" />
-					<Field name="Filler"					length="374" />
+					<Field name="Filler"					length="374" value="0" type="CHARACTER"   padding="ZERO_LEFT"  />
 					<Field name="NumeroSequencialRegistro"	length="6" type="INTEGER" padding="ZERO_LEFT" />	
 				</GroupOfFields>
 			</Record>	

src/layouts/LayoutSantanderCNAB400Retorno.txg.xml

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
-	xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd"
+            version="1.0-academic">
-	version="1.0-academic">
 
 	<FlatFile>
 		<layout>

src/layouts/LayoutSicoobCNAB240Envio.txg.xml

@@ -1,4 +1,7 @@
-<txg:Texgit xmlns:txg="http://gilmatryx.googlepages.com/Texgit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://gilmatryx.googlepages.com/Texgit file:////home/gilmar/NFM/WORKSPACE/TexgitSchema.xsd" version="1.0-academic">
+<txg:Texgit xmlns:txg="http://jrimum.org/texgit"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jrimum.org/texgit http://jrimum.org/texgit/chrome/site/TexgitSchema.xsd"
+            version="1.0-academic">
 	<FlatFile>
 		<layout>
 			<name>Arquivo-Remessa_SicoobCNAB240</name>