walace 2017-09-08 20:56:07 +00:00
parent f6ce5b1063
commit cc70e02b2a
2 changed files with 173 additions and 174 deletions

View File

@ -357,9 +357,28 @@ public class ConferenciaController extends MyGenericForwardComposer {
carregarDados(); carregarDados();
ecfListBox.setItemRenderer(new RenderEcfPontoVenda()); ecfListBox.setItemRenderer(new RenderEcfPontoVenda());
ecfListBox.addEventListener("onDoubleClick", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
List listNumSerie = ecfListBox.getSelectedModelItems();
if (listNumSerie.isEmpty()) {
Messagebox.show(Labels.getLabel("conferenciaController.MSG.nenhumaNumeroSerieEcfSelecionado"),
Labels.getLabel("conferenciaController.window.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
return;
} }
Map<String, Object> args = new HashMap<String, Object>();
args.put("puntoVentaId", puntoventaId);
args.put("listNumSerie", listNumSerie);
openWindow("/gui/comissao/informeIrregularidadeComissao.zul",
Labels.getLabel("informeIrregularidadeController.window.title"), args);
}
});
}
private void ajustarListsBilhetes() { private void ajustarListsBilhetes() {
bilhetesManualList.setItemRenderer(new RenderBoletoComissao() { bilhetesManualList.setItemRenderer(new RenderBoletoComissao() {
@ -968,8 +987,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
public void onClick$btnEncerrarMovimentoDiario(Event event) throws InterruptedException { public void onClick$btnEncerrarMovimentoDiario(Event event) throws InterruptedException {
try { try {
if (isConferenciaPendente()) { if (isConferenciaPendente()) {
@ -999,24 +1016,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
Messagebox.OK, Messagebox.ERROR); Messagebox.OK, Messagebox.ERROR);
} }
} }
@SuppressWarnings("rawtypes")
public void onClick$btnInformarIrregularidade() throws InterruptedException {
List listNumSerie = ecfListBox.getSelectedModelItems();
if (listNumSerie.isEmpty()) {
Messagebox.show(Labels.getLabel("conferenciaController.MSG.nenhumaNumeroSerieEcfSelecionado"),
Labels.getLabel("conferenciaController.window.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
return;
}
Map<String, Object> args = new HashMap<String, Object>();
args.put("puntoVentaId", puntoventaId);
args.put("listNumSerie", listNumSerie);
openWindow("/gui/comissao/informeIrregularidadeComissao.zul",
Labels.getLabel("informeIrregularidadeController.window.title"), args);
}
private boolean isConferenciaPendente() throws InterruptedException, BusinessException { private boolean isConferenciaPendente() throws InterruptedException, BusinessException {
List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>(); List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>();
@ -1307,7 +1306,8 @@ public class ConferenciaController extends MyGenericForwardComposer {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private boolean isObservacaoLancada(BoletoComissao boletoComissao) { private boolean isObservacaoLancada(BoletoComissao boletoComissao) {
for (LogConferenciaVO logConferencia : (List<LogConferenciaVO>)logsConferenciaList.getListData()) { ; for (LogConferenciaVO logConferencia : (List<LogConferenciaVO>) logsConferenciaList.getListData()) {
;
if (boletoComissao.getCajaId().equals(logConferencia.getCajaId())) { if (boletoComissao.getCajaId().equals(logConferencia.getCajaId())) {
return true; return true;
} }
@ -1443,6 +1443,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
return false; return false;
} }
private Boolean exibirBtnLogPeriodo = true; private Boolean exibirBtnLogPeriodo = true;
public Boolean isExibirBotaoLancamentoObservacao() { public Boolean isExibirBotaoLancamentoObservacao() {

View File

@ -24,8 +24,7 @@
image="/gui/img/confirmar_chegada.png" width="35px" image="/gui/img/confirmar_chegada.png" width="35px"
tooltiptext="${c:l('conferenciaController.btnChegadaMalote.tooltiptext')}" tooltiptext="${c:l('conferenciaController.btnChegadaMalote.tooltiptext')}"
visible="@{winConferencia$composer.exibirBotaoChegadaMalote}" /> visible="@{winConferencia$composer.exibirBotaoChegadaMalote}" />
<button id="btnCancelarChegada" <button id="btnCancelarChegada" width="35px"
width="35px"
image="/gui/img/cancel.png" image="/gui/img/cancel.png"
tooltiptext="${c:l('conferenciaController.btnCancelarChegada.tooltiptext')}" tooltiptext="${c:l('conferenciaController.btnCancelarChegada.tooltiptext')}"
visible="@{winConferencia$composer.exibirBotaoCancelarChegadaMalote}" /> visible="@{winConferencia$composer.exibirBotaoCancelarChegadaMalote}" />
@ -185,7 +184,6 @@
<vbox> <vbox>
<label style="font-weight:bold;" <label style="font-weight:bold;"
value="${c:l('conferenciaController.lhTotalFormapago')}" /> value="${c:l('conferenciaController.lhTotalFormapago')}" />
<listbox id="formapagosList" <listbox id="formapagosList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="290px"> vflex="true" multiple="false" height="290px">
@ -206,19 +204,17 @@
<hbox> <hbox>
<label style="font-weight:bold;" <label style="font-weight:bold;"
value="${c:l('conferenciaController.lbImpressorasFiscais')}" /> value="${c:l('conferenciaController.lbImpressorasFiscais')}" />
<button id="btnInformarIrregularidade"
style="margin-left: 205px;" width="225px" height="25px"
label="${c:l('conferenciaController.lbBtnIrregularidade.label')}" />
</hbox> </hbox>
<listbox id="ecfListBox" height="290px"
<listbox id="ecfListBox" sizedByContent="false"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="true" height="290px"> multiple="false">
<listhead sizable="true"> <listhead sizable="true">
<listheader <listheader
image="/gui/img/builder.gif" image="/gui/img/builder.gif"
label="${c:l('conferenciaController.lblNumSerieECF')}" /> label="${c:l('conferenciaController.lblNumSerieECF')}" />
<listheader
label="${c:l('conferenciaController.lbBtnIrregularidade.label')}" />
</listhead> </listhead>
</listbox> </listbox>
</vbox> </vbox>
@ -1016,8 +1012,10 @@
<column width="40%" /> <column width="40%" />
</columns> </columns>
<rows> <rows>
<row visible="false" id="rowDataMovimento"> <row visible="false"
<label value="${c:l('conferenciaController.lbDatamovimento2.label')}" /> id="rowDataMovimento">
<label
value="${c:l('conferenciaController.lbDatamovimento2.label')}" />
<combobox id="cmbConferenciaDia" <combobox id="cmbConferenciaDia"
width="70%" mold="rounded" buttonVisible="true" width="70%" mold="rounded" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" /> use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" />