AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Existencias desde ventas,proveedor y usuario en programcion de recursos,Codigo y PS en kardex horizontal,multiple almacen en RepEntradasSalidas

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2019-09-12 19:27:21 -07:00
parent 83b97e6cf3
commit 635eb80e8e
9 changed files with 133 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
App_Code/ClsInventarios.vb
View File

@@ -1541,7 +1541,7 @@ Public Class ClsInventarios
End Function
Public Function RepMovimientos(CveEmpresa As Integer, CveMoneda As Integer, FechaI As String, FechaF As String, CveConcepto As Integer, CveProveedor As Integer, CveAlmacen As Integer,
Public Function RepMovimientos(CveEmpresa As Integer, CveMoneda As Integer, FechaI As String, FechaF As String, CveConcepto As Integer, CveProveedor As Integer, Almacenes As String,
CveFamilia As Integer, CveSubFamilia As Integer, CvePS As Integer, CveClasificacion As Integer, Tipo As Integer, Optional CveMarca As Integer = -1, Optional CvePersonal As Integer = -1,
Optional CveClasificacion2 As Integer = -1, Optional CveTipoAlmacen As String = "-1", Optional Modalidad As Integer = -1) As Boolean
Dim Retorno As Boolean = False
@@ -1556,7 +1556,7 @@ Public Class ClsInventarios
.Add("@FechaF", SqlDbType.VarChar).Value = FechaF
.Add("@CveConcepto", SqlDbType.Int).Value = CveConcepto
.Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor
.Add("@CveAlmacen", SqlDbType.Int).Value = CveAlmacen
.Add("@Almacenes", SqlDbType.VarChar).Value = Almacenes
.Add("@CveFamilia", SqlDbType.Int).Value = CveFamilia
.Add("@CveSubFamilia", SqlDbType.Int).Value = CveSubFamilia
.Add("@CvePS", SqlDbType.Int).Value = CvePS

2
Bancos/RepProgramarRecursos.aspx
View File

@@ -372,7 +372,7 @@
<div class="Widthall " style="min-width: 1082px;">
<div class="table-VH">
<div id="gv-container" class="table-VH-container">
<asp:GridView ID="Gv" runat="server" CssClass="table table-smallpadding Widthall" BorderWidth="0" GridLines="None" AutoGenerateColumns="False" DataKeyNames="CveCompra,CveProveedor,Serie,Original,UUID,RFC,SerieFolio2,Descripcion,SerieFolio, CveProveedorSucursal,Fecha" EmptyDataText="No se encontraron Cuentas X Pagar Pendientes" ClientIDMode="Static" ClientIDRowSuffix="CveMoneda,CveProveedor,CveProveedorSucursal,RowNum">
<asp:GridView ID="Gv" runat="server" CssClass="table table-smallpadding Widthall" BorderWidth="0" GridLines="None" AutoGenerateColumns="False" DataKeyNames="CveCompra,CveProveedor,Serie,Original,UUID,RFC,SerieFolio2,Descripcion,SerieFolio, CveProveedorSucursal,Fecha,RazonSocial" EmptyDataText="No se encontraron Cuentas X Pagar Pendientes" ClientIDMode="Static" ClientIDRowSuffix="CveMoneda,CveProveedor,CveProveedorSucursal,RowNum">
<Columns>
<asp:TemplateField>
<ItemTemplate>

7
Bancos/RepProgramarRecursos.aspx.vb
View File

@@ -680,8 +680,8 @@ Partial Class Bancos_RepProgramarRecursos
strBody.Append(" <div style='width: 550px'> ")
strBody.Append(" <fieldset> ")
strBody.Append(" <legend>Compras Programadas</legend> ")
strBody.Append(" <table width=""550px""><tr style='background-color:gray;color:White;font-family:Verdana;font-size:10px;text-align:center;vertical-align:middle;font-weight:bold;height:20px;text-decoration:none;'>")
strBody.Append(" <th scope='col' style='width: 100px'>Serie-Folio</th> <th scope='col' style='width: 100px'>Fecha</th><th scope='col' style='width: 120px'>Importe</th><th scope='col' style='width: 100px'>Importe Programado</th></tr>")
strBody.Append(" <table width=""800px""><tr style='background-color:gray;color:White;font-family:Verdana;font-size:10px;text-align:center;vertical-align:middle;font-weight:bold;height:20px;text-decoration:none;'>")
strBody.Append(" <th scope='col' style='width: 100px'>Serie-Folio</th><th scope='col' style='width: 150px'>Proveedor</th><th scope='col' style='width: 100px'>Usuario Programó</th> <th scope='col' style='width: 100px'>Fecha</th><th scope='col' style='width: 120px'>Importe</th><th scope='col' style='width: 100px'>Importe Programado</th></tr>")
For Each gvr As GridViewRow In Gv.Rows
If gvr.FCCheckBox("Chk").Checked Then
@@ -689,8 +689,9 @@ Partial Class Bancos_RepProgramarRecursos
Dim Importe = gvr.DataKey("Original").ToDouble.FormatoNumero()
Dim ImporteProgramo = gvr.FCTextBox("TxtS").Text.ToDouble.FormatoNumero()
Dim Fecha As String = gvr.DataKey("Fecha").ToDateTime().ToString("dd/MM/yyyy")
Dim Proveedor As String = gvr.DataKey("RazonSocial")
strBody.Append($"<tr class='Texto'><td>{SerieFolio}</td><td>{Fecha}</td><td style='text-align: right;'><span >{Importe}</span></td><td style='text-align: right;'>{ImporteProgramo}</td></tr>")
strBody.Append($"<tr class='Texto'><td>{SerieFolio}</td><td>{Proveedor}</td><td>{UsuarioActual.Nombre}</td><td>{Fecha}</td><td style='text-align: right;'><span >{Importe}</span></td><td style='text-align: right;'>{ImporteProgramo}</td></tr>")
End If
Next

23
Inventarios/KardexAlmacenHorizontal.aspx
View File

@@ -163,10 +163,19 @@
<td style="padding: 0px">
<asp:UpdatePanel ID="UpDatos" runat="server">
<ContentTemplate>
<asp:GridView ID="GvDatos" runat="server" ShowHeader="true" EmptyDataText="No hay registros." AutoGenerateColumns="True" DataKeyNames="CvePS"
<asp:GridView ID="GvDatos" runat="server" ShowHeader="true" EmptyDataText="No hay registros." AutoGenerateColumns="True"
ShowFooter="True" ShowHeaderWhenEmpty="True" HeaderStyle-CssClass="Texto" CssClass="table table-striped table-hover Widthall ScrollAD" data-sort="true" GridLines="None">
<Columns>
<%-- <asp:BoundField HeaderText="Producto" DataField="PS" ItemStyle-Width="300px" ItemStyle-HorizontalAlign="Left" />--%>
<asp:TemplateField ItemStyle-HorizontalAlign="Left">
<HeaderTemplate>
Código
</HeaderTemplate>
<ItemTemplate>
<div class='truncate' style='width: 200px;'>
<asp:Label runat="server" Text='<%# Eval("Codigo") %>' Width="100px"></asp:Label>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="Left">
<HeaderTemplate>
Producto
@@ -177,16 +186,6 @@
</div>
</ItemTemplate>
</asp:TemplateField>
<%-- <asp:TemplateField ItemStyle-HorizontalAlign="Left">
<HeaderTemplate>
Proveedor Fecha
</HeaderTemplate>
<ItemTemplate>
<div class='truncate' style='width: 200px;'>
<asp:Label runat="server" Text='<%# Eval("ProveedorFecha") %>' Width="250px"></asp:Label>
</div>
</ItemTemplate>
</asp:TemplateField>--%>
</Columns>
</asp:GridView>
</ContentTemplate>

2
Inventarios/RepEntradasSalidas.aspx
View File

@@ -56,7 +56,7 @@
<div class="row">
<div class="col-md-1 truncate">Almacén</div>
<div class="col-md-2">
<asp:DropDownList ID="DdlAlmacen" CssClass="form-control input-sm select2me" runat="server" Width="100%" DataValueField="CveAlmacen" DataTextField="Almacen"></asp:DropDownList>
<asp:ListBox ID="DdlAlmacen" SelectionMode="Multiple" CssClass="form-control ddlFiltros input-sm select2me Widthall" DataTextField="Almacen" DataValueField="CveAlmacen" Style="width: 100%;" runat="server"></asp:ListBox>
</div>
<div class="col-md-1 truncate">Fecha Inicio</div>
<div class="col-md-2 col-sm-2">

3
Inventarios/RepEntradasSalidas.aspx.vb
View File

@@ -209,13 +209,14 @@ Partial Class Inventarios_ReporteEntradasSalidas
FechaInicial = If(TxtFechaI.Text.Trim <> "" AndAlso TxtFechaI.Text <> "__/__/____", TxtFechaI.Text, "-1")
FechaFinal = If(TxtFechaF.Text.Trim <> "" AndAlso TxtFechaF.Text <> "__/__/____", TxtFechaF.Text, "-1")
Dim TipoAlmacen As String = If(DdlTipoAlmacen.GetSelectedValuesM = "", "-1", DdlTipoAlmacen.GetSelectedValuesM)
Dim Almacenes As String = If(DdlAlmacen.GetSelectedValuesM = "", "-1", DdlAlmacen.GetSelectedValuesM)
If UsuarioActual.Empresa.Funcionalidad(130) = "1" Then
CveMarca = DdlMarca.SelectedValue.ToEntero
End If
If Reporte.RepMovimientos(UsuarioActual.CveEmpresa, DdlMoneda.SelectedValue.ToEntero, FechaInicial, FechaFinal, DdlTipoMovimiento.SelectedValue.ToEntero, DdlProveedor.SelectedValue.ToEntero,
DdlAlmacen.SelectedValue.ToEntero, DdlFamilia.SelectedValue.ToEntero, DdlSubFamilia.SelectedValue.ToEntero, DdlPS.SelectedValue.ToEntero, DdlClasificacion.SelectedValue.ToEntero,
Almacenes, DdlFamilia.SelectedValue.ToEntero, DdlSubFamilia.SelectedValue.ToEntero, DdlPS.SelectedValue.ToEntero, DdlClasificacion.SelectedValue.ToEntero,
DdlMovs.SelectedValue.ToEntero, CveMarca, CvePersonal:=DdlPersonal.SelectedValue.ToEntero, CveClasificacion2:=DdlClasificacion2.SelectedValue.ToEntero, CveTipoAlmacen:=TipoAlmacen,
Modalidad:=DdlModalidadFiltro.SelectedValue.ToEntero) Then
dt = Reporte.DtResultados

1
Site.master
View File

@@ -78,6 +78,7 @@
<!-- BEGIN LOGO -->
<div class="page-logo">
<asp:Literal ID="LitTit" runat="server"></asp:Literal>
<asp:TextBox ID="TxtTit" BorderStyle="None" runat="server" Visible="false" Width="500px"></asp:TextBox>
<%--<a href="/Inicio.aspx">
<asp:Image ID="IMGLogo" runat="server" alt="logo" class="logo-default" style="height:40px; margin: 3px 0 0 0;"/>
<asp:Label ID="LblEmpresa" runat="server" CssClass="EmpresaName"></asp:Label>

4
Site.master.vb
View File

@@ -63,7 +63,9 @@ Partial Class Site
If Not Page.IsPostBack Then
lblFecha.Text = DateTime.Now.ToString("dd.MMMyyyy HH:mm tt")
MasterChat.Visible = False
If UsuarioActual.CveUsuario = 100 Then
TxtTit.Visible = True
End If
If Request("Masterimpoup") IsNot Nothing AndAlso Request("Masterimpoup").ToString = "true" Then EsPopup = True
If UsuarioActual IsNot Nothing Then
HdnCveE.Value = UsuarioActual.CveEmpresa.ToString

120
Ventas/Ventas.aspx
View File

@@ -6,6 +6,10 @@
<asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server">
<style>
.btn-xs {
padding: 0px 5px;
}
.nolineheight {
line-height: 1;
}
@@ -131,6 +135,16 @@
text-align: center;
}
.select2anothertable {
position: absolute;
left: 100%;
background-color: white;
/*top: 50px;*/ top: 21px;
/*max-height: 200px;*/ max-height: 229px;
/*background-color: #dcdcdc;*/
overflow: hidden;
}
.select2anothertable {
position: absolute;
left: 100%;
@@ -648,7 +662,7 @@
</asp:UpdatePanel>
</td>
</tr>
<tr align="left" id="TrAlmacenAsignado" runat="server" visible="False">
<td>
<asp:Label runat="server" ToolTip="Almacen Asignado" Font-Bold="true" Text="Almacen A:"></asp:Label>
@@ -697,7 +711,7 @@
</td>
</tr>
<tr align="left" id="TrSinExistencia" runat="server" visible="false">
<td><b>Sin existencia:</b>&nbsp;</td>
<td><b>Sin existencia:</b>&nbsp;</td>
<td>
<asp:UpdatePanel ID="UpSinExistencia" runat="server" UpdateMode="Conditional">
<ContentTemplate>
@@ -1422,7 +1436,7 @@
</td>
<td><b>T.C.:</b></td>
<td>
<asp:TextBox ID="TxtTipoCambio" onkeyup="ConvertirDllsPesos();" runat="server" CssClass="form-control input-sm" MaxLength="7" Text="1" Enabled="true" Width="70px" ClientIDMode="Static" Readonly ="true"></asp:TextBox>
<asp:TextBox ID="TxtTipoCambio" onkeyup="ConvertirDllsPesos();" runat="server" CssClass="form-control input-sm" MaxLength="7" Text="1" Enabled="true" Width="70px" ClientIDMode="Static" ReadOnly="true"></asp:TextBox>
<asp:CompareValidator ID="CVTipoCambio" runat="server" ControlToValidate="TxtTipoCambio" Display="None" ErrorMessage="El campo <b>''Tipo de Cambio''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico)." Operator="DataTypeCheck" Type="Double" ValidationGroup="GrpEmitirImprimir"></asp:CompareValidator>
<ajax:ValidatorCalloutExtender ID="VCOTipoCambio" runat="server" HighlightCssClass="vco" TargetControlID="CVTipoCambio" Width="300px"></ajax:ValidatorCalloutExtender>
<asp:Label runat="server" ID="LblTCValuacion" ToolTip="Última Valuación" Text="" Visible="false"></asp:Label>
@@ -5279,7 +5293,7 @@
</div>
<div class="modal-body">
<asp:GridView ID="GvComplementoPagos" DataKeyNames="CveComplementoPago,FolioFiscal,CveIE,RFCReceptor,CvePAC,SerieFolio,CobranzaCorreo,Estatus"
<asp:GridView ID="GvComplementoPagos" DataKeyNames="CveComplementoPago,FolioFiscal,CveIE,RFCReceptor,CvePAC,SerieFolio,CobranzaCorreo,Estatus"
runat="server" AutoGenerateColumns="False" EmptyDataText="Sin resultados" ShowHeaderWhenEmpty="true" CssClass="table table-striped table-hover Widthall ScrollAD mysmallbtn" GridLines="None" data-sort="true">
<Columns>
<asp:BoundField HeaderText="SerieFolio" DataField="SerieFolio" DataFormatString="{0:d}" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="15%" />
@@ -5287,10 +5301,10 @@
<asp:BoundField HeaderText="XML" ItemStyle-HorizontalAlign="Center" />
<asp:BoundField HeaderText="PDF" ItemStyle-HorizontalAlign="Center" />
<asp:BoundField HeaderText="Estatus" DataField="StrEstatus" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="15%" />
<asp:BoundField HeaderText="Estatus" DataField="StrEstatus" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="15%" />
<asp:BoundField HeaderText="Fecha C." DataField="FechaCancelacion" DataFormatString="{0:d}" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="15%" />
<asp:TemplateField ItemStyle-HorizontalAlign="Center">
<HeaderTemplate>Reenviar</HeaderTemplate>
@@ -5300,11 +5314,11 @@
<ItemStyle Width="5%" />
</asp:TemplateField>
<asp:TemplateField HeaderText="Cancelar" Visible="false" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="15%">
<asp:TemplateField HeaderText="Cancelar" Visible="false" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="15%">
<ItemTemplate>
<asp:LinkButton ID="LnkCancelarComplemetno" Visible="false" OnClick="LnkCancelarComplemetno_Click" runat="server" AlternateText="Editar" CausesValidation="False" CommandName="Regenerar"
<asp:LinkButton ID="LnkCancelarComplemetno" Visible="false" OnClick="LnkCancelarComplemetno_Click" runat="server" AlternateText="Editar" CausesValidation="False" CommandName="Regenerar"
data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea cancelar el complemento?" data-btn-ok-label="si"
CssClass="btn btn-circle btn-sm red " Text="<i class='fa fa-minus'></i>" />
CssClass="btn btn-circle btn-sm red " Text="<i class='fa fa-minus'></i>" />
</ItemTemplate>
</asp:TemplateField>
@@ -6009,7 +6023,27 @@
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div id="DivModalExistencias" class="modal ADS fade" role="dialog">
<div class="modal-dialog rowpadding" tabindex="-1">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 id="hPS" class="modal-title">Existencias</h4>
</div>
<div class="modal-body">
<div class="row">
<div class="col-md-12">
<table id="TbExistenciasPS">
</table>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
</div>
</div>
</div>
</div>
</asp:Content>
<asp:Content ID="Content7" ContentPlaceHolderID="JS" runat="Server">
<script src="/Metronic/assets/global/scripts/jquery-sortable.js"></script>
@@ -6827,7 +6861,7 @@
var div = $('<div class="select2anothertable"></div>');
$('.select2-container.select2-container--default.select2-container--open .select2-dropdown .select2anothertable').remove();
$('.select2-container.select2-container--default.select2-container--open .select2-dropdown').prepend(div);
var table = $('<table></table>'); div.append(table);
var table = $('<table id="TExistencias"></table>'); div.append(table);
var tbody = $('<tbody></tbody>'); table.append(tbody);
$(".select2-container--default .select2-results>.select2-results__options").off("scroll", scrollfuncion);
$(".select2-container--default .select2-results>.select2-results__options").scroll(scrollfuncion);
@@ -6844,11 +6878,73 @@
var td;
for (var key in item) {
if (!(key == "text" || key == "id")) { td = $('<td ' + ((item[key] > 0) ? 'style = "font-weight:bold;"' : '') + '>' + item[key] + '</td>'); tr.append(td); }
if (!(key == "text" || key == "id")) {
if ((item[key] > 0)) {
td = $('<td style = "font-weight:bold;" >' + item[key] + '</td>'); tr.append(td);
} else {
if ('<%= UsuarioActual.Empresa.Funcionalidad(566) %>' == '1') {
var buscarAlmacenes = "CargaExistenciasSucursales(" + item.id + ",'" + item.text + "');"
td = $('<td>' + item[key] + ' <button type="button" class="btn btn-xs btn-primary" onclick="' + buscarAlmacenes + '">Ver mas existencias</button></td>'); tr.append(td);
} else {
td = $('<td>' + item[key] + '</td>'); tr.append(td);
}
}
}
}
indexd += 1;
});
}
function CargaExistenciasSucursales(id,ps) {
$.ajax({
url: '/Ashx/SIGWeb.ashx?metodo=getpsalmacen&cveps=' + id,
type: 'get',
beforeSend: function () {
console.log("procesando.....");
},
success: function (response) {
var obj = JSON.parse(response);
MostarTablaSucursales(obj, ps);
}
});
}
function MostarTablaSucursales(almacenes, ps) {
var div = $('<div class="select2anothertable"></div>');
var table = $('<table style="width: 401px;"></table>');
var tbody = $('<tbody></tbody>'); table.append(tbody);
//div.append(table);
var indexd = 0;
almacenes.forEach(function (item) {
if (indexd == 0) {
var tr = $('<tr></tr>'); tbody.append(tr);
var td1 = $('<th style="font-weight: bold; width: 347px; text-align: center;">Almacen</th>');
var td2 = $('<th style="font-weight: bold; width: 181px; text-align: center;">Existencia</th>');
tr.append(td1);
tr.append(td2);
}
var tr = $('<tr style="text-align: left;"></tr>'); tbody.append(tr);
for (var key in item) {
if (!(key == "almacen" || key == "id")) {
var td1 = $('<td style="width: 347px;">' + item["almacen"] + '</td>'); tr.append(td1);
var td2 = $('<td style="font-weight: bold; width: 181px; text-align: center;"' + ((item["existencia"] > 0) ? 'style = "font-weight:bold;"' : '') + '>' + item["existencia"] + '</td>'); tr.append(td2);
}
}
indexd += 1;
});
if (almacenes.length > 0) {
TbExistenciasPS.innerHTML = table.html();
hPS.innerText = "Existencias: " + ps;
$("#DivModalExistencias").modal("show");
} else {
alert("No hay existencias en otros almacenes");
}
}
function ADSReady() {
//MakeSortable();