From d975c0a601389ee387d35bd46a44fd08833d1401 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Wed, 24 Apr 2024 10:02:44 -0700
Subject: [PATCH] -- mejora carta porte

---
 App_Code/ClsPaginas.vb | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index deaa6bdbc..a800a3856 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -1965,7 +1965,7 @@ Public Class ClsPaginas
         End Set
     End Property
 
-    Property GlobalDTGralCartaPorteConfigAutoTransportes() As DataTable
+    Property GlobalDTGralCartaPorteConfigAutoTransportes As DataTable
         Get
             Dim AppNombre As String = "GetCartaPorteConfigAutoTransportes"
             If Application(AppNombre) Is Nothing Then
@@ -5966,8 +5966,6 @@ Public Class ClsPaginas
                 Dim PermisoSCTR2 As String = ""
                 Dim ConfATR1 As String = ""
                 Dim ConfATR2 As String = ""
-
-
                 Dim ObjInv As New ClsGenerales
 
                 If ObjInv.GetGralTimbre(CveTimbre, "-1", MinFecha, MaxFecha, -1, UsuarioActual.CveEmpresa, -1) Then
@@ -5984,7 +5982,6 @@ Public Class ClsPaginas
                                 ConfATR1 = Dr("ConfATR1").ToString
                                 ConfATR2 = Dr("ConfATR2").ToString
                             End If
-
                         End If
                     End If
                 End If
@@ -6078,22 +6075,6 @@ Public Class ClsPaginas
                     Dim VersionCCP As String = ""
                     Dim PrefijoCCP As String = ""
 
-                    'Try
-
-                    '    'XDocument doc = XDocument.Parse(Xml);
-                    '    'String Version = doc.Descendants("cartaporte30:CartaPorte").First().Attribute("version").Value;
-
-                    '    Dim NodoVersionCCP As XmlNode = XMLDoc.Descendants("cartaporte30:CartaPorte")
-                    '    If NodoVersionCCP IsNot Nothing Then
-                    '        VersionCCP = ValorXML(NodoVersionCCP, "version")
-                    '    Else
-                    '        VersionCCP = "2.0"
-                    '    End If
-                    'Catch ex As Exception
-
-                    'End Try
-
-
                     If Version = "3.3" Then
                         cfdVer = "http://www.sat.gob.mx/cfd/3"
                     Else ' se considera que es la version 4.0
@@ -6162,9 +6143,7 @@ Public Class ClsPaginas
                         TransporteInternacional = ValorXML(nodeCartaPorte, "TranspInternac", "")
                         Dim CveTransporte As String = ValorXML(nodeCartaPorte, "ViaEntradaSalida", "")
                         'Dim nodeFiguraTransporte As XmlNode = nodeComp.SelectSingleNode(String.Format("//{0}:FiguraTransporte", "cartaporte20"), namespaces)
-                        'If nodeFiguraTransporte IsNot Nothing Then
-                        MedioTransporte = String.Format("{0} - {1}", CveTransporte, HtTransporte(CveTransporte).ToString())
-                        'End If
+                        If CveTransporte <> "" Then MedioTransporte = String.Format("{0} - {1}", CveTransporte, HtTransporte(CveTransporte).ToString())
                     End If
 
                     Dim nodeAutotransporteFederal As XmlNode = nodeComp.SelectSingleNode(String.Format("//{0}:Autotransporte", PrefijoCCP), namespaces)
@@ -6207,8 +6186,6 @@ Public Class ClsPaginas
                         End If
                     End If
 
-
-
                     Dim nodeMercancias As XmlNodeList = nodeComp.SelectNodes(String.Format("//{0}:Mercancia", PrefijoCCP), namespaces)
                     For Each node As XmlNode In nodeMercancias
                         Dim Row As DataRow = DtMercancias.NewRow
@@ -6294,8 +6271,6 @@ Public Class ClsPaginas
                             End If
                             Row("Direccion") = String.Format("{0} Col.{1},{2},{3}. CP {4}", calle, Colonia, Municipio, Estado, CP)
                         End If
-
-
                         DtUbicaciones.Rows.Add(Row)
                     Next
 
@@ -6439,11 +6414,6 @@ Public Class ClsPaginas
                         params.Add(New ReportParameter("ConfATR2", ConfATR2))
                     End If
 
-
-
-                    ' [@CertificadoContribuyente]
-                    '[@CadenaOriginal]
-
                     Dim lrds As New List(Of ReportDataSource)
 
                     Dim rds As New ReportDataSource
@@ -6483,7 +6453,6 @@ Public Class ClsPaginas
 
                     retorno.DataSources.AddRange(lrds)
                 End If
-
             End If
         Catch ex As Exception
             OnError("Ocurrió un error al generar el pdf de la carta porte", ex)