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

fixes bug#11348 

dev: Valdevir
qua: Fabim


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@83345 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2018-07-12 20:31:41 +00:00
parent 0867a7ce10
commit 425a958acd
8 changed files with 338 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java 100644
View File

@ -0,0 +1,48 @@
package com.rjconsultores.ventaboletos.relatorios.impl;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
public class ReciboEntregaMovimentacao extends Relatorio {
private static Logger log = Logger.getLogger(ReciboEntregaMovimentacao.class);
List<Object> listdata = null;
public ReciboEntregaMovimentacao(final Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);
this.setCustomDataSource(new DataSource(this) {
@Override
public void initDados() throws Exception {
try {
listdata = new ArrayList<Object>();
//só para o relatório não ir vazio
listdata.add("");
} catch (Exception e) {
log.error("", e);
}
}
});
this.setCollectionDataSource(new JRBeanCollectionDataSource(listdata));
}
@Override
protected void processaParametros() throws Exception {
}
}

18
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/ReciboEntregaMovimentacao.properties 100644
View File

@ -0,0 +1,18 @@
# Resource Bundle file.
#
relatorio.titulo=RECIBO DE TRANSFERÊNCIA
relatorio.operador=Operador:
relatorio.pagina=Página
relatorio.datahora=Data/Hora
relatorio.empresa=Empresa:
relatorio.agenciade=De Agência:
relatorio.agenciapara=Para Agência:
relatorio.serie=Série
relatorio.subserie=Sub Série
relatorio.bilheteinicial=Bilhete Inicial
relatorio.bilhetefinal=Bilhete Final
relatorio.declaracao=Declaração
relatorio.texto=Declaro para os devidos fins que eu Agência recebi os materiais para trabalho acima relacionados. Autorizo a empresa debitar/creditar em minha conta corrente as faltas ou sobras apuradas neste acerto podendo as mesmas serem descontadas ou somadas por ocasiao do pagamento dos meus vencimentos.
relatorio.acerto=Acerto
relatorio.trocado=Trocado/agente
relatorio.aidf=Aidf

16
src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java
View File

