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

Merge pull request 'fixes bug#AL-4010' (!444) from AL-4010 into master 

Reviewed-on: adm/VentaBoletosAdm#444
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
master
wallace 2024-03-15 21:01:54 +00:00
parent c12166e959 58c550a231
commit 056e6442c6
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.58.0</version> <version>1.58.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.42.0</modelWeb.version> <modelWeb.version>1.41.3</modelWeb.version>
<flyway.version>1.32.0</flyway.version> <flyway.version>1.31.0</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgencia.java
View File

@ -157,7 +157,7 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio {
sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 "); sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 ");
sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID ");
sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID ");
sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID AND (c.NUMSERIEPREIMPRESA = dab.NUMSERIEPREIMPRESA OR (c.NUMSERIEPREIMPRESA IS NULL and dab.NUMSERIEPREIMPRESA is null)) ");
sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, "); sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, ");
sql.append(" c.puntoventa_id, "); sql.append(" c.puntoventa_id, ");
sql.append(" to_char(c.fechorventa, 'ddMMyyyy'), "); sql.append(" to_char(c.fechorventa, 'ddMMyyyy'), ");
@ -190,7 +190,7 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio {
sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 "); sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 ");
sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID ");
sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID ");
sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID AND (c.NUMSERIEPREIMPRESA = dab.NUMSERIEPREIMPRESA OR (c.NUMSERIEPREIMPRESA IS NULL and dab.NUMSERIEPREIMPRESA is null)) ");
sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, "); sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, ");
sql.append(" c.puntoventa_id, "); sql.append(" c.puntoventa_id, ");
sql.append(" to_char(c.FECHORVTA, 'ddMMyyyy'), "); sql.append(" to_char(c.FECHORVTA, 'ddMMyyyy'), ");

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.java
View File

@ -150,7 +150,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID ");
sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID ");
sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID ");
sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID and (c.NUMSERIEPREIMPRESA = dab.NUMSERIEPREIMPRESA OR (c.NUMSERIEPREIMPRESA IS NULL and dab.NUMSERIEPREIMPRESA is null)) ");
sql.append(" AND po.parada_id = c.origen_id "); sql.append(" AND po.parada_id = c.origen_id ");
sql.append(" AND co.ciudad_id = po.ciudad_id "); sql.append(" AND co.ciudad_id = po.ciudad_id ");
sql.append(" AND pd.parada_id = c.destino_id "); sql.append(" AND pd.parada_id = c.destino_id ");
@ -203,7 +203,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 "); sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 ");
sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID ");
sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID ");
sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID and (c.NUMSERIEPREIMPRESA = dab.NUMSERIEPREIMPRESA OR (c.NUMSERIEPREIMPRESA IS NULL and dab.NUMSERIEPREIMPRESA is null)) ");
sql.append(" GROUP BY DAB.AIDF_ID, "); sql.append(" GROUP BY DAB.AIDF_ID, ");
sql.append(" c.numseriepreimpresa, "); sql.append(" c.numseriepreimpresa, ");
sql.append(" c.numfoliopreimpreso, "); sql.append(" c.numfoliopreimpreso, ");
@ -214,6 +214,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
sql.append(" AIT.DESCTIPO, "); sql.append(" AIT.DESCTIPO, ");
sql.append(" c.PRECIO)TB "); sql.append(" c.PRECIO)TB ");
sql.append(" ORDER BY to_number(TB.FOLIO) "); sql.append(" ORDER BY to_number(TB.FOLIO) ");
return sql.toString(); return sql.toString();

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

@ -4,6 +4,8 @@ import java.math.BigDecimal;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -12,6 +14,7 @@ import java.util.Map;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ItemReporteControleEstoqueBoletos; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ItemReporteControleEstoqueBoletos;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioBilhetesVendidosEstoqueAgenciaBean;
import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
@ -158,6 +161,23 @@ public class RelatorioEstoque extends Relatorio {
List<ItemReporteControleEstoqueBoletos> lsBlocoJaTodoUtilizado = tratarBlocoJaTodoUtilizado(lsTempRetornoAux); List<ItemReporteControleEstoqueBoletos> lsBlocoJaTodoUtilizado = tratarBlocoJaTodoUtilizado(lsTempRetornoAux);
Collections.sort(lsBlocoJaTodoUtilizado, new Comparator<ItemReporteControleEstoqueBoletos>() {
@Override
public int compare(ItemReporteControleEstoqueBoletos rel1, ItemReporteControleEstoqueBoletos rel2) {
Integer aidf1 = ((ItemReporteControleEstoqueBoletos) rel1).getAidfId();
Integer aidf2 = ((ItemReporteControleEstoqueBoletos) rel2).getAidfId();
int sComp = aidf1.compareTo(aidf2);
if (sComp != 0) {
return sComp;
}
String folioInicial1 = ((ItemReporteControleEstoqueBoletos) rel1).getFolioInicial();
String folioInicial2 = ((ItemReporteControleEstoqueBoletos) rel2).getFolioInicial();
return Integer.valueOf(folioInicial1).compareTo(Integer.valueOf(folioInicial2));
}
});
lsDadosRelatorio.addAll(lsBlocoJaTodoUtilizado); lsDadosRelatorio.addAll(lsBlocoJaTodoUtilizado);
setLsDadosRelatorio(lsDadosRelatorio); setLsDadosRelatorio(lsDadosRelatorio);