From 570f192a4d0f1f4aa998e37bc49974ddf530e824 Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Mon, 20 May 2024 18:07:45 -0300
Subject: [PATCH] fixes bug#AL-4145

---
 pom.xml                                       |  2 +-
 .../ventaboletos/layouts/SicoobFlatFile.java  |  5 +++--
 src/layouts/LayoutSicoobCNAB240Envio.txg.xml  | 19 ++++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index eefc03525..14b173385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>GeneradorBoletosCNAB</artifactId>
-	<version>1.7.0</version>
+	<version>1.7.1</version>
 	<name>GeneradorBoletosCNAB</name>
    
 	<distributionManagement>
diff --git a/src/com/rjconsultores/ventaboletos/layouts/SicoobFlatFile.java b/src/com/rjconsultores/ventaboletos/layouts/SicoobFlatFile.java
index 80c6dfc06..1c84b2911 100644
--- a/src/com/rjconsultores/ventaboletos/layouts/SicoobFlatFile.java
+++ b/src/com/rjconsultores/ventaboletos/layouts/SicoobFlatFile.java
@@ -59,7 +59,8 @@ public class SicoobFlatFile extends AbstractFlatFile implements RemessaInterface
 			header.setValue("LoteServico", FormataUtil.formatarValorPorTamanhoZeroEsquerda(cabecalhoLote.getLoteServico().toString(), 4)); 
 		}
 
-		header.setValue("NumCpfCnpj", FormataUtil.formatarValorPorTamanho(cabecalhoLote.getNumCpfCnpj(), 15));  
+		header.setValue("NumCpfCnpj", FormataUtil.formatarValorPorTamanho(cabecalhoLote.getNumCpfCnpj(), 14));  
+		header.setValue("CpfCnpj", FormataUtil.formatarValorPorTamanho(cabecalhoLote.getCpfCnpj().toString(), 1)); 
 		header.setValue("NumAgencia", FormataUtil.formatarValorPorTamanho(cabecalhoLote.getNumAgencia(), 5));  
 		header.setValue("DigAgencia", FormataUtil.formatarValorPorTamanho(cabecalhoLote.getDigAgencia(), 1));  
 		header.setValue("NumContaCorrente", FormataUtil.formatarValorPorTamanho(cabecalhoLote.getNumContaCorrente(), 12));  
@@ -67,7 +68,7 @@ public class SicoobFlatFile extends AbstractFlatFile implements RemessaInterface
 		header.setValue("NomeEmpresa", FormataUtil.formatarValorPorTamanho(cabecalhoLote.getNomeEmpresa(), 30));		 
 		header.setValue("NumeroRemessa", FormataUtil.formatarValorPorTamanhoZeroEsquerda(cabecalhoLote.getNumeroRemessa().toString(), 8));
 		header.setValue("DataGeracao", FormataUtil.formataData(cabecalhoLote.getDataGeracao())); 
-		header.setValue("DataCredito", FormataUtil.formataData(cabecalhoLote.getDataCredito())); 
+//		header.setValue("DataCredito", FormataUtil.formataData(cabecalhoLote.getDataCredito())); 
 		
 		getFlatFile().addRecord(header);
 	}
diff --git a/src/layouts/LayoutSicoobCNAB240Envio.txg.xml b/src/layouts/LayoutSicoobCNAB240Envio.txg.xml
index f9cbeca48..12fb4d240 100644
--- a/src/layouts/LayoutSicoobCNAB240Envio.txg.xml
+++ b/src/layouts/LayoutSicoobCNAB240Envio.txg.xml
@@ -58,7 +58,7 @@
 					<Field name="UsoExclusivo" length="2" blankAccepted="true"/>
 					<Field name="NumeroVersaoLote" length="3" value="040" blankAccepted="true"/>
 					<Field name="UsoExclusivo1" length="1" blankAccepted="true"/>
-					<Field name="CpfCnpj" length="2" type="INTEGER"/>
+					<Field name="CpfCnpj" length="1" type="INTEGER"/>
 					<Field name="NumCpfCnpj" length="15" type="CHARACTER" padding="ZERO_LEFT"/>
 					<Field name="NumConvenio" length="20" blankAccepted="true"/>
 					<Field name="NumAgencia" length="5" type="CHARACTER" padding="ZERO_LEFT"/>
