From 35c4d4876eaad73ff90e73809193650a7216023d Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Tue, 8 Feb 2022 19:26:44 -0700
Subject: [PATCH] =?UTF-8?q?se=20agreg=C3=B3=20columna=20AplicaCP,=20liga?=
 =?UTF-8?q?=20a=20mov=20de=20almacen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Inventarios/RepEntregaAlmacenRuta.aspx    | 59 ++++++++++++++++++-----
 Inventarios/RepEntregaAlmacenRuta.aspx.cs | 23 +++++----
 2 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/Inventarios/RepEntregaAlmacenRuta.aspx b/Inventarios/RepEntregaAlmacenRuta.aspx
index f2d14a180..22b756e5f 100644
--- a/Inventarios/RepEntregaAlmacenRuta.aspx
+++ b/Inventarios/RepEntregaAlmacenRuta.aspx
@@ -99,7 +99,7 @@
                 <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GVDatos.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
             </div>
             <asp:GridView ID="GVDatos" runat="server" 
-                DataKeyNames="CveEntregaAlmacen,Estatus,CveCliente,CveDireccionOrigen,CveDireccionDestino,CveCamion,CveChofer,FechaEntrega,CveAlmacen,Tipo,AplicaCP,RFCReceptor,RFCEmisor,CveTimbre,CvePAC,FolioFiscal,  TimbreTipoDocto,CveMovimiento,FechaLlegada,CveCamionRemolque1,CveCamionRemolque2,Distancia,ConfigCartaPorte,SerieFolio,DireccionOrigen,Direccion"
+                DataKeyNames="CveEntregaAlmacen,Estatus,CveCliente,CveDireccionOrigen,CveDireccionDestino,CveCamion,CveChofer,FechaEntrega,CveAlmacen,Tipo,AplicaCP,RFCReceptor,RFCEmisor,CveTimbre,CvePAC,FolioFiscal,TimbreTipoDocto,CveMovimiento,FechaLlegada,CveCamionRemolque1,CveCamionRemolque2,Distancia,ConfigCartaPorte,SerieFolio,DireccionOrigen,Direccion"
                 AutoGenerateColumns="False" EmptyDataText="No se encontraron Registros con los filtros especificados" CssClass="table table-striped table-advance table-hover Widthall mysmallbtn ScrollAD" data-sort="true" GridLines="None"
                 EmptyDataRowStyle-HorizontalAlign="Center" OnRowDataBound="GVDatos_RowDataBound">
                 <Columns>
@@ -108,17 +108,42 @@
                         <ItemTemplate>
                             <asp:Label ID="LtTipo" runat="server" Text='<%# Eval("TipoDescripcion") %>'></asp:Label>
                         </ItemTemplate>
+                        <HeaderStyle HorizontalAlign="Left" />
+                        <ItemStyle HorizontalAlign="Left" />
+                    </asp:TemplateField>                    
+                     <asp:TemplateField  ItemStyle-HorizontalAlign="Left"  HeaderStyle-HorizontalAlign="Left" HeaderText="CP">
+                        <ItemTemplate>
+                            <asp:Literal ID="LtCP" runat="server" Text='<%#  Eval("AplicaCP").ToString()=="True"?"Si":"No"   %>'></asp:Literal>
+                        </ItemTemplate>
+                         <HeaderStyle HorizontalAlign="Left" />
+                         <ItemStyle HorizontalAlign="Left" />
                     </asp:TemplateField>
-
-                    <asp:BoundField DataField="SubProyecto" HeaderText="Sucursal" ItemStyle-Width="15%" ItemStyle-HorizontalAlign="Left" />
+                    <asp:BoundField DataField="SubProyecto" HeaderText="Sucursal" ItemStyle-Width="15%" ItemStyle-HorizontalAlign="Left" >                                                        
+                    <ItemStyle HorizontalAlign="Left" Width="15%" />
+                    </asp:BoundField>
                                                         
