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

fixes bug 0010024 - commit Trunk 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@76586 d1611594-4594-4d17-8e1d-87c2c4800839
master
bruno.neves 2017-11-20 12:06:13 +00:00
parent ad2fed959d
commit 59e06d01dc
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
View File

@ -9,7 +9,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@ -92,6 +91,8 @@ public class ConferenciaController extends MyGenericForwardComposer {
private String puntoventa;
private Conferencia conferencia;
//Variável de controle que indica se já passou pela criação do grid.
private Boolean jaPassou = false;
private MyListbox ecfListBox;
@ -209,7 +210,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
@Override
public void doAfterCompose(Component comp) throws Exception {
isPeriodo = (Boolean) Executions.getCurrent().getArg().get("isPeriodo");
if (isPeriodo) {
@ -256,15 +257,11 @@ public class ConferenciaController extends MyGenericForwardComposer {
super.render(lstm, o);
final OcdVO ocd = (OcdVO) o;
List<Component> com = lstm.getChildren();
Random gerador = new Random();
String name = gerador.nextInt() + "";
name = name.replace("-", "");
for (Component component : com) {
Listcell listCell = (Listcell) component;
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(getEnableDisableCheckBox(ocd.getConferencia()));
chk.setId(name);
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -296,13 +293,9 @@ public class ConferenciaController extends MyGenericForwardComposer {
List<Component> com = lstm.getChildren();
for (Component component : com) {
Listcell listCell = (Listcell) component;
Random gerador = new Random();
String name = gerador.nextInt() + "";
name = name.replace("-", "");
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(getEnableDisableCheckBox(eventoFinanceiro.getConferencia()));
chk.setId(name);
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -397,15 +390,10 @@ public class ConferenciaController extends MyGenericForwardComposer {
super.render(lstm, o);
final BoletoComissao boletoComissao = (BoletoComissao) o;
List<Component> com = lstm.getChildren();
Random gerador = new Random();
String name = gerador.nextInt() + "";
name = name.replace("-", "");
for (Component component : com) {
Listcell listCell = (Listcell) component;
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia()));
chk.setId(name);
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -440,10 +428,12 @@ public class ConferenciaController extends MyGenericForwardComposer {
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
if (boletoComissao.isConferido() && boletoComissao.getLogconferenciaId() == null) {
gravarLogConferenciaBilhete(bilhetesList, boletoComissao, tabBilhetesVenda, "conferenciaController.tab.bilhetes");
gravarLogConferenciaBilhete(bilhetesList, boletoComissao, tabBilhetesVenda, "conferenciaController.tab.bilhetes");
}
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia()));
if(!chk.isDisabled() && boletoComissao.isBilheteEntregaConferidoVenda()) {
chk.setDisabled(true);
}
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -458,7 +448,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
}
}
jaPassou = true;
}
});
@ -480,7 +470,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
Listcell listCell = (Listcell) component;
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia()));
chk.setDisabled(getEnableDisableCheckBox(conferencia));
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -514,7 +504,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
Listcell listCell = (Listcell) component;
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(isExibirBotaoReabrirMovimento() || (!isMaloteRecebido() && isNaopermiteconfsemmalote()));
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia()));
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -548,7 +538,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
Listcell listCell = (Listcell) component;
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(isExibirBotaoReabrirMovimento() || (!isMaloteRecebido() && isNaopermiteconfsemmalote()));
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia()));
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -582,7 +572,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
Listcell listCell = (Listcell) component;
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(isExibirBotaoReabrirMovimento() || (!isMaloteRecebido() && isNaopermiteconfsemmalote()));
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia()));
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -616,7 +606,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
Listcell listCell = (Listcell) component;
if (listCell.getFirstChild() instanceof Checkbox) {
Checkbox chk = (Checkbox) component.getFirstChild();
chk.setDisabled(isExibirBotaoReabrirMovimento() || (!isMaloteRecebido() && isNaopermiteconfsemmalote()));
chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia()));
chk.addEventListener("onCheck", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
@ -780,6 +770,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
}
private void carregarBilhetesVendidos(List<BoletoComissao> boletosComissaos, boolean carregarDadosFaltantes) throws BusinessException {
jaPassou = false;
if (isPeriodo) {
lsBilhetes = conferenciaComissaoService.carregarBilhetesComissao(boletosComissaos, conferencias, BoletoStatusComissao.BOLETOS_VENDIDOS, carregarDadosFaltantes);
} else {

4
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java
View File

@ -21,7 +21,9 @@ public class RenderBoletoComissao implements ListitemRenderer {
@Override
public void render(Listitem lstm, Object o) throws Exception {
BoletoComissao boletoComissao = (BoletoComissao) o;
// boletoComissao.setConferido(boletoComissao.getLogconferenciaId() != null);
if(!boletoComissao.isConferido()) {
boletoComissao.setConferido(boletoComissao.getLogconferenciaId() != null);
}
Listcell lc = new Listcell();
if(boletoComissao.isExigeConferenciaAba() || boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) {

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderLogConferencia.java
View File

@ -48,7 +48,7 @@ public class RenderLogConferencia implements ListitemRenderer {
lc = new Listcell(logConferencia.getTipoDescricao());
lc.setParent(lstm);
lc = new Listcell(String.valueOf(logConferencia.getPendenciaId()));
lc = new Listcell(logConferencia.getPendenciaId() != null ? String.valueOf(logConferencia.getPendenciaId()): "");
lc.setParent(lstm);
lc = new Listcell(logConferencia.getDescpendencia());