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

Merge pull request 'fixes bug#AL-3898' (!408) from AL-3898 into master 

Reviewed-on: adm/VentaBoletosAdm#408
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.53.7
wallace 2024-02-27 21:22:28 +00:00
parent 103eaf2be4 9194701a6a
commit 3ab0d78188
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<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.53.6</version> <version>1.53.7</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

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

@ -47,7 +47,7 @@ public class RelatorioEstoque extends Relatorio {
String formInicio = rset.getString("forminicial"); String formInicio = rset.getString("forminicial");
if (tipoVenta.equals(EnumTipoVenda.TPV_MANUAL.getId().toString())) { if (tipoVenta.equals(EnumTipoVenda.TPV_MANUAL.getId().toString())) {
String ultimoFolioCaja = rset.getString("ultimoFolioCaja"); String ultimoFolioCaja = rset.getString("ultimoFolioCaja") != null ? String.valueOf(rset.getInt("ultimoFolioCaja") + 1) : null;
boolean isFormularioMaior = false; boolean isFormularioMaior = false;
try { try {
@ -110,33 +110,28 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" coalesce(fp.FOLIOPREIMPRESO,dab.NUMFOLIOINICIAL) "); sql.append(" coalesce(fp.FOLIOPREIMPRESO,dab.NUMFOLIOINICIAL) ");
sql.append(" end ) AS forminicial,"); sql.append(" end ) AS forminicial,");
sql.append(" dab.NUMFOLIOFINAL AS formfinal, "); sql.append(" dab.NUMFOLIOFINAL AS formfinal, ");
sql.append(" CASE WHEN dab.STATUSOPERACION = 1 THEN fp.FOLIOPREIMPRESO ELSE ");
sql.append(" ( SELECT "); sql.append(" COALESCE((SELECT to_char(MAX(cd.numfoliopreimpreso)) FROM caja_diversos cd where cd.numseriepreimpresa = dab.numseriepreimpresa), ");
sql.append(" MAX(to_number(c.numfoliopreimpreso)) + 1 AS numfoliopreimpreso"); sql.append(" (SELECT TO_CHAR(MAX(c.numfoliopreimpreso)) FROM caja c WHERE ( c.numseriepreimpresa = dab.numseriepreimpresa OR ");
sql.append(" FROM Caja c"); sql.append(" ( c.numseriepreimpresa IS NULL AND dab.numseriepreimpresa IS NULL ) ) AND to_number(c.numfoliopreimpreso) ");
sql.append(" WHERE ( ( c.numseriepreimpresa = dab.numseriepreimpresa "); sql.append(" BETWEEN dab.numfolioinicial AND dab.numfoliofinal AND ( c.indreimpresion = 0 OR ( c.indreimpresion = 1 AND c.indstatusboleto = 'E' ) ) ");
sql.append(" AND c.aidf_id = dab.aidf_id ) "); sql.append(" AND c.marca_id = m.marca_id), dab.NUMFOLIOINICIAL) ");
sql.append(" OR ( c.numseriepreimpresa IS NULL "); sql.append(" END as ultimoFolioCaja, ");
sql.append(" AND dab.numseriepreimpresa IS NULL ) ) ");
sql.append(" AND to_number(c.numfoliopreimpreso) BETWEEN dab.numfolioinicial AND dab.numfoliofinal ");
sql.append(" AND ( c.indreimpresion = 0 ");
sql.append(" OR ( c.indreimpresion = 1 AND c.indstatusboleto = 'E' ) ) ");
sql.append(" AND c.marca_id = ab.empresa_id ");
sql.append(" ) AS ultimoFolioCaja, ");
sql.append(" ar.articulo_id AS tipoventa,"); sql.append(" ar.articulo_id AS tipoventa,");
sql.append(" ar.descarticulo, "); sql.append(" ar.descarticulo, ");
sql.append(" est.nombestado "); sql.append(" est.nombestado ");
sql.append(" FROM abasto_boleto ab "); sql.append(" FROM abasto_boleto ab ");
sql.append(" INNER JOIN empresa e ON ( e.empresa_id = ab.empresa_id and ab.ACTIVO = 1 )");
sql.append(" INNER JOIN det_abasto_boleto dab ON ( dab.abastoboleto_id = ab.abastoboleto_id and dab.ACTIVO = 1 )"); sql.append(" INNER JOIN det_abasto_boleto dab ON ( dab.abastoboleto_id = ab.abastoboleto_id and dab.ACTIVO = 1 )");
sql.append(" INNER JOIN punto_venta p ON ( p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 )");
sql.append(" LEFT JOIN TIPO_PTOVTA tp ON ( tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 )");
sql.append(" LEFT JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )");
sql.append(" INNER JOIN ARTICULO ar ON ( ar.ARTICULO_ID = ab.ARTICULO_ID )");
sql.append(" LEFT JOIN FOLIO_PREIMPRESO fp ON ( fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 )");
sql.append(" INNER JOIN aidf ai ON ( ai.aidf_id =dab.aidf_id )"); sql.append(" INNER JOIN aidf ai ON ( ai.aidf_id =dab.aidf_id )");
sql.append(" INNER JOIN estado est ON ( est.estado_id = ai.ESTADO_ID ) "); sql.append(" INNER JOIN estado est ON ( est.estado_id = ai.ESTADO_ID ) ");
sql.append(" INNER JOIN empresa e ON ( e.empresa_id = ab.empresa_id and ab.ACTIVO = 1 )");
sql.append(" INNER JOIN punto_venta p ON ( p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 )");
sql.append(" INNER JOIN ARTICULO ar ON ( ar.ARTICULO_ID = ab.ARTICULO_ID )");
sql.append(" LEFT JOIN TIPO_PTOVTA tp ON ( tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 )");
sql.append(" LEFT JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )");
sql.append(" LEFT JOIN FOLIO_PREIMPRESO fp ON ( fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 )");
sql.append(" LEFT JOIN EMPRESA em ON em.EMPRESA_ID = ab.EMPRESA_ID ");
sql.append(" LEFT JOIN MARCA m ON m.EMPRESA_ID = em.EMPRESA_ID AND m.ACTIVO = 1 ");
sql.append(" WHERE "); sql.append(" WHERE ");
sql.append(" dab.statusoperacion in (0,1) and dab.activo = 1 and ab.activo = 1 "); sql.append(" dab.statusoperacion in (0,1) and dab.activo = 1 and ab.activo = 1 ");