@ -5,6 +5,13 @@ import java.io.InputStream;
import java.util.Locale;
import java.util.ResourceBundle;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio;
import com.rjconsultores.ventaboletos.utilerias.LocaleUtil;
import net.sf.jasperreports.engine.JRDataSource;
import net.sf.jasperreports.engine.JRParagraph;
import net.sf.jasperreports.engine.JRParameter;
@ -15,19 +22,13 @@ import net.sf.jasperreports.engine.export.JExcelApiExporter;
import net.sf.jasperreports.engine.export.JExcelApiExporterParameter;
import net.sf.jasperreports.engine.util.JRProperties;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio;
import com.rjconsultores.ventaboletos.utilerias.LocaleUtil;
/**
* Implementação da classe abstrata de renderização acoplada a uma tecnologia de renderização especifica
*
* @author Bruno H. G. Gouvêa <bruno@rjconsultores.com.br>
*
*/
@SuppressWarnings("deprecation")
public class RenderRelatorioJasper {
private static Logger log = Logger.getLogger(Relatorio.class);
@ -140,7 +141,6 @@ public class RenderRelatorioJasper {
}
} catch (Exception e) {
// TODO: handle exception
throw new Exception();
} finally {
if (!StringUtils.isBlank(this.relatorio.getNome()) && this.relatorio.getNome().equalsIgnoreCase("RelatorioGratuidade")) {

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

Binary file not shown.

220
src/java/com/rjconsultores/ventaboletos/relatorios/templates/ReciboEntregaMovimentacao.jrxml 100644
View File

@ -0,0 +1,220 @@
<?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="ReciboEntregaMovimentacao" pageWidth="595" pageHeight="595" orientation="Landscape" columnWidth="595" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" isFloatColumnFooter="true">
<property name="ireport.zoom" value="1.2100000000000126"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<parameter name="nombempresa" class="java.lang.String"/>
<parameter name="agenciaDe" class="java.lang.String"/>
<parameter name="agenciaPara" class="java.lang.String"/>
<parameter name="usuario" class="java.lang.String"/>
<parameter name="FILTROS" class="java.lang.String"/>
<parameter name="serie" class="java.lang.String"/>
<parameter name="subserie" class="java.lang.String"/>
<parameter name="bilheteinicial" class="java.lang.String"/>
<parameter name="bilhetefinal" class="java.lang.String"/>
<parameter name="aidfCode" class="java.lang.String"/>
<parameter name="aidf" class="java.lang.String"/>
<detail>
<band height="429" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="2" y="62" width="85" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.operador}]]></textFieldExpression>
</textField>
<textField>
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="595" height="22"/>
<textElement textAlignment="Center" lineSpacing="Single" markup="none">
<font size="14" isBold="true"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.titulo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" evaluationTime="Report" isBlankWhenNull="true">
<reportElement x="570" y="42" width="22" height="20"/>
<textElement textAlignment="Right" lineSpacing="Single"/>
<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="494" y="42" width="42" height="20"/>
<textElement lineSpacing="Single"/>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.pagina}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="538" y="42" width="32" height="20"/>
<textElement textAlignment="Right" lineSpacing="Single"/>
<textFieldExpression class="java.lang.String"><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="348" y="22" width="56" height="20"/>
<textElement lineSpacing="Single"/>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.datahora}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="EEEE, d MMMM yyyy HH:mm" isBlankWhenNull="true">
<reportElement x="404" y="22" width="188" height="20"/>
<textElement textAlignment="Right" lineSpacing="Single"/>
<textFieldExpression class="java.lang.String"><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="2" y="82" width="85" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.empresa}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="2" y="112" width="85" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.agenciade}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="2" y="132" width="85" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.agenciapara}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="87" y="62" width="505" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{usuario}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="87" y="82" width="505" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{nombempresa}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="87" y="112" width="505" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{agenciaDe}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="87" y="132" width="505" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{agenciaPara}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="120" y="172" width="100" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.serie}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="220" y="172" width="100" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.subserie}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="330" y="172" width="111" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.bilheteinicial}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="441" y="172" width="111" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.bilhetefinal}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="441" y="192" width="111" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{bilhetefinal}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="330" y="192" width="111" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{bilheteinicial}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="220" y="192" width="100" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{subserie}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="120" y="192" width="100" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{serie}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="225" width="595" height="22"/>
<box>
<topPen lineWidth="0.75" lineStyle="Dashed"/>
<bottomPen lineWidth="0.75" lineStyle="Dashed"/>
</box>
<textElement textAlignment="Center" lineSpacing="Single">
<font size="14" isBold="true"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.declaracao}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="29" y="248" width="509" height="93"/>
<box>
<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
</box>
<textElement textAlignment="Justified" lineSpacing="Single">
<font size="14" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.texto}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="29" y="379" width="200" height="20"/>
<box>
<topPen lineWidth="0.75"/>
</box>
<textElement textAlignment="Center" lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.acerto}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="336" y="379" width="234" height="20"/>
<box>
<topPen lineWidth="0.75"/>
</box>
<textElement textAlignment="Center" lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.trocado}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="20" y="192" width="100" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{aidf}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="20" y="172" width="100" height="20"/>
<textElement lineSpacing="Single">
<font size="12" isBold="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{relatorio.aidf}]]></textFieldExpression>
</textField>
</band>
</detail>
</jasperReport>

44
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/MovimentacionBilhetesController.java
View File

