fixes bug#10814

dev:wallace
qua:eliseu

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

src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java

@@ -251,6 +251,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("       r2.crz                  AS crz, ");
 		sql.append("       r2.numserie20           AS numserie20, ");
 		sql.append("       r2.coo                  AS coo, ");
+		sql.append("       r2.cro                  AS cro, "); 
 		sql.append("       r2.cooinicial           AS cooinicial, ");
 		sql.append("       r2.coofinal             AS coofinal, ");
 		sql.append("       r2.vendabrutadiaria     AS vendabrutadiaria, ");
@@ -296,6 +297,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("          r2.crz, ");
 		sql.append("          r2.numserie20, ");
 		sql.append("          r2.coo, ");
+		sql.append("          r2.cro, ");
 		sql.append("          r2.cooinicial, ");
 		sql.append("          r2.coofinal, ");
 		sql.append("          r2.vendabrutadiaria, ");
@@ -323,6 +325,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("       r2.crz                  AS crz, ");
 		sql.append("       r2.numserie20           AS numserie20, ");
 		sql.append("       r2.coo                  AS coo, ");
+		sql.append("       r2.cro                  AS cro, ");
 		sql.append("       r2.cooinicial           AS cooinicial, ");
 		sql.append("       r2.coofinal             AS coofinal, ");
 		sql.append("       r2.vendabrutadiaria     AS vendabrutadiaria, ");
@@ -366,6 +369,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("          r2.crz, ");
 		sql.append("          r2.numserie20, ");
 		sql.append("          r2.coo, ");
+		sql.append("          r2.cro, ");
 		sql.append("          r2.cooinicial, ");
 		sql.append("          r2.coofinal, ");
 		sql.append("          r2.vendabrutadiaria, ");
@@ -393,6 +397,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("       r2.crz                  AS crz, ");
 		sql.append("       r2.numserie20           AS numserie20, ");
 		sql.append("       r2.coo                  AS coo, ");
+		sql.append("       r2.cro                  AS cro, "); 
 		sql.append("       r2.cooinicial           AS cooinicial, ");
 		sql.append("       r2.coofinal             AS coofinal, ");
 		sql.append("       r2.vendabrutadiaria     AS vendabrutadiaria, ");
@@ -435,6 +440,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("          r2.crz, ");
 		sql.append("          r2.numserie20, ");
 		sql.append("          r2.coo, ");
+		sql.append("          r2.cro, ");
 		sql.append("          r2.cooinicial, ");
 		sql.append("          r2.coofinal, ");
 		sql.append("          r2.vendabrutadiaria, ");
@@ -491,6 +497,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 			item.setCrz(rset.getString("crz"));
 			item.setNumserie20(rset.getString("numserie20"));
 			item.setCoo(rset.getString("coo"));
+			item.setCro(rset.getString("cro"));
 			item.setCooinicial(rset.getString("cooinicial"));
 			item.setCoofinal(rset.getString("coofinal"));
 			item.setVendabrutadiaria(rset.getBigDecimal("vendabrutadiaria"));

src/com/rjconsultores/ventaboletos/utilerias/UtiliteriasFiscal.java

@@ -244,7 +244,7 @@ public class UtiliteriasFiscal {
 			String docFiscalFinal, String valorCancel, String valorContabil, String subtributaria, String descontos,
 			String isento, String naoTributado, String aliquota, String aliquota2, String aliquota3, String aliquota4,
 			String coo, String outrosRecebimentos, String impostoDebitado, String dataReducaoZ, String horaReducaoZ,
-			String valorDocFiscal, String status, String brancos, String sequencial) {
+			String valorDocFiscal, String cro, String status, String brancos, String sequencial) {
 
 		StringBuilder reducaoZ = new StringBuilder();
 		reducaoZ.append(identificador);
@@ -274,6 +274,7 @@ public class UtiliteriasFiscal {
 		reducaoZ.append(dataReducaoZ);
 		reducaoZ.append(horaReducaoZ);
 		reducaoZ.append(valorDocFiscal);
+		reducaoZ.append(cro);
 		reducaoZ.append(status);
 		reducaoZ.append(brancos);
 		reducaoZ.append(sequencial);

src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java

@@ -108,19 +108,21 @@ public class ArchivoIntegracionReducaoZ {
 				String horaReducaoZ = ifrZ.getHorareducao();
 
 				String valorDocFiscal = StringHelper.preencherZeroEsquerda(ifrZ.getImposto().toString(), 13);
+				
+				String cro = StringHelper.preencherZeroEsquerda(ifrZ.getCro(), 4);
 
-				String brancos = StringHelper.preencherStringEspacoEsquerda(null, 72);
+				String brancos = StringHelper.preencherStringEspacoEsquerda(null, 68);
 				String status = StringHelper.preencherStringEspacoEsquerda(null, 10);
 				if (isPendencias)
 					status = StringHelper.preencherStringEspacoEsquerda(ifrZ.getStatus(), 10);
-				
+
 				seq++;
 				sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6);
 
 				String redZ = UtiliteriasFiscal.reducaoZ("1", dataMovimento, cnpj, numRelatorio, numPDV, numSeriePDV, numReducaoZ,
 						gtInicial, gtFinal, docFiscalInic, docFiscalFinal, valorCancel, valorContabil, subtributaria,
 						descontos, isento, naoTributado, aliquota, aliquota2, aliquota3, aliquota4, coo, outrosRecebimentos,
-						impostoDebitado, dataReducaoZ, horaReducaoZ, valorDocFiscal, status, brancos, sequencial);
+						impostoDebitado, dataReducaoZ, horaReducaoZ, valorDocFiscal, cro, status, brancos, sequencial);
 				gravarArq.print(redZ + UtiliteriasFiscal.QUEBRA_LINHA);
 			}
 

src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java

@@ -10,6 +10,7 @@ public class ImportacionFiscalReducaoZVO {
 	private String crz;
 	private String numserie20;
 	private String coo;
+	private String cro;
 	private String cooinicial;
 	private String coofinal;
 	private BigDecimal vendabrutadiaria;
@@ -35,6 +36,7 @@ public class ImportacionFiscalReducaoZVO {
 		this.crz = item.getCrz();
 		this.numserie20 = item.getNumserie20();
 		this.coo = item.getCoo();
+		this.cro = item.getCro();
 		this.cooinicial = item.getCooinicial();
 		this.coofinal = item.getCoofinal();
 		this.vendabrutadiaria = item.getVendabrutadiaria();
@@ -259,4 +261,12 @@ public class ImportacionFiscalReducaoZVO {
 		this.inconsistente = inconsistente;
 	}
 
+	public String getCro() {
+		return cro;
+	}
+
+	public void setCro(String cro) {
+		this.cro = cro;
+	}
+
 }