@@ -82,7 +82,7 @@
 					<Field name="TipoRegistro" value="3" length="1"/>			
 					<Field name="NumSeqRegistro" type="INTEGER" length="5" padding="ZERO_LEFT"/>
 					<Field name="CodSegmento" length="1" value="P"/>
-					<Field name="Brancos1" length="1" value=" " blankAccepted="true"/>
+					<Field name="Brancos1" length="1" blankAccepted="true"/>
 					<Field name="CodigoMovimento" length="2" value="01"/>
 					<Field name="NumAgencia" length="5" type="CHARACTER" padding="ZERO_LEFT"/>
 					<Field name="DigAgencia" length="1" type="CHARACTER"/>
@@ -99,7 +99,7 @@
 					<Field name="Vencimento" length="8" type="DATE" format="DATE_DDMMYYYY" padding="ZERO_LEFT"/>
 					<Field name="Valor" length="15" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT"/>
 					<Field name="AgenciaCobradora" length="5" value="00000" padding="ZERO_LEFT"/>
-					<Field name="DigAgenciaCobradora" value=" " length="1" blankAccepted="true"/>
+					<Field name="DigAgenciaCobradora" length="1" blankAccepted="true"/>
 					<Field name="EspecieDeTitulo" length="2" padding="ZERO_LEFT" value="02"/>
 					<Field name="Aceite" length="1" type="CHARACTER" value="N"/>
 					<Field name="Emissao" length="8" type="DATE" format="DATE_DDMMYYYY" padding="ZERO_LEFT"/>
@@ -130,7 +130,7 @@
 							<Field name="CodSegmento" length="1" value="Q"/>
 							<Field name="Brancos1" length="1" value=" " blankAccepted="true"/>
 							<Field name="CodigoRemessa" length="2" value="01"/>
-							<Field name="TipoInscricaoSacado" length="2" type="INTEGER"/>
+							<Field name="TipoInscricaoSacado" length="1" type="INTEGER"/>
 							<Field name="NumeroInscricaoSacado" length="15" type="INTEGER" padding="ZERO_LEFT"/>
 							<Field name="NomeSacado" length="40" type="CHARACTER"/>
 							<Field name="LogradouroSacado" length="40" type="CHARACTER"/>
@@ -155,16 +155,17 @@
 					<Field name="LoteServico" value="0001" length="4" padding="ZERO_LEFT"/>
 					<Field name="TipoRegistro" value="5" length="1"/>
 					<Field name="CNAB" length="9" blankAccepted="true"/>
+					<Field name="QtdRegistros" length="6" type="INTEGER" padding="ZERO_LEFT"/>
 					<Field name="QtdTitulosSimples" length="6" type="INTEGER" padding="ZERO_LEFT"/>
-					<Field name="ValorTitulosSimples" length="15" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT"/>
+					<Field name="ValorTitulosSimples" length="17" type="BIGDECIMAL" value="0" format="DECIMAL_DD" padding="ZERO_LEFT"/>
 					<Field name="QtdTitulosVinculada" length="6" type="INTEGER" padding="ZERO_LEFT"/>
-					<Field name="ValorTitulosVinculada" length="15" type="INTEGER" padding="ZERO_LEFT"/>
+					<Field name="ValorTitulosVinculada" length="17" type="INTEGER" padding="ZERO_LEFT"/>
 					<Field name="QtdTitulosCaucionada" length="6" type="INTEGER" padding="ZERO_LEFT"/>
-					<Field name="ValorTitulosCaucionada" length="15" type="INTEGER" padding="ZERO_LEFT"/>
+					<Field name="ValorTitulosCaucionada" length="17" type="INTEGER" padding="ZERO_LEFT"/>
 					<Field name="QtdTitulosDescontada" length="6" type="INTEGER" padding="ZERO_LEFT"/>
-					<Field name="ValorTitulosDescontada" length="15" type="INTEGER" padding="ZERO_LEFT"/>
+					<Field name="ValorTitulosDescontada" length="17" type="INTEGER" padding="ZERO_LEFT"/>
 					<Field name="UsoExclusivo1" length="8" blankAccepted="true"/>					
-					<Field name="UsoExclusivo2" length="217" blankAccepted="true"/>
+					<Field name="UsoExclusivo2" length="117" blankAccepted="true"/>
 				</GroupOfFields>
 			</Record>
 			<Record name="TraillerArquivo">