From 1334502dc743f6192198f5bd334660c56409c152 Mon Sep 17 00:00:00 2001
From: rrene <rene.molina@adssistemas.mx>
Date: Wed, 1 Mar 2023 13:15:10 -0700
Subject: [PATCH] =?UTF-8?q?--acomodo=20de=20lector=20de=20c=C3=B3digo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Inventarios/RecepcionAlmacen.aspx    | 44 ++++++++++++----------------
 Inventarios/RecepcionAlmacen.aspx.vb |  2 +-
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/Inventarios/RecepcionAlmacen.aspx b/Inventarios/RecepcionAlmacen.aspx
index 35fdb222e..7bdbdd133 100644
--- a/Inventarios/RecepcionAlmacen.aspx
+++ b/Inventarios/RecepcionAlmacen.aspx
@@ -461,25 +461,12 @@
             </div>
             <div class="actions">
                 <div class="btn-group">
-                </div>
-            </div>
-            <div class="tools">
-                <a href="javascript:;" class="collapse"></a>
-            </div>
-        </div>
-        <div class="portlet-body form-horizontal form-row-sepe formnombottom">
-
-            <asp:UpdatePanel ID="UPInv" runat="server" UpdateMode="Conditional">
-                <ContentTemplate>
+                    
                     <asp:UpdatePanel runat="server">
                         <ContentTemplate>
-                            <div class="row" runat="server" id="DivCodigoSeriePS" clientidmode="Static" visible="false">
-                                <div class="col-md-4 pull-right">
-                                    <table style="float: right;">
-                                        <tr>
-                                            <%-- <td>
-                                                        <asp:TextBox Width="35px" Text="1" ID="TxtCantidadCodigoBarras" runat="server" />
-                                                    </td>--%>
+                            <div  runat="server" id="DivCodigoSeriePS" clientidmode="Static" visible="false">                               
+                                    <table >
+                                        <tr>                                           
                                             <td><i class="fa fa-barcode" style="font-size: 1.8em; margin-top: 8px;" aria-hidden="true" data-toggle="tooltip" title="Código Barras"></i></td>
                                             <td>
                                                 <asp:Panel ID="PanelCodigo" runat="server" DefaultButton="BtnCodigoPS">
@@ -494,15 +481,22 @@
                                                 </asp:Panel>
                                             </td>
                                         </tr>
-                                    </table>
-                                </div>
+                                    </table>                                
                             </div>
                         </ContentTemplate>
                     </asp:UpdatePanel>
-
+                </div>
+            </div>
+            <div class="tools">
+                <a href="javascript:;" class="collapse"></a>
+            </div>
+        </div>
+        <div class="portlet-body form-horizontal form-row-sepe formnombottom">
+             <asp:UpdatePanel ID="UPInv" runat="server" UpdateMode="Conditional">
+                <ContentTemplate>
                     <asp:GridView ID="GvInv" runat="server" EmptyDataText="Aun no hay registros." AutoGenerateColumns="False" ShowFooter="True" ShowHeader="true" ShowHeaderWhenEmpty="True"
                         DataKeyNames="EntregaDirecta,Consec,CodigoBarras,CvePS,CveUM,PU,CantidadC,CantidadF,UM,PS,CveCompraDetalle,CveOrdenCompraDetalle,PUExtranjero,AplicaSerieLote,CveClasificacion,Codigo,CveVentaDetalle,CostoIndirecto,CveTamaño,Lote,AplicaSeccion,AplicaLote,AplicaCaducidad,AplicaSerie" HeaderStyle-CssClass="Titulos" RowStyle-Height="25px" CssClass="table table-striped table-hover Widthall ScrollAD mysmallbtn" data-heighterror="450" data-freezerows="1" GridLines="None">
-                        <HeaderStyle Height="58px" />
+                        <HeaderStyle Height="28px" />
                         <Columns>
                             <asp:TemplateField>
                                 <ItemTemplate>