-                    <asp:BoundField DataField="SerieFolio" HeaderText="Folio"  ItemStyle-HorizontalAlign="Left" />
-                    <asp:BoundField DataField="Nombre" HeaderText="Cliente"  ItemStyle-HorizontalAlign="Left" />
-                    <asp:BoundField DataField="Chofer" HeaderText="Operador"   ItemStyle-HorizontalAlign="Left" />
-                     <asp:BoundField DataField="Unidad" HeaderText="Unidad"   ItemStyle-HorizontalAlign="Left" />
-                    <asp:BoundField DataField="EstatusStr" HeaderText="Estatus" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Left" />
+                    <asp:BoundField DataField="SerieFolio" HeaderText="Folio"  ItemStyle-HorizontalAlign="Left" >
+                    <ItemStyle HorizontalAlign="Left" />
+                    </asp:BoundField>
+                    <asp:BoundField DataField="Nombre" HeaderText="Cliente"  ItemStyle-HorizontalAlign="Left" >
+                    <ItemStyle HorizontalAlign="Left" />
+                    </asp:BoundField>
+                    <asp:HyperLinkField DataTextField="FolioAlmacen"  HeaderText="Folio Alm" DataNavigateUrlFormatString="/Inventarios/EntradasSalidas.aspx?CveMovimiento={0}" DataNavigateUrlFields="CveMovimiento" ControlStyle-CssClass="Texto"  ItemStyle-HorizontalAlign="Left" />
+                    <asp:BoundField DataField="Chofer" HeaderText="Operador"   ItemStyle-HorizontalAlign="Left" >
+                     <ItemStyle HorizontalAlign="Left" />
+                    </asp:BoundField>
+                     <asp:BoundField DataField="Unidad" HeaderText="Unidad" ItemStyle-HorizontalAlign="Left" >
+                    <ItemStyle HorizontalAlign="Left" />
+                    </asp:BoundField>
+                    <asp:BoundField DataField="EstatusStr" HeaderText="Estatus" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Left" >
 
-                    <asp:BoundField DataField="FechaEntrega" HeaderText="Fecha Entrega" ItemStyle-Width="4%" DataFormatString="{0:dd/MM/yyyy}" ItemStyle-HorizontalAlign="Center" />
+                    <ItemStyle HorizontalAlign="Left" Width="10%" />
+                    </asp:BoundField>
+
+                    <asp:BoundField DataField="FechaEntrega" HeaderText="Fecha Entrega" ItemStyle-Width="4%" DataFormatString="{0:dd/MM/yyyy}" ItemStyle-HorizontalAlign="Center" >
+                    
+                     <ItemStyle HorizontalAlign="Center" Width="4%" />
+                    </asp:BoundField>
                     
                      <asp:TemplateField  ItemStyle-Width="75px"  ItemStyle-HorizontalAlign="Left" HeaderStyle-HorizontalAlign="Left" HeaderText="Opciones">
                         <ItemTemplate>
@@ -126,6 +151,8 @@
                             <asp:LinkButton ID="LnkTimbrar" runat="server" OnClick="LnkTimbrar_Click" AlternateText="Timbrar" ToolTip="Timbrar"   CausesValidation="False" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-external-link'></i>" />                                                        
                             <asp:LinkButton ID="LnkCancelaTimbre" runat="server" OnClick="LnkCancelaTimbre_Click" AlternateText="Cancelar timbre" ToolTip="Cancelar timbre"   CausesValidation="False" CssClass="btn btn-circle btn-sm red" Text="<i class='fa fa-times'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Confirmar cancelación?" data-btn-ok-label="si" />                                                        
                         </ItemTemplate>
+                         <HeaderStyle HorizontalAlign="Left" />
+                         <ItemStyle HorizontalAlign="Left" Width="75px" />
                     </asp:TemplateField>
 
                       <asp:TemplateField ItemStyle-Width="50px" ItemStyle-HorizontalAlign="Left" HeaderStyle-HorizontalAlign="Center" HeaderText="Direcciones"  Visible="false">
@@ -133,13 +160,19 @@
                             <asp:LinkButton ID="LnkEditarDirOrigen" Visible="false" runat="server" OnClick="EditDireccionOrigen_Click" AlternateText="Editar" ToolTip="Actualzar dirección Origen"   CausesValidation="False" CssClass="btn btn-circle btn-sm blue" Text="<i class='fa fa-location-arrow'></i>" />                                                        
                             <asp:LinkButton ID="LnkEditarDirDestino" Visible="false" runat="server" OnClick="EditDireccionDestino_Click" AlternateText="Editar" ToolTip="Actualziar Dierccion Destino"   CausesValidation="False" CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-location-arrow'></i>" />                                                             
                         </ItemTemplate>
+                          <HeaderStyle HorizontalAlign="Center" />
+                          <ItemStyle HorizontalAlign="Left" Width="50px" />
+                    </asp:TemplateField>
+                    <asp:TemplateField HeaderText="PDF">                       
+                        <ItemTemplate> 
+                            <asp:HyperLink ID="HplPDF" Target="_blank" runat="server" ><i class='fa fa-file-pdf-o'></i></asp:HyperLink>                         
+                            <asp:HyperLink ID="HplXML" Target="_blank" runat="server" ><i class='fa fa-file-code-o'></i></asp:HyperLink>
+                        </ItemTemplate>
+                        <ItemStyle HorizontalAlign="Center" Width="4%" />
                     </asp:TemplateField>
 
-
-                     <asp:BoundField DataField="Estatus" HeaderText="PDF" ItemStyle-Width="4%"  ItemStyle-HorizontalAlign="Center" Visible="true"  />
-                    <asp:BoundField DataField="Estatus" HeaderText="XML" ItemStyle-Width="4%"  ItemStyle-HorizontalAlign="Center" Visible="true"  />
-
                 </Columns>
