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

Merge pull request 'AL-4231' (!498) from AL-4231 into master 

Reviewed-on: adm/VentaBoletosAdm#498
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
master 1.68.5
wallace 2024-05-07 14:09:24 +00:00
parent 1337947688 85fef97bfb
commit c8bf56a709
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.68.4</version>
<packaging>war</packaging>
<version>1.68.5</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.51.2</modelWeb.version>

9
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
View File

@ -202,15 +202,15 @@ public class RelatorioEstoque extends Relatorio {
StringBuilder sb = new StringBuilder();
sb.append(" select TB.aidfId as aidfId, ");
sb.append(" select DISTINCT TB.aidfId as aidfId, ");
sb.append(" TB.serie as serie, ");
sb.append(" TB.folioCaja as folioCaja, ");
sb.append(" TB.folioCaja as folioCaja, ");
sb.append(" TB.folioInicial as folioInicial, ");
sb.append(" TB.folioFinal as folioFinal, ");
sb.append(" TB.folioFinal as folioFinal, ");
sb.append(" TB.descPuntoVenta as descPuntoVenta, ");
sb.append(" TB.articuloId as articuloId, ");
sb.append(" TB.nombEmpresa as nombEmpresa, ");
sb.append(" TB.empresaId as empresaId, ");
sb.append(" TB.empresaId as empresaId, ");
sb.append(" TB.marcaId as marcaId, ");
sb.append(" TB.fechorAquisicion as fechorAquisicion, ");
sb.append(" TB.tipo as tipo, ");
@ -379,7 +379,6 @@ public class RelatorioEstoque extends Relatorio {
sb.append(" ORDER BY TB.aidfId, ");
sb.append(" TB.serie, ");
sb.append(" TB.folioCaja ");
System.out.println(sb.toString());
return sb.toString();