fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RMD - Arquivo Exportação para QS (bug #6374) - Parte 2 - REDUÇÃO Z 

Tempo: 3 horas

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@45354 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-06-24 14:56:36 +00:00
parent a95806b0e0
commit 55a57bd1a1
3 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -48,7 +48,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> 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<String, String> 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<String, String> 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<String, String> 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);

22
src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java
View File

@ -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, " ");

18
src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java
View File

@ -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;
}
}