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

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

Reviewed-on: adm/VentaBoletosAdm#412
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master 1.54.2
wallace 2024-02-28 20:06:56 +00:00
parent b2d5e0f7ec 5d720497df
commit e2c42338ef
2 changed files with 7 additions and 7 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.1</version> <version>1.54.2</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

12
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") != null ? String.valueOf(rset.getInt("ultimoFolioCaja") + 1) : null; String ultimoFolioCaja = rset.getString("ultimoFolioCaja");
boolean isFormularioMaior = false; boolean isFormularioMaior = false;
try { try {
@ -98,7 +98,7 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" e.nombempresa, "); sql.append(" e.nombempresa, ");
sql.append(" p.nombpuntoventa, "); sql.append(" p.nombpuntoventa, ");
sql.append(" dab.NUMSERIEPREIMPRESA AS serie, "); sql.append(" dab.NUMSERIEPREIMPRESA AS serie, ");
sql.append(" es.descestacion AS estacao, "); sql.append(" coalesce(es.descestacion, 'Todas') AS estacao, ");
sql.append(" tp.desctipo AS tipo, "); sql.append(" tp.desctipo AS tipo, ");
sql.append(" ( case "); sql.append(" ( case ");
@ -114,7 +114,7 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" WHEN dab.STATUSOPERACION = 1 THEN fp.FOLIOPREIMPRESO "); sql.append(" WHEN dab.STATUSOPERACION = 1 THEN fp.FOLIOPREIMPRESO ");
sql.append(" ELSE COALESCE( "); sql.append(" ELSE COALESCE( ");
sql.append(" "); sql.append(" ");
sql.append(" (SELECT TO_CHAR(MAX(c.numfoliopreimpreso)) "); sql.append(" (SELECT TO_CHAR(MAX(c.numfoliopreimpreso)+1) ");
sql.append(" FROM caja c "); sql.append(" FROM caja c ");
sql.append(" WHERE (c.numseriepreimpresa = dab.numseriepreimpresa "); sql.append(" WHERE (c.numseriepreimpresa = dab.numseriepreimpresa ");
sql.append(" OR (c.numseriepreimpresa IS NULL "); sql.append(" OR (c.numseriepreimpresa IS NULL ");
@ -123,9 +123,9 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" AND (c.indreimpresion = 0 "); sql.append(" AND (c.indreimpresion = 0 ");
sql.append(" OR (c.indreimpresion = 1 "); sql.append(" OR (c.indreimpresion = 1 ");
sql.append(" AND c.indstatusboleto = 'E')) "); sql.append(" AND c.indstatusboleto = 'E')) ");
sql.append(" AND c.marca_id = m.marca_id), (SELECT to_char(MAX(cd.numfoliopreimpreso)) "); sql.append(" AND c.marca_id = m.marca_id), (SELECT to_char(MAX(cd.numfoliopreimpreso)+1) ");
sql.append(" FROM caja_diversos cd "); sql.append(" FROM caja_diversos cd ");
sql.append(" WHERE cd.numseriepreimpresa = dab.numseriepreimpresa), dab.NUMFOLIOINICIAL) "); sql.append(" WHERE cd.numseriepreimpresa = dab.numseriepreimpresa AND to_number(cd.numfoliopreimpreso) BETWEEN dab.numfolioinicial AND dab.numfoliofinal ) , dab.NUMFOLIOINICIAL) ");
sql.append(" END AS ultimoFolioCaja, "); 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, ");
@ -144,7 +144,7 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" LEFT JOIN MARCA m ON m.EMPRESA_ID = em.EMPRESA_ID AND m.ACTIVO = 1 "); 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 and ai.activo = 1 ");
if (parametros.get("EMPRESA_ID") != null) { if (parametros.get("EMPRESA_ID") != null) {
sql.append(" AND e.empresa_id = ").append(parametros.get("EMPRESA_ID")); sql.append(" AND e.empresa_id = ").append(parametros.get("EMPRESA_ID"));
} }