diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java index 59834036c..9f378fed1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java @@ -30,6 +30,7 @@ public class RelatorioVendasComissao extends Relatorio { private Date fecInicio; private Date fecFinal; + private Integer marcaId; public RelatorioVendasComissao(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); @@ -41,6 +42,9 @@ public class RelatorioVendasComissao extends Relatorio { Map parametros = this.relatorio.getParametros(); fecInicio = new java.sql.Date(sdf.parse(parametros.get("fecInicio").toString()).getTime()); fecFinal = new java.sql.Date(sdf.parse(parametros.get("fecFinal").toString()).getTime()); + if(parametros.get("MARCA_ID")!=null){ + marcaId = Integer.valueOf(parametros.get("MARCA_ID").toString()); + } Connection conexao = this.relatorio.getConexao(); processarVendasComissao(conexao); @@ -151,6 +155,9 @@ public class RelatorioVendasComissao extends Relatorio { if(fecFinal != null) { stmt.setDate("fecFinal", fecFinal); } + if(marcaId != null){ + stmt.setInt("MARCA_ID", marcaId); + } return stmt; } @@ -165,8 +172,11 @@ public class RelatorioVendasComissao extends Relatorio { .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") .append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID ") .append("WHERE (C.INDSTATUSBOLETO = 'V' OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) ") - .append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal ") - .append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID ") + .append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal "); + if(parametros.get("MARCA_ID")!= null){ + sQuery.append("AND C.MARCA_ID =:MARCA_ID "); + } + sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID ") .append("ORDER BY PV.NUMPUNTOVENTA, PV1.NUMPUNTOVENTA, C.INDSTATUSBOLETO"); return sQuery.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper index 9ee107a0a..4d8c3cfdb 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml index d3ee0334f..829616695 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml @@ -6,6 +6,7 @@ + @@ -39,34 +40,44 @@ - <band height="41" splitType="Stretch"> + <band height="61" splitType="Stretch"> <textField> - <reportElement x="0" y="0" width="620" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> + <reportElement uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="620" height="20"/> <textElement markup="none"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement x="638" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> + <reportElement uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="638" y="0" width="164" height="20"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="20" width="620" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/> + <reportElement uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b" x="0" y="20" width="620" height="20"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a" x="53" y="41" width="139" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression> + </textField> + <staticText> + <reportElement uuid="a91f6081-4740-4e36-8965-41b6cde4cc20" x="0" y="41" width="53" height="20"/> + <textElement/> + <text><![CDATA[Empresa:]]></text> + </staticText> </band> - + @@ -77,44 +88,46 @@ - + + - + - + - + - + - + - + - + - + + @@ -122,41 +135,43 @@ - + - + - + + - + - + - + - + - + + @@ -170,52 +185,52 @@ - + - + - + - + - + - + - + - + @@ -224,7 +239,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java index 4521a97cc..d061967a0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java @@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.sql.DataSource; @@ -13,10 +14,14 @@ import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; +import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasComissao; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Controller("relatorioVendasComissaoController") @@ -28,11 +33,18 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer @Autowired private DataSource dataSourceRead; + @Autowired + private EmpresaService empresaService; + + private MyComboboxEstandar cmbEmpresa; + private List lsEmpresa; + private Datebox dataInicial; private Datebox dataFinal; @Override public void doAfterCompose(Component comp) throws Exception { + setLsEmpresa(empresaService.obtenerTodos()); super.doAfterCompose(comp); } @@ -45,6 +57,16 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer parametros.put("fecInicio", sdf.format(dataDe)); parametros.put("fecFinal", sdf.format(dataAte)); + + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + parametros.put("MARCA_ID", empresa.getEmpresaId()); + parametros.put("empresa", empresa.getNombempresa()); + } else{ + parametros.put("empresa", "Todas;"); + } + Relatorio relatorio = new RelatorioVendasComissao(parametros, dataSourceRead.getConnection()); Map args = new HashMap(); @@ -53,5 +75,19 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer openWindow("/component/reportView.zul", Labels.getLabel("indexController.mniRelatorioVendasComissao.label"), args, MODAL); } + + /** + * @return the lsEmpresa + */ + public List getLsEmpresa() { + return lsEmpresa; + } + + /** + * @param lsEmpresa the lsEmpresa to set + */ + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 1dbaddba1..3fbff93b4 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5692,6 +5692,7 @@ editarPracaPedagioController.btnFechar.MSG.borrarOK = Praça de Pedágio Excluid # Relatorio de Vendas para Comissao relatorioVendasComissaoController.lbDataIni.value = Fecha Inicio relatorioVendasComissaoController.lbDataFin.value = Fecha Final +relatorioVendasComissaoController.lbEmpresa.value = Empresa # Calculo Comissao busquedaCalculoComissaoController.window.title = Cálculo de Comissão diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 22bb08f4e..b1bd1410d 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5833,6 +5833,7 @@ editarPracaPedagioController.btnFechar.MSG.borrarOK = Praça de Pedágio Excluid # Relatorio de Vendas para Comissao relatorioVendasComissaoController.lbDataIni.value = Data Início relatorioVendasComissaoController.lbDataFin.value = Data Final +relatorioVendasComissaoController.lbEmpresa.value = Empresa # Calculo Comissao busquedaCalculoComissaoController.window.title = Cálculo de Comisión diff --git a/web/gui/relatorios/filtroRelatorioVendasComissao.zul b/web/gui/relatorios/filtroRelatorioVendasComissao.zul index 0afb480d8..d5e7aa37d 100644 --- a/web/gui/relatorios/filtroRelatorioVendasComissao.zul +++ b/web/gui/relatorios/filtroRelatorioVendasComissao.zul @@ -28,6 +28,15 @@ format="dd/MM/yyyy" lenient="false" constraint="no empty" maxlength="10" /> + +