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

Merge pull request 'Filtro de num inicial/final relatorio saldo estoque feat #AL-4398' (!288) from AL-4398 into master 

Reviewed-on: adm/ModelWeb#288
Reviewed-by: wallace <wallace@rjconsultores.com.br>
master
fabio 2024-10-04 21:26:35 +00:00
parent 1171685eac 73942273db
commit 925843d369
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.113.0</version>
<version>1.114.0</version>
<distributionManagement>
<repository>

3
src/com/rjconsultores/ventaboletos/service/impl/VoucherServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -120,7 +121,7 @@ public class VoucherServiceImpl implements VoucherService {
for (Voucher vou : dados) {
VoucherVO vo;
if( !vou.getContrato().getNumContrato().equals(numContrato)) {
if( StringUtils.isNotEmpty(numContrato) && !vou.getContrato().getNumContrato().equals(numContrato)) {
vo = VoucherVO.converteVoucher(vou);
vo.setMensagem(Labels.getLabel("legalizacaoMassivaController.MSG.contratoDiferente"));
retorno.add(vo);