popup ver facturas

Compras/PopUpVerFactura.aspx.vb

@@ -1134,8 +1134,10 @@ Partial Class PopUpVerFactura
             Dim NombreAseguradoraCarga As String = ""
             Dim NumPolizaSeguroCarga As String = ""
 
-
+            Dim RemolquePlaca1 As String = ""
-
+            Dim RemolquePlaca2 As String = ""
+            Dim RemolqueSubtimo1 As String = ""
+            Dim RemolqueSubtimo2 As String = ""
 
             Dim PlacaVM As String = ""
             Dim AnioModeloVM As String = ""
@@ -1184,6 +1186,9 @@ Partial Class PopUpVerFactura
             DtMercancias.Columns.Add(New DataColumn("Descripcion", GetType(String)))
             DtMercancias.Columns.Add(New DataColumn("PesoEnKg", GetType(String)))
 
+            DtMercancias.Columns.Add(New DataColumn("CveMaterialPeligroso", GetType(String)))
+            DtMercancias.Columns.Add(New DataColumn("Embalaje", GetType(String)))
+
             Dim DtOperadores As New DataTable()
             DtOperadores.Columns.Add(New DataColumn("RFC", GetType(String)))
             DtOperadores.Columns.Add(New DataColumn("NumLicencia", GetType(String)))
@@ -1290,6 +1295,21 @@ Partial Class PopUpVerFactura
                     NumPolizaSeguroCarga = ValorXML(nodeSeguros, "PolizaCarga", "")
                 End If
 
+
+                Dim nodeRemolques As XmlNode = nodeComp.SelectSingleNode(String.Format("//{0}:Remolques", "cartaporte20"), namespaces)
+
+                If nodeRemolques IsNot Nothing Then
+                    If nodeRemolques.ChildNodes.Count = 1 Then
+                        RemolquePlaca1 = ValorXML(nodeRemolques.ChildNodes(0), "Placa", "")
+                        RemolqueSubtimo1 = ValorXML(nodeRemolques.ChildNodes(0), "SubTipoRem", "")
+                    ElseIf nodeRemolques.ChildNodes.Count > 1 Then
+                        RemolquePlaca1 = ValorXML(nodeRemolques.ChildNodes(0), "Placa", "")
+                        RemolqueSubtimo1 = ValorXML(nodeRemolques.ChildNodes(0), "SubTipoRem", "")
+                        RemolquePlaca2 = ValorXML(nodeRemolques.ChildNodes(1), "Placa", "")
+                        RemolqueSubtimo2 = ValorXML(nodeRemolques.ChildNodes(1), "SubTipoRem", "")
+                    End If
+                End If
+
                 'Dim nodeFiguraTransporte As XmlNode = nodeComp.SelectSingleNode(String.Format("//{0}:FiguraTransporte", "cartaporte20"), namespaces)
                 'If nodeFiguraTransporte IsNot Nothing Then
                 '    Dim CveTransporte As String = ValorXML(nodeFiguraTransporte, "TipoFigura", "")
@@ -1305,6 +1325,9 @@ Partial Class PopUpVerFactura
                     Row("Descripcion") = ValorXML(node, "Descripcion", "")
                     Row("PesoEnKg") = ValorXML(node, "PesoEnKg", "")
 
+                    Row("CveMaterialPeligroso") = ValorXML(node, "CveMaterialPeligroso", "")
+                    Row("Embalaje") = ValorXML(node, "Embalaje", "")
+
                     DtMercancias.Rows.Add(Row)
                 Next
 
@@ -1436,6 +1459,10 @@ Partial Class PopUpVerFactura
                 params.Add(New ReportParameter("Descuentos", Descuentos.ToString()))
                 params.Add(New ReportParameter("Total", Total.ToString()))
 
+                params.Add(New ReportParameter("RemolquePlaca1", RemolquePlaca1))
+                params.Add(New ReportParameter("RemolqueSubtimo1", RemolqueSubtimo1))
+                params.Add(New ReportParameter("RemolquePlaca2", RemolquePlaca2))
+                params.Add(New ReportParameter("RemolqueSubtimo2", RemolqueSubtimo2))
 
 
                 ' [@CertificadoContribuyente]