diff --git a/pom.xml b/pom.xml index 4b1f60cf0..dc8838e06 100644 --- a/pom.xml +++ b/pom.xml @@ -1,259 +1,259 @@ - - - 4.0.0 - br.com.rjconsultores - ventaboletosadm - 1.0.29 - war - - - 1.0.20 - 1.0.11 - - - - - rj-releases - http://52.5.53.15:8081/nexus/content/repositories/releases/ - - - - - ${project.artifactId} - src/java - - - src/java - - **/*.java - - - - - - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - ISO-8859-1 - - - - maven-war-plugin - 3.3.1 - - web - @{artifactId}@.@{extension}@ - - - - org.wildfly.plugins - wildfly-maven-plugin - 3.0.0.Final - - - - - - - - br.com.rjconsultores - ModelWeb - ${modelWeb.version} - - - - br.com.rjconsultores - Flyway - ${flyway.version} - - - - br.com.rjconsultores - IntegracaoReceitaDespesa - 1.0.1 - - - - br.com.rjconsultores - WSTotvs - 1.0.0 - - - - br.com.rjconsultores - WSAG - 1.0.0 - - - - br.com.rjconsultores - Auditador - 1.0.1 - - - - br.com.rjconsultores - GeneradorBoletosCNAB - 1.0.2 - - - - br.com.rjconsultores - silvergray - 1.0.0 - - - - org.apache.httpcomponents - httpcore - 4.4.14 - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - - org.jboss.resteasy - resteasy-jaxrs - 3.14.0.Final - provided - - - - javax.servlet - javax.servlet-api - 4.0.0 - provided - - - - commons-beanutils - commons-beanutils - 1.9.4 - - - - commons-codec - commons-codec - 1.10 - - - - org.zkoss.common - zcommon - 5.0.9 - - - org.zkoss.zk - zhtml - 5.0.9 - - - org.zkoss.zk - zk - 5.0.9 - - - org.zkoss.zk - zkplus - 5.0.9 - - - org.zkoss.zk - zul - 5.0.9 - - - org.zkoss.zkforge - ckez - 3.6.0.0 - - - org.zkoss.zkforge - fckez - 2.6.1_1 - - - org.zkoss.zk - zkspring-security - 3.0RC - - - - commons-collections - commons-collections - 3.2.1 - - - org.codehaus.jackson - jackson-core-asl - 1.9.9 - - - - com.trg - trg-search - 0.4.3 - - - opensymphony - quartz-all - 1.6.5 - - - - org.apache.xmlbeans - xmlbeans - 2.3.0-1 - - - net.sf.saxon - saxon - 8.7 - - - net.sf.saxon - saxon-dom - 8.7 - - - - com.nimbusds - nimbus-jose-jwt - jdk16 - 4.11.2 - - - - org.xhtmlrenderer - flying-saucer-pdf-itext5 - 9.1.6 - - - - net.sf.jasperreports - jasperreports - 6.0.0 - - - - com.lowagie - itext - 2.1.7 - - - - net.sourceforge.jexcelapi - jxl - 2.6.12 - - - - + + + 4.0.0 + br.com.rjconsultores + ventaboletosadm + 1.0.30 + war + + + 1.0.20 + 1.0.11 + + + + + rj-releases + http://52.5.53.15:8081/nexus/content/repositories/releases/ + + + + + ${project.artifactId} + src/java + + + src/java + + **/*.java + + + + + + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + ISO-8859-1 + + + + maven-war-plugin + 3.3.1 + + web + @{artifactId}@.@{extension}@ + + + + org.wildfly.plugins + wildfly-maven-plugin + 3.0.0.Final + + + + + + + + br.com.rjconsultores + ModelWeb + ${modelWeb.version} + + + + br.com.rjconsultores + Flyway + ${flyway.version} + + + + br.com.rjconsultores + IntegracaoReceitaDespesa + 1.0.1 + + + + br.com.rjconsultores + WSTotvs + 1.0.0 + + + + br.com.rjconsultores + WSAG + 1.0.0 + + + + br.com.rjconsultores + Auditador + 1.0.1 + + + + br.com.rjconsultores + GeneradorBoletosCNAB + 1.0.2 + + + + br.com.rjconsultores + silvergray + 1.0.0 + + + + org.apache.httpcomponents + httpcore + 4.4.14 + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + org.jboss.resteasy + resteasy-jaxrs + 3.14.0.Final + provided + + + + javax.servlet + javax.servlet-api + 4.0.0 + provided + + + + commons-beanutils + commons-beanutils + 1.9.4 + + + + commons-codec + commons-codec + 1.10 + + + + org.zkoss.common + zcommon + 5.0.9 + + + org.zkoss.zk + zhtml + 5.0.9 + + + org.zkoss.zk + zk + 5.0.9 + + + org.zkoss.zk + zkplus + 5.0.9 + + + org.zkoss.zk + zul + 5.0.9 + + + org.zkoss.zkforge + ckez + 3.6.0.0 + + + org.zkoss.zkforge + fckez + 2.6.1_1 + + + org.zkoss.zk + zkspring-security + 3.0RC + + + + commons-collections + commons-collections + 3.2.1 + + + org.codehaus.jackson + jackson-core-asl + 1.9.9 + + + + com.trg + trg-search + 0.4.3 + + + opensymphony + quartz-all + 1.6.5 + + + + org.apache.xmlbeans + xmlbeans + 2.3.0-1 + + + net.sf.saxon + saxon + 8.7 + + + net.sf.saxon + saxon-dom + 8.7 + + + + com.nimbusds + nimbus-jose-jwt + jdk16 + 4.11.2 + + + + org.xhtmlrenderer + flying-saucer-pdf-itext5 + 9.1.6 + + + + net.sf.jasperreports + jasperreports + 6.0.0 + + + + com.lowagie + itext + 2.1.7 + + + + net.sourceforge.jexcelapi + jxl + 2.6.12 + + + + \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java index 094b96680..143a52388 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java @@ -82,6 +82,7 @@ public class RelatorioEstornoCartao extends Relatorio { dataResult.put("descmotivo", rset.getString("descmotivo")); dataResult.put("adquirente", rset.getString("adquirente")); dataResult.put("estabelecimento", rset.getString("estabelecimento")); + dataResult.put("nsuhost", rset.getString("nsuhost")); this.dados.add(dataResult); @@ -136,7 +137,21 @@ public class RelatorioEstornoCartao extends Relatorio { sql.append(" AND c.corrida_id = dec.corrida_id "); sql.append(" AND c.numfoliosistema = dec.numfoliosistema "); sql.append(" AND c.indreimpresion = 1 "); - sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo "); + sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo, "); + + //SubSelect para evitar duplicacao dos registros por causa do join com a caja + sql.append(" COALESCE(( select ct.nsuhost "); + sql.append(" from caja c inner join caja_formapago cfp on cfp.caja_id = c.caja_id "); + sql.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); + sql.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); + sql.append(" inner join forma_pago fp on fp.formapago_id = cfp.formapago_id "); + sql.append(" where "); + sql.append(" c.numoperacion = dec.numoperacion "); + sql.append(" AND c.origen_id = dec.origen_id "); + sql.append(" AND c.destino_id = dec.destino_id "); + sql.append(" AND c.corrida_id = dec.corrida_id "); + sql.append(" AND coalesce( ct.nsuhost, '0') <> '0' "); + sql.append(" AND rownum = 1), '') as nsuhost "); sql.append(" FROM "); @@ -187,7 +202,7 @@ public class RelatorioEstornoCartao extends Relatorio { } sql.append(" AND DEC.FECREGISTRO BETWEEN :data_inicial AND :data_final "); - sql.append(" ORDER BY DEC.FECREGISTRO "); + sql.append(" ORDER BY e.nombempresa, DEC.FECREGISTRO "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties index 660477569..e59e2254a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties @@ -35,4 +35,5 @@ empresa.label=Empresa: formaPago.label=Forma de Pagamento pontoDeventa.label=Ponto de Venda estabelecimento.label=Estab. -adquirente.label=Adquirente \ No newline at end of file +adquirente.label=Adqui. +nsuhost.label=NSU/Host \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties index 38f51c05d..5d726ed94 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties @@ -36,4 +36,5 @@ formaPago.label=Forma de Pagamento pontoDeventa.label=Ponto de Venda motivoCancelamento.label=Motivo Cancelamento estabelecimento.label=Estab. -adquirente.label=Adquirente \ No newline at end of file +adquirente.label=Adqui. +nsuhost.label=NSU/Host \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper index 6f843fc3b..eedcdbcdf 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml index 326e9f6c7..2ffd37098 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml @@ -44,6 +44,9 @@ + + + @@ -183,14 +186,14 @@ - + - + @@ -218,7 +221,7 @@ - + @@ -231,6 +234,13 @@ + + + + + + + @@ -449,14 +459,14 @@ - + - + @@ -500,7 +510,7 @@ - + @@ -513,6 +523,13 @@ + + + + + + +