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

Add transferencia na conferencia movimento feat #AL-2752 

Reviewed-on: adm/VentaBoletosAdm#236
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master 1.11.0
fabio 2023-07-31 16:48:19 +00:00
parent b67990b8f7 756465dcbe
commit b85da1acc5
2 changed files with 11 additions and 10 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.10.9</version>
<version>1.11.0</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.7.4</modelWeb.version>
<modelWeb.version>1.8.0</modelWeb.version>
<flyway.version>1.6.3</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

17
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java
View File

@ -40,6 +40,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@Controller("busquedaConferenciaComissaoController")
public class BusquedaConferenciaComissaoController extends MyGenericForwardComposer {
private static final String TITULO = "conferenciaComissaoController.window.title";
private static Logger log = Logger.getLogger(BusquedaConferenciaComissaoController.class);
private static final long serialVersionUID = 1L;
private Textbox txtCompetencia;
@ -90,7 +91,7 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
} else {
try {
Messagebox.show(Labels.getLabel("busquedaConferenciaComissaoController.lbPuntoVentaInvalido.value"),
Labels.getLabel("conferenciaComissaoController.window.title"),
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
} catch (InterruptedException e) {
log.error("Erro: ", e);
@ -140,7 +141,7 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
if (rdTipoMesAno.isChecked()) {
openWindow("/gui/comissao/conferenciaComissao.zul",
Labels.getLabel("conferenciaComissaoController.window.title"), args, MODAL);
Labels.getLabel(TITULO), args, MODAL);
} else {
if (validarEmpresaPuntoVentaPeriodo()) {
List<ConferenciaComissaoVO> lsConferenciaComissao = conferenciaComissaoService.carregarConferenciaComissao(dataInicial, dataFinal, empresa, puntoVenta, null, chkDesconsideraPtVendaFechados.isChecked() );
@ -157,11 +158,11 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
} else {
if (intervalo != null && intervalo != 0) {
Messagebox.show(Labels.getLabel("MSG.Error.invalida.intervaloInvalido") + " " + intervalo + " " + Labels.getLabel("MSG.Error.invalida.intervaloInvalidoDias"),
Labels.getLabel("conferenciaComissaoController.window.title"),
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
} else {
Messagebox.show(Labels.getLabel("MSG.Error.invalida.puntoVentaSemFechamentoParaEmpresa"),
Labels.getLabel("conferenciaComissaoController.window.title"),
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
}
}
@ -192,7 +193,7 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
if (rdTipoMesAno.isChecked()
&& !DateUtil.isCompetenciaValida(txtCompetencia.getValue())) {
Messagebox.show(Labels.getLabel("MSG.Error.invalida.competencia"),
Labels.getLabel("conferenciaComissaoController.window.title"),
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
return false;
}
@ -201,7 +202,7 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
if(datInicial.getValue().after(datFinal.getValue())){
Messagebox.show(Labels.getLabel("MSG.Error.invalida.dataInicialDepoisDataFinal"),
Labels.getLabel("conferenciaComissaoController.window.title"),
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
return false;
}
@ -218,14 +219,14 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
if(monthInicial != monthFinal
|| yearFinal != yearInicial){
Messagebox.show(Labels.getLabel("MSG.Error.invalida.dataInicialFinalMesDiferente"),
Labels.getLabel("conferenciaComissaoController.window.title"),
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
return false;
}
if(puntoVenta.getPuntoventaId().equals(new Integer(-1))){
Messagebox.show(Labels.getLabel("MSG.Error.invalida.puntoVendaTodosNaoPermitido"),
Labels.getLabel("conferenciaComissaoController.window.title"),
Labels.getLabel(TITULO),
Messagebox.OK, Messagebox.ERROR);
return false;
}