From 55a57bd1a16219d4768da1e000c677be407ed664 Mon Sep 17 00:00:00 2001 From: julio Date: Wed, 24 Jun 2015 14:56:36 +0000 Subject: [PATCH] =?UTF-8?q?RMD=20-=20Arquivo=20Exporta=C3=A7=C3=A3o=20para?= =?UTF-8?q?=20QS=20(bug=20#6374)=20-=20Parte=202=20-=20REDU=C3=87=C3=83O?= =?UTF-8?q?=20Z=20Tempo:=203=20horas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@45354 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 20 +++++++++++++---- .../service/impl/FiscalServiceImpl.java | 22 ++++++++++++++----- .../ImportacionFiscalReducaoZVO.java | 18 +++++++++++++++ 3 files changed, 51 insertions(+), 9 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 52946cd16..5419f06ca 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -48,7 +48,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl sql.append(" r3.totparcial AS aliquota, "); sql.append(" r3.valoracumulado AS imposto, "); sql.append(" ifi.fiscalimpressora_id AS numpdv, "); - sql.append(" ifi.numcnpj AS cnpj "); + sql.append(" ifi.numcnpj AS cnpj, "); + sql.append(" r2.totgeral AS gtFinal, "); + sql.append(" anterior.totgeral AS gtInicial "); sql.append("FROM fiscal_r2 r2 "); sql.append(" inner join fiscal_r3 r3 "); sql.append(" ON r3.crz = r2.crz "); @@ -57,13 +59,19 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl sql.append(" left join fiscal_impressora ifi "); sql.append(" ON ifi.numserie20 = r2.numserie20 "); sql.append(" left join empresa e "); - sql.append(" ON TRANSLATE(ifi.numcnpj, ' / - . ', ' ') = e.cnpj "); + sql.append(" ON TRANSLATE(ifi.numcnpj, ' / - . ', ' ') = e.cnpj, "); + sql.append(" (SELECT numserie20, "); + sql.append(" crz, "); + sql.append(" totgeral "); + sql.append(" FROM fiscal_r2) anterior "); sql.append("WHERE r2.datamov BETWEEN :datIni AND :datFim "); sql.append(" AND e.empresa_id = :empresaId "); sql.append(" AND r3.totparcial not in ("); sql.append("'" + SituacaoTributaria.CANCELADO.getValue() + "'").append(", "); sql.append("'" + SituacaoTributaria.DESCRITIVO.getValue() + "'").append(", "); sql.append("'" + SituacaoTributaria.OPCIONAL.getValue() + "'").append(")"); + sql.append(" AND anterior.numserie20 = r2.numserie20 "); + sql.append(" AND anterior.crz = r2.crz - 1 "); sql.append("GROUP BY r2.datamov, "); sql.append(" r2.numreducoes, "); sql.append(" r2.crz, "); @@ -77,7 +85,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl sql.append(" r3.totparcial, "); sql.append(" r3.valoracumulado, "); sql.append(" ifi.fiscalimpressora_id, "); - sql.append(" ifi.numcnpj "); + sql.append(" ifi.numcnpj, "); + sql.append(" r2.totgeral, "); + sql.append(" anterior.totgeral "); sql.append("ORDER BY r2.datamov, "); sql.append(" numserie20, "); sql.append(" crz, "); @@ -98,7 +108,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl .addScalar("aliquota", StringType.INSTANCE) .addScalar("imposto", BigDecimalType.INSTANCE) .addScalar("numpdv", StringType.INSTANCE) - .addScalar("cnpj", StringType.INSTANCE); + .addScalar("cnpj", StringType.INSTANCE) + .addScalar("gtFinal", BigDecimalType.INSTANCE) + .addScalar("gtInicial", BigDecimalType.INSTANCE); query.setResultTransformer(new AliasToBeanResultTransformer(ImportacionFiscalReducaoZVO.class)); query.setInteger("empresaId", empresaId); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java index 1438fe322..2f9a1c6ee 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java @@ -91,8 +91,15 @@ public class FiscalServiceImpl implements FiscalService { numReducaoZ = StringUtils.rightPad("", (5 - numReducaoZ.length()), " ") + numReducaoZ; } - String gtInicial = StringUtils.rightPad("", 18, "0"); - String gtFinal = StringUtils.rightPad("", 18, "0"); + String gtInicial = ifrZ.getGtInicial().toString(); + if (gtInicial.length() < 18) { + gtInicial = StringUtils.rightPad("", (18 - gtInicial.length()), "0") + gtInicial; + } + + String gtFinal = ifrZ.getGtFinal().toString(); + if (gtFinal.length() < 18) { + gtFinal = StringUtils.rightPad("", (18 - gtFinal.length()), "0") + gtFinal; + } String docFiscalInic = ifrZ.getCooinicial(); if (docFiscalInic.length() < 9) { @@ -182,7 +189,12 @@ public class FiscalServiceImpl implements FiscalService { } - String qtdeDocGerados = StringUtils.rightPad("", 5, " ") + "1"; + Integer qtdeDoc = seq - 1; + String qtdeDocGerados = qtdeDoc.toString(); + if (qtdeDocGerados.length() < 6) { + qtdeDocGerados = StringUtils.rightPad("", (6 - qtdeDocGerados.length()), "0") + qtdeDocGerados; + } + String brancos388 = StringUtils.rightPad("", 388, " "); seq++; @@ -353,12 +365,12 @@ public class FiscalServiceImpl implements FiscalService { String qtdeDocGerados = qtdDoc.toString(); if (qtdeDocGerados.length() < 6) { - qtdeDocGerados = StringUtils.rightPad("", (6 - qtdeDocGerados.length()), " ") + qtdeDocGerados; + qtdeDocGerados = StringUtils.rightPad("", (6 - qtdeDocGerados.length()), "0") + qtdeDocGerados; } String qtdeItensDocGerados = qtdItens.toString(); if (qtdeItensDocGerados.length() < 6) { - qtdeItensDocGerados = StringUtils.rightPad("", (6 - qtdeItensDocGerados.length()), " ") + qtdeItensDocGerados; + qtdeItensDocGerados = StringUtils.rightPad("", (6 - qtdeItensDocGerados.length()), "0") + qtdeItensDocGerados; } String brancos382 = StringUtils.rightPad("", 382, " "); diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java b/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java index 49b390ca8..fe0f0bdc7 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java @@ -19,6 +19,8 @@ public class ImportacionFiscalReducaoZVO { private BigDecimal imposto; private BigDecimal valorNaoTributado; private String numpdv; + private BigDecimal gtFinal; + private BigDecimal gtInicial; public String getDatamov() { return datamov; @@ -140,4 +142,20 @@ public class ImportacionFiscalReducaoZVO { this.numpdv = numpdv; } + public BigDecimal getGtFinal() { + return gtFinal; + } + + public void setGtFinal(BigDecimal gtFinal) { + this.gtFinal = gtFinal; + } + + public BigDecimal getGtInicial() { + return gtInicial; + } + + public void setGtInicial(BigDecimal gtInicial) { + this.gtInicial = gtInicial; + } + }