From 182a9236a11c088e8ad3d421bc31fb1e528cda41 Mon Sep 17 00:00:00 2001
From: asaenz <asaenz@atesa.tfs.local>
Date: Thu, 30 Jun 2022 20:20:38 +0000
Subject: [PATCH] Reportes

git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C555
---
 .../ControlGestion.Reporting.rptproj              |  4 ++++
 .../ControlGestion.Reporting/dsRecaudacion.rsd    | 15 ++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/ControlGestion.Reporting.rptproj b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/ControlGestion.Reporting.rptproj
index f3f47425b..05cdcb95d 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/ControlGestion.Reporting.rptproj
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/ControlGestion.Reporting.rptproj
@@ -49,7 +49,9 @@
     <Reports>@(Report)</Reports>
   </PropertyGroup>
   <ItemGroup>
+    <DataSet Include="DataSet1.rsd" />
     <DataSet Include="dsConciliacion_Interactiva.rsd" />
+    <DataSet Include="dsRecaudacion.rsd" />
   </ItemGroup>
   <ItemGroup>
     <DataSource Include="dsAyA.rds" />
@@ -57,6 +59,8 @@
   </ItemGroup>
   <ItemGroup>
     <Report Include="RConciliacion_Interactiva.rdl" />
+    <Report Include="RRecaudacion.rdl" />
+    <Report Include="RSumComisionesFPago.rdl" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Reporting Services\Microsoft.ReportingServices.MSBuilder.targets" />
 </Project>
\ No newline at end of file
diff --git a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd
index f77ee19fb..aae0bc7e7 100644
--- a/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd
+++ b/ControlGestiones/ControlGestion.Reporting/ControlGestion.Reporting/dsRecaudacion.rsd
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <SharedDataSet xmlns="http://schemas.microsoft.com/sqlserver/reporting/2010/01/shareddatasetdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
-  <DataSet Name="DataSet2">
+  <DataSet Name="DataSet1">
     <Query>
       <DataSourceReference>dsOracle</DataSourceReference>
-      <DataSetParameters>
-        <DataSetParameter Name="p_recaudador">
-          <ReadOnly>false</ReadOnly>
-          <Nullable>false</Nullable>
-          <OmitFromQuery>false</OmitFromQuery>
-          <rd:UserDefined>true</rd:UserDefined>
-        </DataSetParameter>
-      </DataSetParameters>
       <CommandText>select  distinct a.cod_recaudador,   fecha_control fecha_contable,
            decode(ltrim(rtrim(b.numero_deposito)), '',a.remesa, b.NUMERO_DEPOSITO) remesa,
            sum(round(to_number(a.total_pagado) / 100,2)) monto,
            sum(round(to_number(a.comision) / 100,2)) comision, b.monto_retencion
   from  mtx_archivos_recaudadores a, ptx_remesas_dep b
-where fecha_control between  '01/01/2000' and '01/01/2022'
+where fecha_control between  :p_f_inicio and :p_f_final
    and a.cod_recaudador = decode(:p_recaudador,'TODOS',a.cod_recaudador,:p_recaudador)
    and a.remesa = b.numero_remesa (+)
    AND a.COD_RECAUDADOR = B.COD_RECAUDADOR(+)
-group by a.cod_recaudador,  a.fecha_control, a.remesa, b.numero_deposito, b.monto_retencion</CommandText>
+group by a.cod_recaudador,  a.fecha_control, a.remesa, b.numero_deposito, b.monto_retencion
+</CommandText>
     </Query>
     <Fields>
       <Field Name="COD_RECAUDADOR">