diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 875e14c20..d1103d1dc 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -6013,16 +6013,21 @@ Public Class ClsPaginas Dim wsreport As New WSRDLC.WebServiceSoapClient Dim params As New List(Of WSRDLC.ReportParameter) + Dim reportobjects As New List(Of WSRDLC.ReportObjects) + Dim ds As New DataSet For Each rpds As ReportDataSource In DataSource - Dim dt As DataTable = DirectCast(rpds.Value, Data.DataTable) - If dt Is Nothing Then - dt = New DataTable() - Else + If rpds.Value.GetType().ToString() = "System.Data.DataTable" Then + Dim dt As DataTable = DirectCast(rpds.Value, Data.DataTable) dt = dt.Copy() + dt.TableName = rpds.Name + ds.Tables.Add(dt) + Else + Dim ojext As New WSRDLC.ReportObjects + ojext.Name = rpds.Name + ojext.Value = rpds.Value + reportobjects.Add(ojext) End If - dt.TableName = rpds.Name - ds.Tables.Add(dt) Next For Each rpds As ReportParameter In Parametros Dim param As New WSRDLC.ReportParameter @@ -6030,7 +6035,7 @@ Public Class ClsPaginas param.Values = {rpds.Values(0)} params.Add(param) Next - Bytes = wsreport.StreamPDFBytes(RutaReporte, ds, params.ToArray(), NombreArchivo, Formato, CveEmpresa, CveUsuario) + Bytes = wsreport.StreamNEWPDFBytes(RutaReporte, ds, reportobjects.ToArray(), params.ToArray(), NombreArchivo, Formato, CveEmpresa, CveUsuario) wsreport = Nothing params = Nothing ds.Dispose() : ds = Nothing diff --git a/App_WebReferences/1WSRDLC.zip b/App_WebReferences/1WSRDLC.zip new file mode 100644 index 000000000..27254a455 Binary files /dev/null and b/App_WebReferences/1WSRDLC.zip differ diff --git a/App_WebReferences/WSRDLC/Reference.svcmap b/App_WebReferences/WSRDLC/Reference.svcmap index ce3ec718e..959e59a23 100644 --- a/App_WebReferences/WSRDLC/Reference.svcmap +++ b/App_WebReferences/WSRDLC/Reference.svcmap @@ -1,5 +1,5 @@ - + false true @@ -22,8 +22,8 @@ - + diff --git a/App_WebReferences/WSRDLC/WebService.disco b/App_WebReferences/WSRDLC/WebService.disco index 4b396211d..1dd75ae60 100644 --- a/App_WebReferences/WSRDLC/WebService.disco +++ b/App_WebReferences/WSRDLC/WebService.disco @@ -1,5 +1,5 @@ - + diff --git a/App_WebReferences/WSRDLC/WebService.wsdl b/App_WebReferences/WSRDLC/WebService.wsdl index 5d0cd8152..2dc431a14 100644 --- a/App_WebReferences/WSRDLC/WebService.wsdl +++ b/App_WebReferences/WSRDLC/WebService.wsdl @@ -1,5 +1,5 @@ - + @@ -83,6 +83,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,6 +170,18 @@ + + + + + + + + + + + + @@ -116,6 +195,14 @@ + + + + + + + + @@ -146,6 +233,24 @@ + + + + + + + + + + + + + + + + + + @@ -176,6 +281,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/App_WebReferences/WSRDLC/configuration.svcinfo b/App_WebReferences/WSRDLC/configuration.svcinfo index 2a3221f28..6e98140ae 100644 --- a/App_WebReferences/WSRDLC/configuration.svcinfo +++ b/App_WebReferences/WSRDLC/configuration.svcinfo @@ -1,10 +1,10 @@  - + - + - + \ No newline at end of file diff --git a/App_WebReferences/WSRDLC/configuration91.svcinfo b/App_WebReferences/WSRDLC/configuration91.svcinfo index b044b1a55..8e2129785 100644 --- a/App_WebReferences/WSRDLC/configuration91.svcinfo +++ b/App_WebReferences/WSRDLC/configuration91.svcinfo @@ -1,10 +1,10 @@ - + - + - WebServiceSoap + WebServiceSoap1 @@ -112,7 +112,7 @@ - + http://localhost:7999/WebService.asmx @@ -124,7 +124,7 @@ basicHttpBinding - WebServiceSoap + WebServiceSoap1 WSRDLC.WebServiceSoap @@ -187,7 +187,7 @@ False - WebServiceSoap + WebServiceSoap1 diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index a9e63b2ef..5abb5359a 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -360,10 +360,37 @@ Partial Class PopUpVerFactura params.Add(New ReportParameter("Cultivo", Cultivo)) params.Add(New ReportParameter("noPallet", noPallet)) params.Add(New ReportParameter("Variedad", Variedad)) - Dim tablaReporte As New DataTable + + Dim lrds As New List(Of ReportDataSource) + + 'img + Dim dtqr As New DataTable + Dim column As DataColumn = New DataColumn("ImagenByte") + column.DataType = System.Type.[GetType]("System.Byte[]") + column.AllowDBNull = True + column.Caption = "ImagenByte" + dtqr.Columns.Add(column) + Dim rowqr As DataRow = dtqr.NewRow() + + + Dim bcode As New BarcodeLib.Barcode() + Dim img = bcode.Encode(BarcodeLib.TYPE.CODE128, String.Format("{0}", noPallet), 500, 100) + Dim barcodebyte As Byte() + Using ms = New MemoryStream() + img.Save(ms, System.Drawing.Imaging.ImageFormat.Png) + barcodebyte = ms.ToArray() + End Using + rowqr("ImagenByte") = barcodebyte + + dtqr.Rows.Add(rowqr) + Dim rds2 As New ReportDataSource With {.Name = "dsImagenes", .Value = dtqr} + rds2.Name = "dsImagenes" + rds2.Value = dtqr + lrds.Add(rds2) + 'endimg '"Empresas/Grales/Formatos/EquiposGPS.rdlc" '"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc" - ImprimirPDF("GPS/PalletEtiqueta2.rdlc", (New List(Of ReportDataSource)), params, "Pallet") + ImprimirPDF("GPS/PalletEtiqueta2.rdlc", lrds, params, "Pallet") End Sub Private Sub imprimirpallet(cvePallet As Integer) Dim Envase As String = "" @@ -377,6 +404,8 @@ Partial Class PopUpVerFactura Dim NoCajas As String = "" Dim NumberOfCode As String = "" Dim CvetypeImpresion As Integer + Dim NumberSmall As String = "" + Dim NumberBig As String = "" 'Envase = "1 1/9" 'Tamano = "Small" 'Cultivo = "Tomate" @@ -394,8 +423,9 @@ Partial Class PopUpVerFactura NoCajas = row("NoCajas").ToString() Fecha = String.Format("{0:MMM dd}", row("Fecha")).Replace(".", "").ToUpper() CvetypeImpresion = row("CvetypeImpresion").ToString().ToEntero() - NumberOfCode = String.Format("(01)00856977005186(13){1:ddMMyy}(10){0}01", Right(String.Format("0{0}", Regex.Match(row("Cuadro").ToString(), "\d+")), 2), row("Fecha")) - + NumberOfCode = String.Format("(00)00000000000000(00){1:ddMMyy}(00){0}00", Right(String.Format("0{0}", Regex.Match(row("Cuadro").ToString(), "\d+")), 2), row("Fecha")) + NumberSmall = String.Format("{0:00}", noPallet.ToEntero()) + NumberBig = String.Format("{0:00}", row("Consecutivo").ToString().ToEntero()) ' String.Format("{0:dd}", row("Fecha")) End If End Using Dim params As New List(Of ReportParameter) @@ -405,11 +435,13 @@ Partial Class PopUpVerFactura params.Add(New ReportParameter("FormatoImpresion", FormatoImpresion)) params.Add(New ReportParameter("Consecutivo", Consecutivo)) params.Add(New ReportParameter("Fecha", Fecha)) - params.Add(New ReportParameter("CveFormato", If(Cultivo.ToLower() = "tomate", "3", CvetypeImpresion.ToString()))) + params.Add(New ReportParameter("CveFormato", If(Cultivo.ToLower().Contains("tomate"), "3", CvetypeImpresion.ToString()))) params.Add(New ReportParameter("NoCajas", NoCajas)) params.Add(New ReportParameter("NumberOfCode", NumberOfCode)) params.Add(New ReportParameter("Cultivo", If(CvetypeImpresion = 2, Cultivoingles, Cultivo))) params.Add(New ReportParameter("Envase", If(CvetypeImpresion = 2, "PLU 4062", Envase))) + params.Add(New ReportParameter("NumberSmall", NumberSmall)) + params.Add(New ReportParameter("NumberBig", NumberBig)) @@ -431,10 +463,10 @@ Partial Class PopUpVerFactura Dim bcode As New BarcodeLib.Barcode() - ' Dim img = bcode.Encode(BarcodeLib.TYPE.CODE128, String.Format("{0}", noPallet), 500, 100) + Dim img = bcode.Encode(BarcodeLib.TYPE.CODE128, String.Format("{0}", noPallet), 500, 100) Dim barcodebyte As Byte() Using ms = New MemoryStream() - ' img.Save(ms, System.Drawing.Imaging.ImageFormat.Png) + img.Save(ms, System.Drawing.Imaging.ImageFormat.Png) barcodebyte = ms.ToArray() End Using rowqr("ImagenByte") = barcodebyte @@ -807,15 +839,15 @@ Partial Class PopUpVerFactura DtCortesVentasResumen = ObjVenta.DtResultados End If - If ObjPuntoVenta.GetCortesDetalleVentas(CveCorte, UsuarioActual.CveEmpresa) Then - DtCortesVentas = ObjPuntoVenta.DtResultados - If DtCortesVentas.Rows.Count > 0 Then - Dim RowInfo As DataRow = DtCortesVentas.FiltroPrimero("CveVenta > 0") + 'If ObjPuntoVenta.GetCortesDetalleVentas(CveCorte, UsuarioActual.CveEmpresa) Then + ' DtCortesVentas = ObjPuntoVenta.DtResultados + ' If DtCortesVentas.Rows.Count > 0 Then + ' Dim RowInfo As DataRow = DtCortesVentas.FiltroPrimero("CveVenta > 0") - Fecha = RowInfo("FechaInicial").ToString - Nombre = RowInfo("Nombre").ToString - End If - End If + ' Fecha = RowInfo("FechaInicial").ToString + ' Nombre = RowInfo("Nombre").ToString + ' End If + 'End If ObjVenta.Dispose() ObjPuntoVenta.Dispose() Dim FechaCorte As String = $" Fecha fin: {Fecha}" diff --git a/GPS/PalletEtiqueta2.rdlc b/GPS/PalletEtiqueta2.rdlc index 109db21a2..07be03233 100644 --- a/GPS/PalletEtiqueta2.rdlc +++ b/GPS/PalletEtiqueta2.rdlc @@ -1,2426 +1,3784 @@ - - - - - - - true - true - - - - - PALLET-TAG - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - 03 - - - - =Parameters!noPallet.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Cultivo.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COMMODITY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Variedad.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - VARIETY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Envase.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - STYLE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Tamano.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - SIZE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Grower - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - LABEL - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!NoCajas.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - PACKS - - - - - - 2pt - 2pt - 2pt - 2pt - - - - Embedded - barcode1 - FitProportional - 3.46683cm - 1.51697cm - 1.5cm - 3.24489cm - 14 - - - - - - - - true - true - - - - - PALLET-TAG - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - 03 - - - - =Parameters!noPallet.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COMMODITY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - VARIETY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COUNTRY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Cultivo.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Variedad.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - MEXICO - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - STYLE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - SIZE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - LABEL - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Envase.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Tamano.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Grower - - - - - - 2pt - 2pt - 2pt - 2pt - - - - Embedded - barcode1 - FitProportional - 0.61954cm - 6.0624cm - 1.5cm - 3.24489cm - 14 - - - - - - true - 5.46072cm - 0.0353cm - 2.59618cm - 9.33165cm - 15 - - - - - - - - true - true - - - - - PALLET-TAG - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - 03 - - - - =Parameters!noPallet.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COMMODITY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - VARIETY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COUNTRY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Cultivo.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Variedad.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - MEXICO - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - STYLE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - SIZE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - LABEL - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Envase.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Tamano.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Grower - - - - - - 2pt - 2pt - 2pt - 2pt - - - - Embedded - barcode1 - FitProportional - 0.61954cm - 6.0624cm - 1.5cm - 3.24489cm - 14 - - - - - - true - 8.19801cm - 0.05708cm - 2.59618cm - 9.33165cm - 16 - - - - - - - - true - true - - - - - PALLET-TAG - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - 03 - - - - =Parameters!noPallet.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COMMODITY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - VARIETY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COUNTRY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Cultivo.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Variedad.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - MEXICO - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - STYLE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - SIZE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - LABEL - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Envase.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Tamano.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Grower - - - - - - 2pt - 2pt - 2pt - 2pt - - - - Embedded - barcode1 - FitProportional - 0.61954cm - 6.0624cm - 1.5cm - 3.24489cm - 14 - - - - - - true - 10.79419cm - 0.05708cm - 2.59618cm - 9.33165cm - 17 - - - - - - - - true - true - - - - - PALLET-TAG - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - 03 - - - - =Parameters!noPallet.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COMMODITY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - VARIETY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - COUNTRY - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Cultivo.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Variedad.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - MEXICO - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - STYLE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - SIZE - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - LABEL - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Envase.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Tamano.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Grower - - - - - - 2pt - 2pt - 2pt - 2pt - - - - Embedded - barcode1 - FitProportional - 0.61954cm - 6.0624cm - 1.5cm - 3.24489cm - 14 - - - - - - true - 13.34436cm - 0.05708cm - 2.59618cm - 9.33165cm - 18 - - - - - - true - 0.14291cm - 0.09907cm - 15.94054cm - 9.49453cm - - - - - - 6.97802in - + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.44125cm + + + + + true + true + + + + + COMMODITY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Cultivo.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.38833cm + + + + + true + true + + + + + VARIETY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Variedad.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.44125cm + + + + + true + true + + + + + STYLE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Envase.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.36187cm + + + + + true + true + + + + + LABEL + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Grower + + + + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.36187cm + + + + + true + true + + + + + PACKS + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!NoCajas.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.49417cm + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + Database + =First(Fields!ImagenByte.Value, "dsImagenes") + image/png + FitProportional + 14 + + + + + 2 + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.49417cm + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.41479cm + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.49417cm + + + + + true + true + + + + + PALLET-TAG + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.54708cm + + + + + true + true + + + + + COMMODITY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + VARIETY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + COUNTRY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + Database + =First(Fields!ImagenByte.Value, "dsImagenes") + image/png + FitProportional + 14 + + + + + + + + + + 0.52062cm + + + + + true + true + + + + + =Parameters!Cultivo.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Variedad.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + MEXICO + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.36187cm + + + + + true + true + + + + + STYLE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + SIZE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + LABEL + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.38833cm + + + + + true + true + + + + + =Parameters!Envase.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Tamano.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Grower + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.52062cm + + + + + true + true + + + + + PALLET-TAG + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.44125cm + + + + + true + true + + + + + COMMODITY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + VARIETY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + COUNTRY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + Database + =First(Fields!ImagenByte.Value, "dsImagenes") + image/png + FitProportional + 14 + + + + + + + + + + 0.44125cm + + + + + true + true + + + + + =Parameters!Cultivo.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Variedad.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + MEXICO + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.41479cm + + + + + true + true + + + + + STYLE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + SIZE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + LABEL + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.41479cm + + + + + true + true + + + + + =Parameters!Envase.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Tamano.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Grower + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.41479cm + + + + + true + true + + + + + PALLET-TAG + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.41479cm + + + + + true + true + + + + + COMMODITY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + VARIETY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + COUNTRY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + Database + =First(Fields!ImagenByte.Value, "dsImagenes") + image/png + FitProportional + 14 + + + + + + + + + + 0.52062cm + + + + + true + true + + + + + =Parameters!Cultivo.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Variedad.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + MEXICO + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.44125cm + + + + + true + true + + + + + STYLE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + SIZE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + LABEL + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.38833cm + + + + + true + true + + + + + =Parameters!Envase.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Tamano.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Grower + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.44125cm + + + + + true + true + + + + + PALLET-TAG + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.38833cm + + + + + true + true + + + + + COMMODITY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + VARIETY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + COUNTRY + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + Database + =First(Fields!ImagenByte.Value, "dsImagenes") + image/png + FitProportional + 14 + + + + + + + + + + 0.46771cm + + + + + true + true + + + + + =Parameters!Cultivo.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Variedad.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + MEXICO + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 03 + + + + =Parameters!noPallet.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.36187cm + + + + + true + true + + + + + STYLE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + SIZE + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + LABEL + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.36187cm + + + + + true + true + + + + + =Parameters!Envase.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Parameters!Tamano.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Grower + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0762cm + 0.10266cm + 13.18458cm + 9.64969cm + + + + + + 5.34012in + + true @@ -3921,7 +3922,7 @@ Produce of MX. 0.0801cm 0.05458cm 8.07288cm - 10.64012cm + 10.6401cm @@ -4005,6 +4006,18 @@ Produce of MX. true ReportParameter1 + + String + true + true + ReportParameter1 + + + String + true + true + ReportParameter1 + diff --git a/LogIn.aspx b/LogIn.aspx index f027dda87..e1287e4f0 100644 --- a/LogIn.aspx +++ b/LogIn.aspx @@ -132,13 +132,13 @@ <%----%> + + + + diff --git a/SiteAngular.aspx.cs b/SiteAngular.aspx.cs new file mode 100644 index 000000000..f0fa903ac --- /dev/null +++ b/SiteAngular.aspx.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +public partial class SiteAngular : System.Web.UI.Page +{ + public Usuario UsuarioActual + { + get + { + try + { + // UsuarioActual = DirectCast(Session("UsuarioSIG"), Usuario) + if (Context.Session["UsuarioSIG"] == null) + { + return null; + } + else { + return (Usuario)Context.Session["UsuarioSIG"]; + } + } + catch (Exception ex) + { + return null; + } + } + } + protected void Page_Load(object sender, EventArgs e) + { + + } + public string GetTokenAngular() + { + if (Context.Session["UsuarioSIG"] != null) + { + Usuario usuario = (Usuario)Context.Session["UsuarioSIG"]; + var tokenDescriptor = new Microsoft.IdentityModel.Tokens.SecurityTokenDescriptor() { Subject = new System.Security.Claims.ClaimsIdentity(new System.Security.Claims.Claim[] { new System.Security.Claims.Claim("CvePlataforma", usuario.CvePlataforma.ToString()), new System.Security.Claims.Claim("CveUsuario", usuario.CveUsuario.ToString()), new System.Security.Claims.Claim("CveEmpresa", usuario.CveEmpresa.ToString()), new System.Security.Claims.Claim("CveRol", usuario.CveRol.ToString()), new System.Security.Claims.Claim("Fecha", DateTime.Now.ToLongDateString()) }), Expires = DateTime.UtcNow.AddHours(3), SigningCredentials = new Microsoft.IdentityModel.Tokens.SigningCredentials(new Microsoft.IdentityModel.Tokens.SymmetricSecurityKey(Encoding.ASCII.GetBytes("*_AsistenciaDesarrolloSistemas-SIGAPI_*17-06-2020")), Microsoft.IdentityModel.Tokens.SecurityAlgorithms.HmacSha256Signature) }; + var tokenHandler = new System.IdentityModel.Tokens.Jwt.JwtSecurityTokenHandler(); + var newtoken = tokenHandler.CreateToken(tokenDescriptor); + string stokenn = tokenHandler.WriteToken(newtoken); + return stokenn; + } + else + return ""; + } + + + +} \ No newline at end of file diff --git a/vwd.webinfo b/vwd.webinfo index accb5b476..35cd6ccbe 100644 --- a/vwd.webinfo +++ b/vwd.webinfo @@ -466,6 +466,10 @@ + + + +