entrega interna ahora esta en modal en vez de pop up
This commit is contained in:
Antonio Gonzalez
@@ -65,11 +65,15 @@
|
||||
<ul class="list-inline">
|
||||
<li>Cliente:
|
||||
|
||||
|
||||
|
||||
<ADS:Dropdownlost ID="DdlClientes" CssClassDdl="select2me" runat="server" CssStyle="width: 350px;" DataTextField="NombreComercial" Onselectedindexchange="DdlCliente_SelectedIndexChanged" DataValueField="CveCliente"></ADS:Dropdownlost>
|
||||
<%--<asp:DropDownList ID="DdlClientes" runat="server" DataValueField="CveCliente" DataTextField="Nombre" OnSelectedIndexChanged="DdlCliente_SelectedIndexChanged" AutoPostBack="true" CssClass="form-control input-sm select2me" Width="350px"></asp:DropDownList>--%>
|
||||
</li>
|
||||
<li>Serie-Folio:
|
||||
|
||||
|
||||
|
||||
<asp:DropDownList ID="DdlFolio" runat="server" DataValueField="CveVenta" DataTextField="SerieFolio" CssClass="form-control input-sm select2me" Width="250px"></asp:DropDownList>
|
||||
<asp:RequiredFieldValidator ID="RFVFolio" runat="server" ControlToValidate="DdlFolio" InitialValue="-1" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Folio''</b> es necesario, por favor ingréselo." ValidationGroup="GrpBuscar"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="VCEFolio" runat="server" HighlightCssClass="vco" TargetControlID="RFVFolio" Width="300px"></ajax:ValidatorCalloutExtender>
|
||||
@@ -238,10 +242,10 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<div style="display:none;">
|
||||
<asp:RadioButton id="RbSinEntrega" runat="server" OnCheckedChanged="EntregaRadioGroup_Click" Width="33%" GroupName="EntregaRadioGroup" Text="Sin Entrega" AutoPostBack="true"></asp:RadioButton>
|
||||
<asp:RadioButton id="RbEntregaInterna" runat="server" OnCheckedChanged="EntregaRadioGroup_Click" Width="33%" GroupName="EntregaRadioGroup" Text="Entrega Interna" AutoPostBack="true"></asp:RadioButton>
|
||||
<asp:RadioButton id="RbEntregaExterna" runat="server" OnCheckedChanged="EntregaRadioGroup_Click" Width="33%" GroupName="EntregaRadioGroup" Text="Entrega Externa" AutoPostBack="true"></asp:RadioButton>
|
||||
<div >
|
||||
<asp:RadioButton ID="RbSinEntrega" runat="server" OnCheckedChanged="EntregaRadioGroup_Click" Width="33%" GroupName="EntregaRadioGroup" Text="Sin Entrega" AutoPostBack="true"></asp:RadioButton>
|
||||
<asp:RadioButton ID="RbEntregaInterna" runat="server" OnCheckedChanged="EntregaRadioGroup_Click" Width="33%" GroupName="EntregaRadioGroup" Text="Entrega Interna" AutoPostBack="true"></asp:RadioButton>
|
||||
<asp:RadioButton ID="RbEntregaExterna" runat="server" OnCheckedChanged="EntregaRadioGroup_Click" Width="33%" GroupName="EntregaRadioGroup" Text="Entrega Externa" AutoPostBack="true"></asp:RadioButton>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -281,6 +285,8 @@
|
||||
</code>
|
||||
|
||||
|
||||
|
||||
|
||||
<b>Sucursal:</b>
|
||||
<asp:DropDownList ID="DdlSubProyectos" runat="server" CssClass="form-control input-sm select2me" DataTextField="SubProyecto" DataValueField="CveSubProyecto" Width="90px"></asp:DropDownList>
|
||||
|
||||
@@ -712,6 +718,7 @@
|
||||
<div class="col-md-5" style="text-align: right;">
|
||||
Cantidad
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-7">
|
||||
<asp:TextBox ClientIDMode="Static" ID="TxtCantidadEspecial" Text="" runat="server"></asp:TextBox>
|
||||
@@ -754,6 +761,8 @@
|
||||
<asp:Panel runat="server" DefaultButton="BtnGuardarCantidadEspecialDiv">
|
||||
Cant.:
|
||||
|
||||
|
||||
|
||||
<asp:TextBox ClientIDMode="Static" ID="TxtCantidadEspecialDiv" Text="1" onfocus="this.select();" Width="50px" runat="server"></asp:TextBox>
|
||||
<ajax:FilteredTextBoxExtender ID="SoloNumeros" runat="server" TargetControlID="TxtCantidadEspecialDiv" FilterType="Custom, Numbers" ValidChars="." />
|
||||
<br />
|
||||
@@ -810,6 +819,97 @@
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
|
||||
<div id="ModalPaqueteriaInterna" class="modal ADS fade" role="dialog">
|
||||
<asp:UpdatePanel ID="UpPaqInterna" class="modal-dialog rowpadding" tabindex="-1" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h4 class="modal-title">Paqueterías Interna</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<table class="Widthall">
|
||||
|
||||
|
||||
<tr runat="server" id="RowPaqueteria" align="left" visible="true">
|
||||
<td class="text-right"><b>Estatus:</b></td>
|
||||
<td>
|
||||
<asp:DropDownList ID="DdlEstatus" runat="server" Class="table-group-action-input form-control input-inline input-sm select2me" Width="200px">
|
||||
<%-- <asp:ListItem Selected="False" Text="Seleccione" Value="-1"></asp:ListItem>--%>
|
||||
<asp:ListItem Selected="True" Text="En Proceso" Value="1"></asp:ListItem>
|
||||
<asp:ListItem Selected="False" Text="Confirmado por Proveedor" Value="2"></asp:ListItem>
|
||||
<asp:ListItem Selected="False" Text="Entregado" Value="3"></asp:ListItem>
|
||||
<asp:ListItem Selected="False" Text="Confirmado por Cliente" Value="4"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
<%-- <asp:RequiredFieldValidator ID="RFVDdlEstatus" runat="server" ControlToValidate="DdlEstatus" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Estatus''</b> es necesario." InitialValue="-1" ValidationGroup="GrpCrearGuia"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="VCEDdlEstatus" runat="server" HighlightCssClass="vco" TargetControlID="RFVDdlEstatus" Width="250px"></ajax:ValidatorCalloutExtender>--%>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
<tr runat="server" id="RowRastreo" align="left" visible="true">
|
||||
<td class="text-right" style="width: 140px"><b>Fecha:</b></td>
|
||||
<td style="width: 200px">
|
||||
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 117px !important; padding: 0px;">
|
||||
<asp:TextBox ID="TxtFechaPaqInterna" runat="server" CssClass="form-control" Width="170px" Height="30px" Style="padding: 0px" CausesValidation="true" MaxLength="10"></asp:TextBox>
|
||||
<span class="input-group-btn ">
|
||||
<asp:LinkButton ID="LnkFechaInterna" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server" Width="30px"></asp:LinkButton>
|
||||
</span>
|
||||
<ajax:MaskedEditExtender ID="MeFechaPaqInterna" runat="server" TargetControlID="TxtFechaPaqInterna" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CalendarExtender1" TargetControlID="TxtFechaPaqInterna" PopupButtonID="LnkFechaInterna" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
|
||||
<asp:RequiredFieldValidator ID="RfvFechaPaqInterna" runat="server" ControlToValidate="TxtFechaPaqInterna" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha''</b> es necesario." ValidationGroup="GrpCrearGuia"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="VCEFecha" runat="server" HighlightCssClass="vco" TargetControlID="RfvFechaPaqInterna" Width="250px"></ajax:ValidatorCalloutExtender>
|
||||
|
||||
</div>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
<tr runat="server" id="RowFechas" align="left" visible="true">
|
||||
|
||||
<td class="text-right" style="width: 140px;"><b>Fecha Estimada:</b></td>
|
||||
<td style="width: 200px">
|
||||
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 117px !important; padding: 0px;">
|
||||
<asp:TextBox ID="TxtFechaEstimada" runat="server" CssClass="form-control" Width="170px" Height="30px" Style="padding: 0px"></asp:TextBox>
|
||||
<span class="input-group-btn ">
|
||||
<asp:LinkButton ID="LnkFechaEstimada" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server" Width="30px"></asp:LinkButton>
|
||||
</span>
|
||||
<ajax:MaskedEditExtender ID="MEEFechaEstimada" runat="server" TargetControlID="TxtFechaEstimada" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CEFechaEstimada" TargetControlID="TxtFechaEstimada" PopupButtonID="LnkFechaEstimada" PopupPosition="BottomLeft" Enabled="True"></ajax:CalendarExtender>
|
||||
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr runat="server" id="RowDimensiones" align="left" visible="true">
|
||||
<td class="text-right" style="width: 140px"><b># Cajas:</b></td>
|
||||
<td style="width: 200px">
|
||||
<asp:TextBox ID="TxtNoCajas" runat="server" CssClass="form-control" Width="200px" Height="30px" Style="padding: 0px"></asp:TextBox>
|
||||
<ajax:MaskedEditExtender ID="MEENoCajas" runat="server" TargetControlID="TxtNoCajas" Mask="9999" MaskType="Number" AcceptNegative="None"></ajax:MaskedEditExtender>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
<tr runat="server" id="RowCajas" align="left" visible="true">
|
||||
<td class="text-right" align="left" valign="top" style="width: 140px; padding-top: 4px;"><b>Observaciones:</b></td>
|
||||
<td style="width: 200px;">
|
||||
<asp:TextBox ID="TxtObservacionesPaqInterna" runat="server" CssClass="form-control MultiLineTextBox" Width="200px" Height="60px" Style="padding: 0px" TextMode="MultiLine"></asp:TextBox>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr></tr>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<asp:Button ID="BtnGuiaInterna" runat="server" ClientIDMode="Static" Text="Aplicar" data-dismiss="modal" CssClass="btn btn-primary" />
|
||||
<button id="BtnCancelarGuiaInterna" type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content7" ContentPlaceHolderID="JS" runat="Server">
|
||||
<script src="/Metronic/assets/global/plugins/jquery.pulsate.min.js"></script>
|
||||
|
||||
@@ -324,7 +324,7 @@ Partial Class Inventarios_EntregaAlmacen
|
||||
CargaPendientes()
|
||||
|
||||
|
||||
|
||||
LimpiaCampos()
|
||||
End Sub
|
||||
|
||||
#End Region
|
||||
@@ -2414,6 +2414,9 @@ Partial Class Inventarios_EntregaAlmacen
|
||||
End Try
|
||||
|
||||
If Not ErrorMovInv Then
|
||||
If RbEntregaInterna.Checked Then
|
||||
AgregarNuevaGuia()
|
||||
End If
|
||||
ObjInventario.Commit()
|
||||
RegistraScript("playsonidito('beep-07.wav')")
|
||||
Dim Msg As New StringBuilder
|
||||
@@ -2669,6 +2672,9 @@ Partial Class Inventarios_EntregaAlmacen
|
||||
|
||||
|
||||
If Not ErrorMovInv Then
|
||||
If RbEntregaInterna.Checked Then
|
||||
AgregarNuevaGuia()
|
||||
End If
|
||||
ObjInventario.Commit()
|
||||
RegistraScript("playsonidito('beep-07.wav')")
|
||||
|
||||
@@ -3112,11 +3118,53 @@ Partial Class Inventarios_EntregaAlmacen
|
||||
If RbEntregaExterna.Checked Then
|
||||
RegistraScript("AbrirVentana('/General/PopUpPaqueteriasGuias.aspx',800,547,'N')")
|
||||
ElseIf RbEntregaInterna.Checked Then
|
||||
RegistraScript($"AbrirVentana('/General/PopUpPaqueteriasGuiasInternas.aspx?CveVenta={CveVentaSurtir}&CveSubProyecto={CveSubProyecto}',800,547,'N')")
|
||||
RegistraScript("$('#ModalPaqueteriaInterna').modal('show')")
|
||||
'RegistraScript($"AbrirVentana('/General/PopUpPaqueteriasGuiasInternas.aspx?CveVenta={CveVentaSurtir}&CveSubProyecto={CveSubProyecto}',800,547,'N')")
|
||||
'CveVentaSurtir
|
||||
ElseIf RbSinEntrega.Checked Then
|
||||
LimpiaCampos()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Protected Sub AgregarNuevaGuia()
|
||||
Dim ObjGeneral As ClsGenerales = New ClsGenerales()
|
||||
Dim TieneError As Boolean = False
|
||||
ObjGeneral.IniciaTransacSQL()
|
||||
Dim CveEstatus As Integer = DdlEstatus.SelectedValue.ToEntero()
|
||||
Dim Fecha As String = TxtFechaPaqInterna.Text
|
||||
Dim FechaEstimada As String = If(TxtFechaEstimada.Text = "", "-1", TxtFechaEstimada.Text)
|
||||
Dim NoCajas As Integer = TxtNoCajas.Text.ToEntero()
|
||||
Dim Observaciones As String = TxtObservacionesPaqInterna.Text
|
||||
Dim CvePaqueteriaGuia As Integer = ObjGeneral.AddPaqueteriasGuias(-1, -1, CveEstatus, CveSubProyecto, Fecha, "-1", "-1", NoCajas, 0.00, "-1", FechaEstimada, Observaciones, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, EsEntregaInterna:=True)
|
||||
|
||||
If CvePaqueteriaGuia > 0 Then
|
||||
|
||||
If CveVentaSurtir > 0 OrElse CveSubProyecto > 0 Then
|
||||
TieneError = Not ObjGeneral.AddPaqueteriasGuiasDetalles(CvePaqueteriaGuia, CveVentaSurtir, -1, CveSubProyecto, -1)
|
||||
End If
|
||||
Else
|
||||
TieneError = True
|
||||
End If
|
||||
|
||||
If TieneError Then
|
||||
ObjGeneral.RollBack()
|
||||
Else
|
||||
ObjGeneral.Commit()
|
||||
LimpiaCampos()
|
||||
Alert("Se agrego la paquetería guía correctamente")
|
||||
End If
|
||||
|
||||
ObjGeneral.Dispose()
|
||||
End Sub
|
||||
|
||||
Protected Sub LimpiaCampos()
|
||||
DdlEstatus.SelectedValue = "1"
|
||||
TxtFechaPaqInterna.Text = ""
|
||||
TxtFechaEstimada.Text = ""
|
||||
TxtNoCajas.Text = ""
|
||||
TxtObservacionesPaqInterna.Text = ""
|
||||
UpPaqInterna.Update()
|
||||
End Sub
|
||||
#End Region
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user