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

'Padronizacao do campo de KM fix bug#AL-3256' (!299) from AL-3256 into master 

Reviewed-on: adm/VentaBoletosAdm#299
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
fabio 2023-11-01 14:28:14 +00:00
parent 5ff2f812e8 abb6e0d6e2
commit ba57d2a29d
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java
View File

@ -291,7 +291,7 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato
sql.append(" nvl(gr.descgrupo, 'Não Definido') grupo_linha, ");
sql.append(" ( ");
sql.append(" SELECT ");
sql.append(" SUM(nvl(rs.kmoriginal, 0)) ");
sql.append(" SUM(nvl(TR.CANTKMREAL, 0)) ");
sql.append(" FROM ");
sql.append(" ruta_secuencia rs, ");
sql.append(" tramo tr ");

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java
View File

@ -211,7 +211,7 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
sqlSb.append(" ELSE 'N' ");
sqlSb.append(" END INTERESTADUAL, ");
sqlSb.append(" NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA, ");
sqlSb.append(" (SELECT SUM(NVL(RS.KMORIGINAL,0)) ");
sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL, 0)) ");
sqlSb.append(" FROM RUTA_SECUENCIA RS, ");
sqlSb.append(" TRAMO TR ");
sqlSb.append(" WHERE RS.RUTA_ID = RT.RUTA_ID ");

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper
View File

Binary file not shown.

2
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioResumoLinhasAnalitico" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="2.000000000000002"/>
<property name="ireport.x" value="452"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="57"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table">

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper
View File

Binary file not shown.

6
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
View File

@ -86,10 +86,10 @@ FROM (SELECT TAB1.*,
DA.CANTASIENTOS ASSENTOS,
RO.ROLOPERATIVO_ID,
CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 'S' ELSE 'N' END INTERESTADUAL,
NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA,
NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA,
(SELECT SUM(NVL(TR.CANTKMREAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = RT.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1) EXTENSAO_KM,
--(SELECT SUM(NVL(RS.KMORIGINAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = RT.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1) EXTENSAO_KM,
TR.CANTKMREAL AS EXTENSAO_KM,
SUM(NVL(BL.NUMKMVIAJE,0)) KM_REAL,

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java
View File

@ -88,11 +88,11 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
Map<String, Object> parametros = new HashMap<String, Object>();
StringBuilder filtro = new StringBuilder();
parametros.put("DATA_INICIAL", (java.util.Date) this.fecCorridaIni.getValue());
parametros.put("DATA_FINAL", DateUtil.fimFecha((java.util.Date) this.fecCorridaFin.getValue()));
parametros.put("DATA_INICIAL", this.fecCorridaIni.getValue());
parametros.put("DATA_FINAL", DateUtil.fimFecha(this.fecCorridaFin.getValue()));
parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioResumoLinhasController.window.title"));
parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
parametros.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario().toString());
parametros.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario());
Comboitem itemRuta = cmbRuta.getSelectedItem();