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

Merge pull request 'fixes bug#AL-2602' (#3) from AL-2602 into master 

Reviewed-on: adm/IntegracaoReceitaDespesa#3
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
master
Gleison da Cruz 2023-05-25 19:42:26 +00:00
parent 6784ec5efe d4e31b0a3b
commit 40c6d03340
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>IntegracaoReceitaDespesa</artifactId> <artifactId>IntegracaoReceitaDespesa</artifactId>
<version>1.2.1</version> <version>1.2.2</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

15
src/com/rjconsultores/integracaoreceitadespesa/dao/Totalbus.java
View File

@ -556,7 +556,7 @@ public class Totalbus {
sb.append(" cd.feccorte AS fechorvta, "); sb.append(" cd.feccorte AS fechorvta, ");
sb.append(" e.empresa_id AS empresa, "); sb.append(" e.empresa_id AS empresa, ");
sb.append(" pv.puntoventa_id AS puntoventaId, "); sb.append(" pv.puntoventa_id AS puntoventaId, ");
sb.append(" sum(cdp.importe) AS valor, "); sb.append(" cdp.importe AS valor, ");
sb.append(" tee.contacontabil AS contacontabil, "); sb.append(" tee.contacontabil AS contacontabil, ");
sb.append(" pv.numpuntoventa AS numpuntoventa, "); sb.append(" pv.numpuntoventa AS numpuntoventa, ");
sb.append(" ev.tipoeventoextra_id, "); sb.append(" ev.tipoeventoextra_id, ");
@ -582,18 +582,7 @@ public class Totalbus {
adicionaFiltroQuery(empresaId, sb, " and e.empresa_id = ", empresaId != null); adicionaFiltroQuery(empresaId, sb, " and e.empresa_id = ", empresaId != null);
sb.append(" and cd.activo = 1 "); sb.append(" and cd.activo = 1 ");
sb.append(" and cdp.formapago_id in (2,3) "); sb.append(" and cdp.formapago_id in (2,3) ");
sb.append(" and tee.indtipo = 0 "); sb.append(" and tee.indtipo = 0 ");
sb.append(" group by ");
sb.append(" cd.feccorte, ");
sb.append(" e.empresa_id, ");
sb.append(" pv.puntoventa_id, ");
sb.append(" tee.contacontabil, ");
sb.append(" pv.numpuntoventa, ev.tipoeventoextra_id, ");
sb.append(" cdp.formapago_id, ");
sb.append(" ct.numautorizacion, ");
sb.append(" pte.numsitef, ");
sb.append(" b.numfoliosistema,");
sb.append(" ct.tx_id");
PreparedStatement stmt = null; PreparedStatement stmt = null;
ResultSet rs = null; ResultSet rs = null;