@ -3,7 +3,11 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gr;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.sql.DataSource;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -25,10 +29,10 @@ import com.rjconsultores.ventaboletos.entidad.Aidf;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion;
import com.rjconsultores.ventaboletos.relatorios.impl.ReciboEntregaMovimentacao;
import com.rjconsultores.ventaboletos.service.AidfService;
import com.rjconsultores.ventaboletos.service.EstadoService;
import com.rjconsultores.ventaboletos.service.MovimentacionBilhetesService;
import com.rjconsultores.ventaboletos.service.PuntoVentaService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@ -36,6 +40,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@Controller("movimentacionBilhetesController")
@Scope("prototype")
public class MovimentacionBilhetesController extends MyGenericForwardComposer {
private static final long serialVersionUID = -5047032264890781980L;
@Autowired
private MovimentacionBilhetesService movimentacionBilhetesService;
@ -44,7 +49,7 @@ public class MovimentacionBilhetesController extends MyGenericForwardComposer {
private AidfService aidfService;
@Autowired
private PuntoVentaService puntoVentaService;
private DataSource dataSourceRead;
@Autowired
private EstadoService estadoService;
@ -183,13 +188,46 @@ public class MovimentacionBilhetesController extends MyGenericForwardComposer {
Labels.getLabel("movimentacionBilhetesController.MSG.suscribirOK"),
Labels.getLabel("movimentacionBilhetesController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
if( tipoMovimentacion.getTipomovimentacionId().equals( TipoMovimentacion.TIPO_TRANSFERENCIA)) {
int retorno = Messagebox.show(
Labels.getLabel("movimentacionBilhetesController.MSG.imprimir"),
Labels.getLabel("movimentacionBilhetesController.window.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if( retorno == Messagebox.YES) {
Map<String, Object> parametros = new HashMap<String, Object>();
Empresa empresa = (Empresa)cmbEmpresa.getSelectedItem().getValue();
parametros.put("nombempresa", empresa.getNombempresa());
parametros.put("usuario", UsuarioLogado.getUsuarioLogado().getClaveUsuario());
parametros.put("agenciaDe", origem.getNombpuntoventa());
parametros.put("agenciaPara", destino.getNombpuntoventa());
parametros.put("serie", aidf.getSerie());
parametros.put("aidf", aidf.toString());
parametros.put("subserie", aidf.getSubserie());
parametros.put("bilheteinicial", formInicial);
parametros.put("bilhetefinal", formFinal);
ReciboEntregaMovimentacao recibo = new ReciboEntregaMovimentacao(parametros , dataSourceRead.getConnection());
Map<String, Object> args = new HashMap<String, Object>();
args.put("relatorio", recibo);
openWindow("/component/reportView.zul",
Labels.getLabel("indexController.mnRelatorioRDI.label"), args, MODAL);
}
}
} catch (Exception ex) {
Messagebox.show(
Labels.getLabel("MSG.Error"),
Labels.getLabel("movimentacionBilhetesController.window.title"),
Messagebox.OK, Messagebox.ERROR);
}
}
}
public void onChange$cmbAidf(Event evt) throws InterruptedException {

4
web/WEB-INF/i3-label_es_MX.label
View File

@ -1312,7 +1312,7 @@ editarEmpresaImpostoController.lblNovembro.value = Noviembre
editarEmpresaImpostoController.lblDezembro.value = Deciembre
editarEmpresaImpostoController.lblOutrosIsento.value = Tratar otros como isento
editarEmpresaImpostoController.lblOutrasUFBloqueadas.value = Bloqueo de demás UF
editarEmpresaImpostoController.bpe.value = Habilitar BPe
editarEmpresaImpostoController.bpe.value = Habilitar BPe
editarEmpresaImpostoController.tributoEmissao.value = Tributa Emissão
editarEmpresaImpostoController.tributoViagem.value = Tributa Viagem
@ -4106,7 +4106,6 @@ editarEstacionController.tooltip.impressorabpe = Nome da impressora configurada
editarEstacionController.tooltip.impressorarelatorio = Nome da impressora configurada na estação para impressão dos Relatórios do Totalbus
editarEstacionController.tooltip.impressoraseguro = Caso seja Impressora Fiscal inserir a porta de impressão (Ex.: COM1), caso seja Impressora Não Fiscal ou BPE o nome da impressora configurada na estação
#Editar Estacion Sitef
editarEstacionController.tab.label.sitef = SiTef
editarEstacionController.MSG.sitef = Todos los campos del SiTef deben de ser llenados
@ -6441,6 +6440,7 @@ editarAidfController.btnSalvar.MSG.apenasValoresNumericosPermitidos = Apenas val
movimentacionBilhetesController.window.title=Movimentación de estoque
movimentacionBilhetesController.MSG.suscribirOK=Movimentación se guardó exitosamente!
movimentacionBilhetesController.MSG.imprimir=Desea imprimir recibo de la Movimentación?
winMovimentacionBilhetes.fecmovimentacion.label=Fecha mov.
winMovimentacionBilhetes.origem.label=Agencia Origen

1
web/WEB-INF/i3-label_pt_BR.label
View File

@ -6709,6 +6709,7 @@ editarAidfController.btnSalvar.MSG.apenasValoresNumericosPermitidos = Apenas val
movimentacionBilhetesController.window.title=Movimentação de Estoque
movimentacionBilhetesController.MSG.suscribirOK=Movimentação gravada com sucesso!
movimentacionBilhetesController.MSG.imprimir=Deseja imprimir recibo da Movimentação?
winMovimentacionBilhetes.fecmovimentacion.label=Data Mov.
winMovimentacionBilhetes.origem.label=Agência Origem