@@ -513,17 +507,17 @@
                             <asp:BoundField HeaderText="Original" DataField="CantidadC" DataFormatString="{0:#,##0.####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" />
                             <asp:BoundField HeaderText="Recibidó" DataField="CantidadS" DataFormatString="{0:#,##0.####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" Visible="false" />
                             <asp:BoundField HeaderText="Por Recibir" DataField="CantidadF" DataFormatString="{0:#,##0.##}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" Visible="false" />
-                            <asp:TemplateField HeaderText="Cant. a Recibir" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Right">
+                            <asp:TemplateField HeaderText="Cant. a Recibir" ItemStyle-Width="12.5%">
                                 <ItemTemplate>
-                                    <asp:TextBox ID="TbCantidadF" runat="server" Width="60px" Mask="9,999.99" Text="0"></asp:TextBox>
+                                    <asp:TextBox ID="TbCantidadF" runat="server" Width="50px" Mask="9,999.99" Text="0" Style="text-align: right; "></asp:TextBox>
                                     <ajax:FilteredTextBoxExtender ID="SoloNumerosCantidadF" runat="server" TargetControlID="TbCantidadF" FilterType="Numbers,custom" ValidChars="." />
                                     <asp:Button Text="Serie" ID="BtnSerie" OnClick="BtnSerie_Click" CssClass="btn btn-primary btn-sm" runat="server" Visible="false" />
                                     <asp:Button Text="Lote" ID="BtnLote" CssClass="btn btn-primary" OnClick="BtnLote_Click" runat="server" Visible="false" />
                                 </ItemTemplate>
                             </asp:TemplateField>
                             <asp:BoundField HeaderText="Unidad" DataField="UM" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="7.5%" />
-                            <asp:HyperLinkField HeaderText="Producto o Servicio" DataTextField="CodigoPS" DataNavigateUrlFields="CvePS" DataNavigateUrlFormatString="/Ventas/ProductosServicios.aspx?CvePS={0}" Target="_blank" ItemStyle-HorizontalAlign="Left" />
-                            <asp:BoundField HeaderText="SubProyecto" DataField="SubProyecto" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="7.5%" />
+                            <asp:HyperLinkField HeaderText="Producto" DataTextField="CodigoPS" DataNavigateUrlFields="CvePS" DataNavigateUrlFormatString="/Ventas/ProductosServicios.aspx?CvePS={0}" Target="_blank" ItemStyle-HorizontalAlign="Left" />
+                            <asp:BoundField HeaderText="SubProyecto" DataField="SubProyecto" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="10%" />
                             <asp:BoundField HeaderText="P.U." DataField="PU" DataFormatString="{0:#,###.####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="7.5%" />
                             <asp:BoundField HeaderText="C.I." DataField="CostoIndirecto" DataFormatString="{0:###.####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="7.5%" />
                             <asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right" FooterStyle-HorizontalAlign="Right" ItemStyle-Width="7.5%">
diff --git a/Inventarios/RecepcionAlmacen.aspx.vb b/Inventarios/RecepcionAlmacen.aspx.vb
index b1237c243..e9ddbbfe0 100644
--- a/Inventarios/RecepcionAlmacen.aspx.vb
+++ b/Inventarios/RecepcionAlmacen.aspx.vb
@@ -1478,7 +1478,7 @@ Partial Class Inventarios_RecepcionAlmacen
                         e.Row.FCCheckBox("cbInv").Enabled = True
 
                         If UsuarioActual.TienePermisoProceso(345) Then 'carga la cantidad con el rol AD
-                            e.Row.FCTextBox("TbCantidadF").Text = e.Row.DBCampo("CantidadF").FormatoNumero
+                            e.Row.FCTextBox("TbCantidadF").Text = e.Row.DBCampo("CantidadF").ToDecimal().ToString("{#,###.##}")
                         End If
                     End If
                 End If