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

Bug lista de aidf nasTransferencia de estoque fixes bug#AL-3983' (!441) from AL-3983 into master 

Reviewed-on: adm/VentaBoletosAdm#441
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
master 1.57.2
fabio 2024-03-14 15:01:58 +00:00
parent ed5ecacf8e 5368839c8f
commit 773ce81704
2 changed files with 6 additions and 7 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.57.1</version> <version>1.57.2</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.41.1</modelWeb.version> <modelWeb.version>1.41.2</modelWeb.version>
<flyway.version>1.31.0</flyway.version> <flyway.version>1.31.0</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

9
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/MovimentacionBilhetesController.java
View File

@ -234,17 +234,16 @@ public class MovimentacionBilhetesController extends MyGenericForwardComposer {
public void onChange$cmbEmpresa(Event evt) throws InterruptedException { public void onChange$cmbEmpresa(Event evt) throws InterruptedException {
Comboitem empresaSelecionada = cmbEmpresa.getSelectedItem(); Comboitem empresaSelecionada = cmbEmpresa.getSelectedItem();
Empresa empresa = (Empresa) empresaSelecionada.getValue(); Empresa empresa = (Empresa) empresaSelecionada.getValue();
try{ try{
Comboitem origemSelecionada = cmbPuntoVentaOrigem.getSelectedItem(); Comboitem origemSelecionada = cmbPuntoVentaOrigem.getSelectedItem();
PuntoVenta origem = (PuntoVenta)origemSelecionada.getValue(); PuntoVenta origem = (PuntoVenta)origemSelecionada.getValue();
lsAidf = aidfService.buscaAidfsPorEmpresasAgencia(empresa.getEmpresaId().equals(-1) ? UsuarioLogado.getUsuarioLogado().getEmpresa() : Arrays.asList(empresa), origem); lsAidf = detAbastoService.buscarAidfsPorEmpresaAgencia(empresa, origem);
}catch (Exception e) { }catch (Exception e) {
lsAidf = aidfService.buscaAidfsPorEmpresas(empresa.getEmpresaId().equals(-1) ? UsuarioLogado.getUsuarioLogado().getEmpresa() : Arrays.asList(empresa)); lsAidf = aidfService.buscaAidfsPorEmpresas(empresa.getEmpresaId().equals(-1) ? UsuarioLogado.getUsuarioLogado().getEmpresa() : Arrays.asList(empresa));
} }
cmbAidf.setModel(new ListModelArray(lsAidf)); cmbAidf.setModel(new ListModelArray(lsAidf));
} }
public List<TipoMovimentacion> getLsTipoMovimentacion() { public List<TipoMovimentacion> getLsTipoMovimentacion() {