diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index b4a2ef02c..8c2c21688 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -6012,11 +6012,17 @@ Public Class ClsPaginas RutaReporte = String.Format("{0}{1}", bdir, RutaReporte) End If - If EsProduccion AndAlso SubReportData Is Nothing Then + If EsProduccion Then - Dim wsreport As New WSRDLC.WebServiceSoapClient - Dim params As New List(Of WSRDLC.ReportParameter) - Dim reportobjects As New List(Of WSRDLC.ReportObjects) + Dim wsreport As New WSRDLC2.WebServiceSoapClient + Dim params As New List(Of WSRDLC2.ReportParameter) + Dim reportobjects As New List(Of WSRDLC2.ReportObjects) + + Dim jsonData As String = Nothing + + If SubReportData IsNot Nothing Then + jsonData = Newtonsoft.Json.JsonConvert.SerializeObject(SubReportData) + End If Dim ds As New DataSet For Each rpds As ReportDataSource In DataSource @@ -6026,7 +6032,7 @@ Public Class ClsPaginas dt.TableName = rpds.Name ds.Tables.Add(dt) Else - Dim ojext As New WSRDLC.ReportObjects + Dim ojext As New WSRDLC2.ReportObjects ojext.Name = rpds.Name ojext.Value = rpds.Value reportobjects.Add(ojext) @@ -6034,7 +6040,7 @@ Public Class ClsPaginas Next For Each rpds As ReportParameter In Parametros - Dim param As New WSRDLC.ReportParameter + Dim param As New WSRDLC2.ReportParameter param.Name = rpds.Name 'SI ES TEXTO, QUITAR TABS Y OTROS ESPACIOS QUE DEN PROBLEMAS AL MANDAR LA PETICION @@ -6047,7 +6053,7 @@ Public Class ClsPaginas params.Add(param) Next - Bytes = wsreport.StreamNEWPDFBytes(RutaReporte, ds, reportobjects.ToArray(), params.ToArray(), NombreArchivo, Formato, CveEmpresa, CveUsuario) + Bytes = wsreport.StreamNEWPDFBytes(RutaReporte, ds, reportobjects.ToArray(), params.ToArray(), NombreArchivo, Formato, CveEmpresa, CveUsuario, jsonData) wsreport = Nothing params = Nothing ds.Dispose() : ds = Nothing diff --git a/App_WebReferences/WSRDLC2/Reference.svcmap b/App_WebReferences/WSRDLC2/Reference.svcmap new file mode 100644 index 000000000..070b96bcb --- /dev/null +++ b/App_WebReferences/WSRDLC2/Reference.svcmap @@ -0,0 +1,31 @@ + + + + false + true + + false + false + false + + + true + Auto + true + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App_WebReferences/WSRDLC2/WebService.disco b/App_WebReferences/WSRDLC2/WebService.disco new file mode 100644 index 000000000..4b396211d --- /dev/null +++ b/App_WebReferences/WSRDLC2/WebService.disco @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/App_WebReferences/WSRDLC2/WebService.wsdl b/App_WebReferences/WSRDLC2/WebService.wsdl new file mode 100644 index 000000000..b23b74472 --- /dev/null +++ b/App_WebReferences/WSRDLC2/WebService.wsdl @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App_WebReferences/WSRDLC2/configuration.svcinfo b/App_WebReferences/WSRDLC2/configuration.svcinfo new file mode 100644 index 000000000..23094d5e1 --- /dev/null +++ b/App_WebReferences/WSRDLC2/configuration.svcinfo @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/App_WebReferences/WSRDLC2/configuration91.svcinfo b/App_WebReferences/WSRDLC2/configuration91.svcinfo new file mode 100644 index 000000000..c794b474d --- /dev/null +++ b/App_WebReferences/WSRDLC2/configuration91.svcinfo @@ -0,0 +1,201 @@ + + + + + + + WebServiceSoap1 + + + + + + + + + + + + + + + + + + + + + StrongWildcard + + + + + + 65536 + + + + + + + + + System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + System.Text.UTF8Encoding + + + Buffered + + + + + + Text + + + System.ServiceModel.Configuration.BasicHttpSecurityElement + + + None + + + System.ServiceModel.Configuration.HttpTransportSecurityElement + + + None + + + None + + + System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement + + + Never + + + TransportSelected + + + (Collection) + + + + + + System.ServiceModel.Configuration.BasicHttpMessageSecurityElement + + + UserName + + + Default + + + + + + + + + http://localhost:7999/WebService.asmx + + + + + + basicHttpBinding + + + WebServiceSoap1 + + + WSRDLC2.WebServiceSoap + + + System.ServiceModel.Configuration.AddressHeaderCollectionElement + + + <Header /> + + + System.ServiceModel.Configuration.IdentityElement + + + System.ServiceModel.Configuration.UserPrincipalNameElement + + + + + + System.ServiceModel.Configuration.ServicePrincipalNameElement + + + + + + System.ServiceModel.Configuration.DnsElement + + + + + + System.ServiceModel.Configuration.RsaElement + + + + + + System.ServiceModel.Configuration.CertificateElement + + + + + + System.ServiceModel.Configuration.CertificateReferenceElement + + + My + + + LocalMachine + + + FindBySubjectDistinguishedName + + + + + + False + + + WebServiceSoap1 + + + + + + + + + + + \ No newline at end of file