+                <EmptyDataRowStyle HorizontalAlign="Center" />
             </asp:GridView>
         </ContentTemplate>
     </asp:UpdatePanel>
diff --git a/Inventarios/RepEntregaAlmacenRuta.aspx.cs b/Inventarios/RepEntregaAlmacenRuta.aspx.cs
index 4e57dc105..1d2ff4eec 100644
--- a/Inventarios/RepEntregaAlmacenRuta.aspx.cs
+++ b/Inventarios/RepEntregaAlmacenRuta.aspx.cs
@@ -324,7 +324,7 @@ public partial class General_RepEntregaAlmacenRuta : ClsPaginas
     {
 
         TxtFechaI.Text = DateTime.Now.AddDays(-1).ToString("dd/MM/yyyy");
-        TxtFechaF.Text = DateTime.Now.ToString("dd/MM/yyyy");
+        TxtFechaF.Text = DateTime.Now.AddDays(3).ToString("dd/MM/yyyy");
     }
     #endregion
 
@@ -634,23 +634,26 @@ public partial class General_RepEntregaAlmacenRuta : ClsPaginas
 
                 if (bool.Parse(e.Row.DataKey("AplicaCP")))
                 {
-                    e.Row.Cells[10].Text = "<a CssClass='btn btn-circle btn-sm blue' target= '_blank' href=\"/Compras/PopUpVerFactura.aspx?P=" + Extensiones.ModExtensiones.Encripta(String.Format("OP=CARPOTIMBRE&CVETIMBRE={0}", e.Row.DataKey("CveTimbre"))) + "\" ><i class='fa fa-file-pdf-o'></i></a>";
+                    if (e.Row.FCHyperLink("HplPDF") != null)
+                        e.Row.FCHyperLink("HplPDF").NavigateUrl  =  "/Compras/PopUpVerFactura.aspx?P=" + Extensiones.ModExtensiones.Encripta(String.Format("OP=CARPOTIMBRE&CVETIMBRE={0}", e.Row.DataKey("CveTimbre")))  ;
                 }
                 else
                 {
-                    e.Row.Cells[10].Text = "<a CssClass='btn btn-circle btn-sm blue' target= '_blank' href=\"/Compras/PopUpVerFactura.aspx?P=" + Extensiones.ModExtensiones.Encripta(String.Format("OP=CARPO&CVETIMBRE={0}", e.Row.DataKey("CveTimbre"))) + "\" ><i class='fa fa-file-pdf-o'></i></a>";
+                    if (e.Row.FCHyperLink("HplPDF")!= null)  
+                        e.Row.FCHyperLink("HplPDF").NavigateUrl =  "/Compras/PopUpVerFactura.aspx?P=" + Extensiones.ModExtensiones.Encripta(String.Format("OP=CARPO&CVETIMBRE={0}", e.Row.DataKey("CveTimbre")));
                 }
 
-                string ArchivoXML = String.Format("{0}/XML/{1}/{2}.xml", UsuarioActual.Empresa.Ruta, e.Row.DataKey("TimbreTipoDocto"), e.Row.DataKey("SerieFolio"));
+                //string ArchivoXML = String.Format("{0}/XML/{1}/{2}.xml", UsuarioActual.Empresa.Ruta, e.Row.DataKey("TimbreTipoDocto"), e.Row.DataKey("SerieFolio"));
 
-                if (File.Exists(ArchivoXML))
-                {
-                    e.Row.Cells[11].Text = "<a CssClass='btn btn-circle btn-sm blue' target= '_blank' href=\"/Compras/PopUpVerFactura.aspx?P=" + Extensiones.ModExtensiones.Encripta(String.Format("OP=DesXmlTra&CVEMOVIMIENTO={0}&EXT={1}&FOLIO={2}&TIPODOCTO={3}", -1, "XML", e.Row.DataKey("SerieFolio"), e.Row.DataKey("TimbreTipoDocto"))) + "\" ><i class='fa fa-file-code-o'></i></a>";
-                }
+                //if (File.Exists(ArchivoXML))
+                //{
+                //    e.Row.Cells[12].Text = "<a CssClass='btn btn-circle btn-sm blue' target= '_blank' href=\"/Compras/PopUpVerFactura.aspx?P=" + Extensiones.ModExtensiones.Encripta(String.Format("OP=DesXmlTra&CVEMOVIMIENTO={0}&EXT={1}&FOLIO={2}&TIPODOCTO={3}", -1, "XML", e.Row.DataKey("SerieFolio"), e.Row.DataKey("TimbreTipoDocto"))) + "\" ><i class='fa fa-file-code-o'></i></a>";
+                //}
 
-            }else
+            }
+            else
             {
-                e.Row.Cells[10].Text = "";
+                e.Row.Cells[11].Text = "";
             }
 
             if (e.Row.DataKey("Estatus").ToEntero() == 2)