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

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

Reviewed-on: adm/VentaBoletosAdm#411
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.54.1
fabio 2024-02-28 16:53:58 +00:00
parent ab673ded2b 5961ce9295
commit b2d5e0f7ec
2 changed files with 18 additions and 8 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.54.0</version> <version>1.54.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

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

@ -110,13 +110,23 @@ 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(" CASE ");
sql.append(" COALESCE((SELECT to_char(MAX(cd.numfoliopreimpreso)) FROM caja_diversos cd where cd.numseriepreimpresa = dab.numseriepreimpresa), "); sql.append(" WHEN dab.STATUSOPERACION = 1 THEN fp.FOLIOPREIMPRESO ");
sql.append(" (SELECT TO_CHAR(MAX(c.numfoliopreimpreso)) FROM caja c WHERE ( c.numseriepreimpresa = dab.numseriepreimpresa OR "); sql.append(" ELSE COALESCE( ");
sql.append(" ( c.numseriepreimpresa IS NULL AND dab.numseriepreimpresa IS NULL ) ) AND to_number(c.numfoliopreimpreso) "); sql.append(" ");
sql.append(" BETWEEN dab.numfolioinicial AND dab.numfoliofinal AND ( c.indreimpresion = 0 OR ( c.indreimpresion = 1 AND c.indstatusboleto = 'E' ) ) "); sql.append(" (SELECT TO_CHAR(MAX(c.numfoliopreimpreso)) ");
sql.append(" AND c.marca_id = m.marca_id), dab.NUMFOLIOINICIAL) "); sql.append(" FROM caja c ");
sql.append(" END as ultimoFolioCaja, "); sql.append(" WHERE (c.numseriepreimpresa = dab.numseriepreimpresa ");
sql.append(" OR (c.numseriepreimpresa IS NULL ");
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 ");
sql.append(" AND c.indstatusboleto = 'E')) ");
sql.append(" AND c.marca_id = m.marca_id), (SELECT to_char(MAX(cd.numfoliopreimpreso)) ");
sql.append(" FROM caja_diversos cd ");
sql.append(" WHERE cd.numseriepreimpresa = dab.numseriepreimpresa), dab.NUMFOLIOINICIAL) ");
sql.append(" END 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 ");