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

bug #6669 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48916 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-10-13 12:35:45 +00:00
parent b8a3e563eb
commit 185c010a05
6 changed files with 90 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

6
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<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="RelatorioAcompanhamentoEquivalentes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="486"/>
<property name="ireport.y" value="161"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table">
<box>

22
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java
View File

@ -18,7 +18,6 @@ import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.service.CalculoComissaoService;
import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.service.PuntoVentaService;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@ -35,19 +34,12 @@ public class BusquedaCalculoComissaoController extends MyGenericForwardComposer
@Autowired
private EmpresaService empresaService;
@Autowired
private PuntoVentaService puntoVentaService;
private Combobox cmbEmpresa;
private List<Empresa> lsEmpresas;
private List<PuntoVenta> lsPuntoVenta;
private MyComboboxPuntoVenta cmbPuntoVenta;
private Datebox datMes;
// private Datebox datFinal;
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
@ -56,14 +48,22 @@ public class BusquedaCalculoComissaoController extends MyGenericForwardComposer
lsPuntoVenta = new ArrayList<PuntoVenta>();
}
public void onClick$btnPesquisa(Event ev) {
public void onClick$btnRelatorio(Event ev) {
PuntoVenta puntoVenta = (PuntoVenta) (cmbPuntoVenta.getSelectedItem() != null ? cmbPuntoVenta.getSelectedItem().getValue() : null);
Empresa empresa = (Empresa) (cmbEmpresa.getSelectedItem() != null ? cmbEmpresa.getSelectedItem().getValue() : null);
Date periodo = datMes.getValue();
// Date fim = datFinal.getValue();
calculoComissaoService.buscaParametrosComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodo);
calculoComissaoService.relatorioCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodo);
}
public void onClick$btnRegistrar(Event ev) {
PuntoVenta puntoVenta = (PuntoVenta) (cmbPuntoVenta.getSelectedItem() != null ? cmbPuntoVenta.getSelectedItem().getValue() : null);
Empresa empresa = (Empresa) (cmbEmpresa.getSelectedItem() != null ? cmbEmpresa.getSelectedItem().getValue() : null);
Date periodo = datMes.getValue();
calculoComissaoService.registrarCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodo);
}
public Combobox getCmbEmpresa() {

BIN
web/gui/comissao/RelatorioCalculoComissao.jasper 100644
View File

Binary file not shown.

67
web/gui/comissao/RelatorioCalculoComissao.jrxml 100644
View File

@ -0,0 +1,67 @@
<?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="RelatorioCalculoComissao" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a0e4c57b-f708-4388-8e29-56a2a758254d">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<subDataset name="dsDescontos" uuid="b7826494-a692-464e-8409-8b27d51e65f7">
<field name="nomeDesconto" class="java.lang.String"/>
<field name="valorDesconto" class="java.math.BigDecimal"/>
<field name="tipoDesconto" class="java.lang.String"/>
</subDataset>
<subDataset name="dsReceitas" uuid="8c2ed585-40f3-494c-9a1a-919a1a19ad7b">
<field name="data" class="java.util.Date"/>
<field name="receitaComissao" class="java.math.BigDecimal"/>
<field name="receitaBPR" class="java.math.BigDecimal"/>
<field name="receitaGAP" class="java.math.BigDecimal"/>
<field name="gapImpressa" class="java.math.BigDecimal"/>
<field name="internet" class="java.math.BigDecimal"/>
<field name="cancelados" class="java.math.BigDecimal"/>
<field name="canceladosGAP" class="java.math.BigDecimal"/>
<field name="devolvidos" class="java.math.BigDecimal"/>
<field name="devolvidosGAP" class="java.math.BigDecimal"/>
<field name="devolucoesOrigem" class="java.math.BigDecimal"/>
<field name="devolucoesOrigemGAP" class="java.math.BigDecimal"/>
<field name="receitaExcessoBagagem" class="java.math.BigDecimal"/>
<field name="receitaSeguroOpcional" class="java.math.BigDecimal"/>
<field name="contImpressa" class="java.lang.Integer"/>
<field name="comissaoBPRDiaria" class="java.math.BigDecimal"/>
<field name="comissaoExcessoBagagemDiaria" class="java.math.BigDecimal"/>
<field name="comissaoSegOpcionalDiaria" class="java.math.BigDecimal"/>
<field name="comissaoEntregaPassagemDiaria" class="java.math.BigDecimal"/>
</subDataset>
<field name="comissaoPagar" class="java.math.BigDecimal"/>
<field name="comissaoBPR" class="java.math.BigDecimal"/>
<field name="comissaoSegOpcional" class="java.math.BigDecimal"/>
<field name="comissaoExcessoBagagem" class="java.math.BigDecimal"/>
<field name="comissaoEntregaPassagem" class="java.math.BigDecimal"/>
<field name="comissaoBonificaoMetas" class="java.math.BigDecimal"/>
<field name="royaties" class="java.math.BigDecimal"/>
<field name="retidoISS" class="java.math.BigDecimal"/>
<field name="descontos" class="java.math.BigDecimal"/>
<field name="lsDescontos" class="java.util.List"/>
<field name="lsReceitas" class="java.util.List"/>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="79" splitType="Stretch"/>
</title>
<pageHeader>
<band height="35" splitType="Stretch"/>
</pageHeader>
<columnHeader>
<band height="61" splitType="Stretch"/>
</columnHeader>
<detail>
<band height="125" splitType="Stretch"/>
</detail>
<columnFooter>
<band height="45" splitType="Stretch"/>
</columnFooter>
<pageFooter>
<band height="54" splitType="Stretch"/>
</pageFooter>
<summary>
<band height="42" splitType="Stretch"/>
</summary>
</jasperReport>

12
web/gui/comissao/busquedaCalculoComissao.zul
View File

@ -25,7 +25,8 @@
<rows>
<row>
<label value="Período" />
<datebox id="datMes" format="MM/yyyy" lenient="false" constraint="no empty" maxlength="7" />
<datebox id="datMes" format="MM/yyyy"
lenient="false" constraint="no empty" maxlength="7" />
</row>
<row>
@ -50,8 +51,13 @@
</grid>
<toolbar>
<button id="btnPesquisa" image="/gui/img/find.png"
label="${c:l('busquedaItemDescontoController.btnPesquisa.label')}" />
<button id="btnRelatorio" image="/gui/img/find.png"
label="Emitir Relatório de Cálculo" />
<separator />
<button id="btnRegistrar" image="/gui/img/find.png"
label="Registrar Cálculo" />
</toolbar>