Redmine #tarefa-4936

joyfas.silva
1 parent 340dc5bc
Showing 2 changed files with 6 additions and 2 deletions Show diff stats
cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/RequisicaoConsumoDaoHibernate.java
cit-almoxarifado-web/src/main/java/br/com/centralit/controller/ReportGuiaRemessaAtendimentoConsumoController.java
@@ -307,6 +307,7 @@ public class RequisicaoConsumoDaoHibernate extends CitGenericDAOImpl implements 
 	public List<Object> getResumoContabilForReport(Long requisicaoId,boolean isFIFO) {
 		StringBuilder sql = new StringBuilder();
 		sql.append("select distinct contac.codigo,contac.descricao, rc_item.quantidade,");
+		
 		if(isFIFO)
 			sql.append("fifo.valorUnitario");
 		else
@@ -325,9 +326,11 @@ public class RequisicaoConsumoDaoHibernate extends CitGenericDAOImpl implements 
  
 		sql.append(" left join contacontabil contac on mat.contacontabil_id = contac.id");
 		sql.append(" where req_c.id = ").append(requisicaoId);
+		
 		if(isFIFO)
 			sql.append(" and fifo.valorUnitario is not null");
-//		sql.append(" and rc_item.quantidadeatendida is not null");
+		
+		sql.append(" and rc_item.quantidadeatendida is not null");
 		sql.append(" order by contac.descricao");
  
 		return (List<Object>) resultListNativeQuery(sql.toString());
@@ -359,6 +362,7 @@ public class RequisicaoConsumoDaoHibernate extends CitGenericDAOImpl implements 
  
 		sql.append(" left join unidademedida umedi on umedi.id = mat_c.unidadearmazenamento_id");
 		sql.append(" where req_c.id =").append(requisicaoId);
+		
 		if(isFIFO)
 			sql.append("and fifo.quantidadeRestante > 0");
  
@@ -164,7 +164,7 @@ public class ReportGuiaRemessaAtendimentoConsumoController extends GenericContro
  
 			parameters.put("BEAN_SUB_REPORT",new JRBeanCollectionDataSource(beanReqSubList));
  
-//			if(isFinalizada)
+			if(isFinalizada)
 				parametersSubReport.put("REQ_CONSUMO", getResumoContabil(requisicaoId));
  
 			parametersSubReport.put("is_asterisco",!isFinalizada);
...	...	@@ -307,6 +307,7 @@ public class RequisicaoConsumoDaoHibernate extends CitGenericDAOImpl implements
307	307	public List<Object> getResumoContabilForReport(Long requisicaoId,boolean isFIFO) {
308	308	StringBuilder sql = new StringBuilder();
309	309	sql.append("select distinct contac.codigo,contac.descricao, rc_item.quantidade,");
	310	+
310	311	if(isFIFO)
311	312	sql.append("fifo.valorUnitario");
312	313	else
...	...	@@ -325,9 +326,11 @@ public class RequisicaoConsumoDaoHibernate extends CitGenericDAOImpl implements
325	326
326	327	sql.append(" left join contacontabil contac on mat.contacontabil_id = contac.id");
327	328	sql.append(" where req_c.id = ").append(requisicaoId);
	329	+
328	330	if(isFIFO)
329	331	sql.append(" and fifo.valorUnitario is not null");
330		-// sql.append(" and rc_item.quantidadeatendida is not null");
	332	+
	333	+ sql.append(" and rc_item.quantidadeatendida is not null");
331	334	sql.append(" order by contac.descricao");
332	335
333	336	return (List<Object>) resultListNativeQuery(sql.toString());
...	...	@@ -359,6 +362,7 @@ public class RequisicaoConsumoDaoHibernate extends CitGenericDAOImpl implements
359	362
360	363	sql.append(" left join unidademedida umedi on umedi.id = mat_c.unidadearmazenamento_id");
361	364	sql.append(" where req_c.id =").append(requisicaoId);
	365	+
362	366	if(isFIFO)
363	367	sql.append("and fifo.quantidadeRestante > 0");
364	368
...	...
...	...	@@ -164,7 +164,7 @@ public class ReportGuiaRemessaAtendimentoConsumoController extends GenericContro
164	164
165	165	parameters.put("BEAN_SUB_REPORT",new JRBeanCollectionDataSource(beanReqSubList));
166	166
167		-// if(isFinalizada)
	167	+ if(isFinalizada)
168	168	parametersSubReport.put("REQ_CONSUMO", getResumoContabil(requisicaoId));
169	169
170	170	parametersSubReport.put("is_asterisco",!isFinalizada);
...	...