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

Merge pull request 'Erro na transferencia de estoque fixes bug#Al-3998' (!442) from AL-3998 into master 

Reviewed-on: adm/VentaBoletosAdm#442
master 1.57.3
gleimar 2024-03-15 08:18:10 +00:00
parent 773ce81704 7fdb7a1c62
commit 583e238cef
8 changed files with 119 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.57.2</version>
<version>1.57.3</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.41.2</modelWeb.version>
<modelWeb.version>1.41.3</modelWeb.version>
<flyway.version>1.31.0</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

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

@ -168,6 +168,7 @@ public class RelatorioEstoque extends Relatorio {
@Override
protected void processaParametros() throws Exception {
}
public void setLsDadosRelatorio(List<ItemReporteControleEstoqueBoletos> lsDadosRelatorio) {
this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio));
this.lsDadosRelatorio = lsDadosRelatorio;
@ -175,10 +176,7 @@ public class RelatorioEstoque extends Relatorio {
public List<ItemReporteControleEstoqueBoletos> getLsDadosRelatorio() {
return lsDadosRelatorio;
}
}
private String retornarItensConsultaPorPuloFolio(String puntoVentaId, Integer empresaId, Date dataInicio, Date dataFim, Integer aidfTipo, Integer aidfId) {

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

Binary file not shown.

124
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
View File

@ -1,8 +1,8 @@
<?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="RelatorioEstoque" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="/ventaboletosadm/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
<property name="ireport.zoom" value="2.593742460100018"/>
<property name="ireport.x" value="183"/>
<property name="ireport.y" value="208"/>
<property name="ireport.zoom" value="1.3310000000000086"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
<parameter name="NOME_RELATORIO" class="java.lang.String"/>
@ -31,7 +31,7 @@
<pageHeader>
<band height="82" splitType="Stretch">
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="0" y="0" width="457" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="136a5066-d141-4362-af36-0780f0d16542"/>
<reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="555" height="57" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -39,25 +39,25 @@
<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="513" y="0" width="185" height="25" uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192"/>
<reportElement uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192" x="555" y="0" width="163" height="25"/>
<textElement textAlignment="Right">
<font size="9" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
<reportElement mode="Transparent" x="698" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="718" y="0" width="84" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="57" width="802" height="1" uuid="bbf33a72-515f-42fc-8c79-e859aebca31d"/>
<reportElement uuid="bbf33a72-515f-42fc-8c79-e859aebca31d" x="0" y="57" width="802" height="1"/>
</line>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="513" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4"/>
<reportElement uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4" mode="Transparent" x="555" y="25" width="225" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -65,7 +65,7 @@
<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
</textField>
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="781" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="314e312c-8f24-42de-8354-3c1f7241a985"/>
<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="781" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -73,7 +73,7 @@
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="698" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4e030613-9cee-443e-9eaa-b19fa3090976"/>
<reportElement uuid="4e030613-9cee-443e-9eaa-b19fa3090976" mode="Transparent" x="555" y="42" width="247" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -81,10 +81,10 @@
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="77" width="802" height="1" uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf"/>
<reportElement uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf" x="0" y="77" width="802" height="1"/>
</line>
<textField>
<reportElement x="0" y="58" width="803" height="15" uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda"/>
<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="58" width="803" height="15"/>
<textElement verticalAlignment="Middle">
<font size="10"/>
</textElement>
@ -93,89 +93,122 @@
</band>
</pageHeader>
<columnHeader>
<band height="35" splitType="Stretch">
<line>
<reportElement x="1" y="34" width="801" height="1" uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb"/>
</line>
<band height="15" splitType="Stretch">
<staticText>
<reportElement x="63" y="16" width="85" height="18" uuid="d60cb698-201c-4315-bec2-498effeea474"/>
<reportElement uuid="d60cb698-201c-4315-bec2-498effeea474" x="63" y="0" width="107" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Agência]]></text>
</staticText>
<staticText>
<reportElement x="246" y="16" width="49" height="19" uuid="a26b9060-8bd5-4586-af31-e01b0ccf88f9"/>
<reportElement uuid="a26b9060-8bd5-4586-af31-e01b0ccf88f9" x="268" y="0" width="49" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[De]]></text>
</staticText>
<staticText>
<reportElement x="394" y="16" width="86" height="18" uuid="fcf366c0-0f13-44f7-84de-38ae1122b647"/>
<reportElement uuid="fcf366c0-0f13-44f7-84de-38ae1122b647" x="416" y="0" width="86" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Tipo]]></text>
</staticText>
<staticText>
<reportElement x="1" y="16" width="62" height="18" uuid="6db7e341-bc01-4843-8be5-fe74d78b7529"/>
<reportElement uuid="6db7e341-bc01-4843-8be5-fe74d78b7529" x="1" y="0" width="62" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Empresa]]></text>
</staticText>
<staticText>
<reportElement x="148" y="16" width="55" height="18" uuid="ed0c0a45-151a-400e-a30c-fd8afa88438b"/>
<reportElement uuid="ed0c0a45-151a-400e-a30c-fd8afa88438b" x="170" y="0" width="55" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[AIDF]]></text>
</staticText>
<staticText>
<reportElement x="203" y="16" width="43" height="18" uuid="0bc3df3b-544b-4e68-ace9-f725d4541781"/>
<reportElement uuid="0bc3df3b-544b-4e68-ace9-f725d4541781" x="225" y="0" width="43" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Série]]></text>
</staticText>
<staticText>
<reportElement x="295" y="16" width="55" height="18" uuid="dbf9b898-7cb2-4271-84f3-32aa65056b5d"/>
<reportElement uuid="dbf9b898-7cb2-4271-84f3-32aa65056b5d" x="317" y="0" width="55" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Até]]></text>
</staticText>
<staticText>
<reportElement x="480" y="16" width="55" height="18" uuid="ea11f3f2-8b0d-4fc9-a87b-c190b8dab51f"/>
<reportElement uuid="ea11f3f2-8b0d-4fc9-a87b-c190b8dab51f" x="502" y="0" width="55" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Estação]]></text>
</staticText>
<staticText>
<reportElement x="535" y="16" width="68" height="18" uuid="e8f84740-2a73-4631-a584-349b7c263496"/>
<reportElement uuid="e8f84740-2a73-4631-a584-349b7c263496" x="557" y="0" width="68" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Estado]]></text>
</staticText>
<staticText>
<reportElement x="603" y="16" width="104" height="18" uuid="05254957-d41e-4996-8c5d-ccf9786f1f8a"/>
<reportElement uuid="05254957-d41e-4996-8c5d-ccf9786f1f8a" x="625" y="0" width="93" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Data Aquisição]]></text>
</staticText>
<staticText>
<reportElement x="707" y="16" width="95" height="18" uuid="8ad497bf-a305-41d2-a412-40dd3a7d6b88"/>
<reportElement uuid="8ad497bf-a305-41d2-a412-40dd3a7d6b88" x="718" y="0" width="84" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
<text><![CDATA[Data Vencimento ]]></text>
</staticText>
<staticText>
<reportElement x="350" y="16" width="44" height="18" uuid="0df8c358-831f-4013-9b52-5e082ff250a5"/>
<reportElement uuid="0df8c358-831f-4013-9b52-5e082ff250a5" x="372" y="0" width="44" height="15"/>
<box>
<bottomPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/>
</textElement>
@ -184,16 +217,16 @@
</band>
</columnHeader>
<detail>
<band height="22" splitType="Stretch">
<band height="14" splitType="Stretch">
<textField>
<reportElement x="63" y="2" width="85" height="18" uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0"/>
<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" stretchType="RelativeToBandHeight" x="63" y="0" width="107" height="14"/>
<textElement textAlignment="Center">
<font size="8" isBold="false" isItalic="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{descPuntoVenta}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement mode="Transparent" x="246" y="2" width="49" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="3dbaaef7-dae9-402d-89d4-a8055462f563"/>
<reportElement uuid="3dbaaef7-dae9-402d-89d4-a8055462f563" stretchType="RelativeToBandHeight" mode="Transparent" x="268" y="0" width="49" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -201,28 +234,28 @@
<textFieldExpression><![CDATA[$F{folioInicial}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="394" y="2" width="86" height="18" uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc"/>
<reportElement uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc" stretchType="RelativeToBandHeight" x="416" y="0" width="86" height="14"/>
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="1" y="2" width="62" height="18" uuid="73582b2a-b21b-4637-990c-aff7423a8e27"/>
<reportElement uuid="73582b2a-b21b-4637-990c-aff7423a8e27" stretchType="RelativeToBandHeight" x="1" y="0" width="62" height="14"/>
<textElement textAlignment="Center">
<font size="8" isBold="false" isItalic="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{nombEmpresa}]]></textFieldExpression>
</textField>
<textField pattern="">
<reportElement x="148" y="2" width="55" height="18" uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa"/>
<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" stretchType="RelativeToBandHeight" x="170" y="0" width="55" height="14"/>
<textElement textAlignment="Center">
<font size="8" isBold="false" isItalic="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{aidfId}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement mode="Transparent" x="203" y="2" width="43" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3"/>
<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" stretchType="RelativeToBandHeight" mode="Transparent" x="225" y="0" width="43" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -230,7 +263,7 @@
<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement mode="Transparent" x="295" y="2" width="55" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="117054b3-9ee6-488b-ae15-0de5362e939e"/>
<reportElement uuid="117054b3-9ee6-488b-ae15-0de5362e939e" stretchType="RelativeToBandHeight" mode="Transparent" x="317" y="0" width="55" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -238,35 +271,35 @@
<textFieldExpression><![CDATA[$F{folioFinal}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="480" y="2" width="55" height="18" uuid="a0ee8a4d-39ef-458a-895d-b12b794876d9"/>
<reportElement uuid="a0ee8a4d-39ef-458a-895d-b12b794876d9" stretchType="RelativeToBandHeight" x="502" y="0" width="55" height="14"/>
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{descEstacion}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="535" y="2" width="68" height="18" uuid="ecc06a2b-2970-4bd0-abf0-e4f4ad0063fd"/>
<reportElement uuid="ecc06a2b-2970-4bd0-abf0-e4f4ad0063fd" stretchType="RelativeToBandHeight" x="557" y="0" width="68" height="14"/>
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{nomeEstado}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement x="603" y="2" width="104" height="18" uuid="3cebea71-ec6a-4b99-a775-ed36a59d94ea"/>
<reportElement uuid="3cebea71-ec6a-4b99-a775-ed36a59d94ea" stretchType="RelativeToBandHeight" x="625" y="0" width="93" height="14"/>
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{fechorAquisicion}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement x="707" y="2" width="95" height="18" uuid="efb76809-2760-4e07-abd7-182d252318a0"/>
<reportElement uuid="efb76809-2760-4e07-abd7-182d252318a0" stretchType="RelativeToBandHeight" x="718" y="0" width="84" height="14"/>
<textElement textAlignment="Center">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{fecVencimento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="350" y="2" width="44" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="5dbce9fd-364b-4f4c-a95f-dd7d474e4243"/>
<reportElement uuid="5dbce9fd-364b-4f4c-a95f-dd7d474e4243" stretchType="RelativeToBandHeight" mode="Transparent" x="372" y="0" width="44" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -275,14 +308,11 @@
</textField>
</band>
</detail>
<summary>
<band height="77" splitType="Stretch"/>
</summary>
<noData>
<band height="50">
<textField>
<reportElement x="1" y="24" width="575" height="26" uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83"/>
<textElement markup="none">
<reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="1" y="0" width="801" height="50"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="11" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>

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

@ -131,19 +131,32 @@ public class MovimentacionBilhetesController extends MyGenericForwardComposer {
Long cantidad = txtCantidad.getValue();
String usado = validarEstoqueUtilizado(aidf, folioInicial, folioFinal);
if( !usado.equals("0") ) {
Messagebox.show(
Labels.getLabel("movimentacionBilhetesController.MSG.usado")+usado,
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
return ;
}
if(isEstoqueSimplificado && tipoMovimentacion.getTipomovimentacionId().equals(TipoMovimentacion.TIPO_TRANSFERENCIA)) {
DetAbastoBoleto detAbasto = detAbastoService.buscarPorAidf(aidf.getAidfId(), folioInicial, folioFinal);
DetAbastoBoleto detAbasto = detAbastoService.buscarPorAidf(aidf.getAidfId(), origem.getPuntoventaId(), folioInicial, folioFinal);
if(detAbasto == null) {
throw new BusinessException("movimentacionBilhetesController.MSG.origemNaoEncontrada");
}
AbastoBoleto abastoNovo = abastoBoletoService.movimentaAbasto(detAbasto.getAbastoBoleto(), destino );
abastoNovo = abastoBoletoService.suscribir(abastoNovo);
DetAbastoBoleto detAbastoNovo = detAbastoService.movimentaDetAbasto(aidf, abastoNovo, folioInicial, folioFinal );
DetAbastoBoleto detAbastoNovo = detAbastoService.movimentaDetAbasto(detAbasto, abastoNovo, folioInicial, folioFinal );
detAbastoService.suscribir(detAbastoNovo);
if( detAbastoNovo.getFolioFinal() < detAbasto.getFolioFinal() ) {
DetAbastoBoleto detAbastoQuebra = detAbastoService.movimentaDetAbasto(
aidf,
detAbasto,
detAbasto.getAbastoBoleto(),
getInicioFolioNovo(),
detAbasto.getNumfoliofinal() );
@ -197,9 +210,9 @@ public class MovimentacionBilhetesController extends MyGenericForwardComposer {
}
}
} catch (BusinessException be) {
} catch (BusinessException be) {
Messagebox.show(
Labels.getLabel(be.getMessage()),
be.getMessage(),
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
} catch (Exception ex) {
@ -210,16 +223,6 @@ public class MovimentacionBilhetesController extends MyGenericForwardComposer {
}
}
private String getFimFolioAntigo() {
String folioInicial = txtForminicial.getValue();
return String.valueOf( Long.valueOf(folioInicial)-1 );
}
private String getInicioFolioNovo() {
String folio = txtFormfinal.getValue();
return String.valueOf( Long.valueOf(folio)+1 );
}
public void onChange$cmbAidf(Event evt) throws InterruptedException {
@ -243,7 +246,21 @@ public class MovimentacionBilhetesController extends MyGenericForwardComposer {
lsAidf = aidfService.buscaAidfsPorEmpresas(empresa.getEmpresaId().equals(-1) ? UsuarioLogado.getUsuarioLogado().getEmpresa() : Arrays.asList(empresa));
}
cmbAidf.setModel(new ListModelArray(lsAidf));
}
private String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal) {
return movimentacionBilhetesService.validarEstoqueUtilizado(aidf, folioInicial, folioFinal);
}
private String getFimFolioAntigo() {
String folioInicial = txtForminicial.getValue();
return String.valueOf( Long.valueOf(folioInicial)-1 );
}
private String getInicioFolioNovo() {
String folio = txtFormfinal.getValue();
return String.valueOf( Long.valueOf(folio)+1 );
}
public List<TipoMovimentacion> getLsTipoMovimentacion() {

2
web/WEB-INF/i3-label_en.label
View File

@ -8098,6 +8098,8 @@ 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?
movimentacionBilhetesController.MSG.usado=Movimentação não permitida por utilização de Estoque, Folio:
movimentacionBilhetesController.MSG.origemNaoEncontrada=Estoque Origem não encontrado
winMovimentacionBilhetes.fecmovimentacion.label=Data Mov.
winMovimentacionBilhetes.origem.label=Agência Origem

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

@ -7690,6 +7690,8 @@ 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?
movimentacionBilhetesController.MSG.usado=Movimentação não permitida por utilização de Estoque, Folio:
movimentacionBilhetesController.MSG.origemNaoEncontrada=Estoque Origem não encontrado
winMovimentacionBilhetes.fecmovimentacion.label=Fecha mov.
winMovimentacionBilhetes.origem.label=Agencia Origen

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

@ -8163,6 +8163,8 @@ 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?
movimentacionBilhetesController.MSG.usado=Movimentação não permitida por utilização de Estoque, Folio:
movimentacionBilhetesController.MSG.origemNaoEncontrada=Estoque Origem não encontrado
winMovimentacionBilhetes.fecmovimentacion.label=Data Mov.
winMovimentacionBilhetes.origem.label=Agência Origem