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

Resguardo material, permitir consultar con empresa 140

Browse Source
This commit is contained in:
rakcsle
2022-03-16 21:16:21 -07:00
parent 4af1707636
commit c1e871a0fb
7 changed files with 115 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
App_Code/ClsContPAQi.vb
View File

@@ -6603,7 +6603,7 @@ Public Class ClsContPAQi
#End Region #End Region
#Region "M O V I M I E N T O S - A U X I L I A R E S - C A T A L O G O" #Region "M O V I M I E N T O S - A U X I L I A R E S - C A T A L O G O"
Public Function GetMovimientosAuxiliaresCatalogo(IdCuenta As Integer, FechaI As Date, FechaF As Date, CveMoneda As Integer) As Boolean Public Function GetMovimientosAuxiliaresCatalogo(IdCuenta As Integer, FechaI As Date, FechaF As Date, CveMoneda As Integer, Optional IdSegNeg As Integer = -1) As Boolean
Dim Retorno = False Dim Retorno = False
If Not FNC_Total() Then If Not FNC_Total() Then
@@ -6659,12 +6659,12 @@ Public Class ClsContPAQi
StrSQL.Append(" ) ") StrSQL.Append(" ) ")
StrSQL.Append(" INSERT INTO #TEMP ") StrSQL.Append(" INSERT INTO #TEMP ")
'StrSQL.AppendLine(" -- SE LLENA LA TABLA TEMPORAL CON EL ARBOL DEL WITH CON JOINS DE CUENTAS SUPERIORES ") 'StrSQL.AppendLine(" -- SE LLENA LA TABLA TEMPORAL CON EL ARBOL DEL WITH CON JOINS DE CUENTAS SUPERIORES ")
StrSQL.Append(" SELECT T.*, ISNULL (dbo.FNC_Total(T.Id, CAST('1900-01-01' AS DATE),@FechaF,@CveMoneda), 0) AS SaldoActual ") '-- CASE WHEN Tipo IN ('A','B') THEN ISNULL(T.SaldoInicial + T.Cargos - T.Abonos,0) ELSE ISNULL(T.SaldoInicial + T.Abonos - T.Cargos,0) END AS SaldoActual StrSQL.Append(" SELECT T.*, ISNULL (dbo.FNC_Total(T.Id, CAST('1900-01-01' AS DATE),@FechaF,@CveMoneda,@IdSegNeg), 0) As SaldoActual ") '-- CASE WHEN Tipo IN ('A','B') THEN ISNULL(T.SaldoInicial + T.Cargos - T.Abonos,0) ELSE ISNULL(T.SaldoInicial + T.Abonos - T.Cargos,0) END AS SaldoActual
StrSQL.Append(" FROM (") StrSQL.Append(" FROM (")
StrSQL.Append(" SELECT C.Id, C.Nombre, C.Tipo, C.CtaMayor, '' AS Clasificacion, Orden,") StrSQL.Append(" Select C.Id, C.Nombre, C.Tipo, C.CtaMayor, '' AS Clasificacion, Orden,")
StrSQL.Append(" ISNULL (dbo.FNC_Total(c.Id, CAST('1900-01-01' AS DATE),EOMONTH(@FechaI, -1 ),@CveMoneda), 0) AS SaldoInicial,") StrSQL.Append(" ISNULL (dbo.FNC_Total(c.Id, CAST('1900-01-01' AS DATE),EOMONTH(@FechaI, -1 ),@CveMoneda,@IdSegNeg), 0) AS SaldoInicial,")
StrSQL.Append(" ISNULL (dbo.FNC_Cargos(c.Id, @FechaI, @FechaF,@CveMoneda), 0) AS Cargos,") StrSQL.Append(" ISNULL (dbo.FNC_Cargos(c.Id, @FechaI, @FechaF,@CveMoneda,@IdSegNeg), 0) AS Cargos,")
StrSQL.Append(" ISNULL (dbo.FNC_Abonos(c.Id, @FechaI, @FechaF,@CveMoneda), 0) AS Abonos,") StrSQL.Append(" ISNULL (dbo.FNC_Abonos(c.Id, @FechaI, @FechaF,@CveMoneda,@IdSegNeg), 0) AS Abonos,")
StrSQL.Append(" Level as Nivel,") StrSQL.Append(" Level as Nivel,")
StrSQL.Append(" CASE WHEN ISNUMERIC (C.Codigo) = 1 THEN FORMAT (CAST (C.Codigo AS FLOAT), (SELECT REPLACE (Mascarilla, 'X', '0') FROM Parametros)) ELSE C.Codigo END AS Codigo,") StrSQL.Append(" CASE WHEN ISNUMERIC (C.Codigo) = 1 THEN FORMAT (CAST (C.Codigo AS FLOAT), (SELECT REPLACE (Mascarilla, 'X', '0') FROM Parametros)) ELSE C.Codigo END AS Codigo,")
StrSQL.Append(" CASE WHEN ISNUMERIC (CT.Codigo) = 1 THEN FORMAT (CAST (CT.Codigo AS FLOAT), (SELECT REPLACE (Mascarilla, 'X', '0') FROM Parametros)) ELSE CT.Codigo END AS CodigoSup, Ct.Nombre as Sup,") StrSQL.Append(" CASE WHEN ISNUMERIC (CT.Codigo) = 1 THEN FORMAT (CAST (CT.Codigo AS FLOAT), (SELECT REPLACE (Mascarilla, 'X', '0') FROM Parametros)) ELSE CT.Codigo END AS CodigoSup, Ct.Nombre as Sup,")
@@ -6743,12 +6743,16 @@ Public Class ClsContPAQi
StrSQL.Append(" LEFT JOIN MovimientosPoliza MP ON T.ID = MP.IdCuenta AND MP.Fecha < CAST('0001-01-01' AS DATE)") StrSQL.Append(" LEFT JOIN MovimientosPoliza MP ON T.ID = MP.IdCuenta AND MP.Fecha < CAST('0001-01-01' AS DATE)")
StrSQL.Append(" LEFT JOIN TiposPolizas TP ON MP.TipoPol = TP.Codigo") StrSQL.Append(" LEFT JOIN TiposPolizas TP ON MP.TipoPol = TP.Codigo")
StrSQL.Append(" LEFT JOIN Polizas P ON MP.IdPoliza = P.Id") StrSQL.Append(" LEFT JOIN Polizas P ON MP.IdPoliza = P.Id")
StrSQL.Append(" UNION") StrSQL.Append(" UNION")
StrSQL.AppendFormat(" SELECT T.*, MP.Concepto, MP.Fecha, TP.Nombre AS TipoPoliza, MP.Folio, MP.Id AS IdMovimientoPoliza, MP.Referencia, CASE WHEN MP.TipoMovto = 0 THEN MP.{0} ELSE 0 END, CASE WHEN MP.TipoMovto = 1 THEN MP.{0} ELSE 0 END, MP.IdPoliza, P.Concepto AS ConceptoPadre", If(CveMoneda = 1, "Importe", "ImporteME")) StrSQL.AppendFormat(" SELECT T.*, MP.Concepto, MP.Fecha, TP.Nombre AS TipoPoliza, MP.Folio, MP.Id AS IdMovimientoPoliza, MP.Referencia, CASE WHEN MP.TipoMovto = 0 THEN MP.{0} ELSE 0 END, CASE WHEN MP.TipoMovto = 1 THEN MP.{0} ELSE 0 END, MP.IdPoliza, P.Concepto AS ConceptoPadre", If(CveMoneda = 1, "Importe", "ImporteME"))
StrSQL.Append(" FROM #TEMP T") StrSQL.Append(" FROM #TEMP T")
StrSQL.Append(" LEFT JOIN MovimientosPoliza MP ON T.ID = MP.IdCuenta AND CAST(MP.Fecha AS DATE) BETWEEN @FechaI AND @FechaF") StrSQL.Append(" LEFT JOIN MovimientosPoliza MP ON T.ID = MP.IdCuenta AND CAST(MP.Fecha AS DATE) BETWEEN @FechaI AND @FechaF")
StrSQL.Append(" LEFT JOIN TiposPolizas TP ON MP.TipoPol = TP.Codigo") StrSQL.Append(" LEFT JOIN TiposPolizas TP ON MP.TipoPol = TP.Codigo")
StrSQL.Append(" LEFT JOIN Polizas P ON MP.IdPoliza = P.Id") StrSQL.Append(" LEFT JOIN Polizas P ON MP.IdPoliza = P.Id")
StrSQL.Append(" ) AS T") StrSQL.Append(" ) AS T")
StrSQL.Append(" ) TT") StrSQL.Append(" ) TT")
'StrSQL.AppendLine(" --PRIMER GROUPING SON LAS CABECERAS Y TOTALES DE LAS CUENTAS, SEGUNDO GROUPING SON LOS MOVIMIENTOS DE LAS CUENTAS") 'StrSQL.AppendLine(" --PRIMER GROUPING SON LAS CABECERAS Y TOTALES DE LAS CUENTAS, SEGUNDO GROUPING SON LOS MOVIMIENTOS DE LAS CUENTAS")
@@ -6777,6 +6781,7 @@ Public Class ClsContPAQi
.Add("@FechaF", SqlDbType.Date).Value = FechaF .Add("@FechaF", SqlDbType.Date).Value = FechaF
.Add("@IdCuentaPadre", SqlDbType.Int).Value = IdCuenta .Add("@IdCuentaPadre", SqlDbType.Int).Value = IdCuenta
.Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda
.Add("@IdSegNeg", SqlDbType.Int).Value = IdSegNeg
End With End With
Try Try
@@ -10997,7 +11002,8 @@ Public Class ClsContPAQi
StrSQL.Append(" @IdCtaSup INT, ") StrSQL.Append(" @IdCtaSup INT, ")
StrSQL.Append(" @FechaI DATE, ") StrSQL.Append(" @FechaI DATE, ")
StrSQL.Append(" @FechaF DATE, ") StrSQL.Append(" @FechaF DATE, ")
StrSQL.Append(" @CveMoneda INT = 1 ") StrSQL.Append(" @CveMoneda INT = 1, ")
StrSQL.Append(" @IdSegNeg INT =-1 ")
StrSQL.Append(" ) ") StrSQL.Append(" ) ")
StrSQL.Append(" RETURNS FLOAT ") StrSQL.Append(" RETURNS FLOAT ")
StrSQL.Append(" AS ") StrSQL.Append(" AS ")
@@ -11035,7 +11041,7 @@ Public Class ClsContPAQi
StrSQL.Append(" INNER JOIN Cuentas c ON c.Id = a.IdSubCtade ") StrSQL.Append(" INNER JOIN Cuentas c ON c.Id = a.IdSubCtade ")
StrSQL.Append(" INNER JOIN MovimientosPoliza p ON IdCuenta = c.Id ") StrSQL.Append(" INNER JOIN MovimientosPoliza p ON IdCuenta = c.Id ")
StrSQL.Append(" LEFT JOIN SegmentosNegocio s ON p.IdSegNeg = s.Id ") StrSQL.Append(" LEFT JOIN SegmentosNegocio s ON p.IdSegNeg = s.Id ")
StrSQL.Append(" WHERE CAST (p.Fecha AS DATE)>= @FechaI AND CAST (p.Fecha AS DATE) <= @FechaF; ") StrSQL.Append(" WHERE CAST (p.Fecha AS DATE)>= @FechaI AND CAST (p.Fecha AS DATE) <= @FechaF AND (@IdSegNeg = -1 OR p.IdSegNeg = @IdSegNeg); ")
StrSQL.Append(" RETURN @Total; ") StrSQL.Append(" RETURN @Total; ")
StrSQL.Append(" END; ") StrSQL.Append(" END; ")
@@ -11074,7 +11080,8 @@ Public Class ClsContPAQi
StrSQL.Append(" @IdCtaSup INT, ") StrSQL.Append(" @IdCtaSup INT, ")
StrSQL.Append(" @FechaI DATE, ") StrSQL.Append(" @FechaI DATE, ")
StrSQL.Append(" @FechaF DATE, ") StrSQL.Append(" @FechaF DATE, ")
StrSQL.Append(" @CveMoneda INT = 1 ") StrSQL.Append(" @CveMoneda INT = 1, ")
StrSQL.Append(" @IdSegNeg INT =-1 ")
StrSQL.Append(" ) ") StrSQL.Append(" ) ")
StrSQL.Append(" RETURNS FLOAT ") StrSQL.Append(" RETURNS FLOAT ")
StrSQL.Append(" AS ") StrSQL.Append(" AS ")
@@ -11104,7 +11111,7 @@ Public Class ClsContPAQi
StrSQL.Append(" INNER JOIN Cuentas c ON c.Id = a.IdSubCtade ") StrSQL.Append(" INNER JOIN Cuentas c ON c.Id = a.IdSubCtade ")
StrSQL.Append(" INNER JOIN MovimientosPoliza p ON IdCuenta = c.Id ") StrSQL.Append(" INNER JOIN MovimientosPoliza p ON IdCuenta = c.Id ")
StrSQL.Append(" LEFT JOIN SegmentosNegocio s ON p.IdSegNeg = s.Id ") StrSQL.Append(" LEFT JOIN SegmentosNegocio s ON p.IdSegNeg = s.Id ")
StrSQL.Append(" WHERE CAST (p.Fecha AS DATE)>= @FechaI AND CAST (p.Fecha AS DATE) <= @FechaF; ") StrSQL.Append(" WHERE CAST (p.Fecha AS DATE)>= @FechaI AND CAST (p.Fecha AS DATE) <= @FechaF AND (@IdSegNeg = -1 OR p.IdSegNeg = @IdSegNeg); ")
StrSQL.Append(" RETURN @Total; ") StrSQL.Append(" RETURN @Total; ")
StrSQL.Append(" END; ") StrSQL.Append(" END; ")
@@ -11144,7 +11151,8 @@ Public Class ClsContPAQi
StrSQL.Append(" @IdCtaSup INT, ") StrSQL.Append(" @IdCtaSup INT, ")
StrSQL.Append(" @FechaI DATE, ") StrSQL.Append(" @FechaI DATE, ")
StrSQL.Append(" @FechaF DATETIME, ") StrSQL.Append(" @FechaF DATETIME, ")
StrSQL.Append(" @CveMoneda INT = 1 ") StrSQL.Append(" @CveMoneda INT = 1 , ")
StrSQL.Append(" @IdSegNeg INT =-1 ")
StrSQL.Append(" ) ") StrSQL.Append(" ) ")
StrSQL.Append(" RETURNS FLOAT ") StrSQL.Append(" RETURNS FLOAT ")
StrSQL.Append(" AS ") StrSQL.Append(" AS ")
@@ -11174,7 +11182,7 @@ Public Class ClsContPAQi
StrSQL.Append(" INNER JOIN Cuentas c ON c.Id = a.IdSubCtade ") StrSQL.Append(" INNER JOIN Cuentas c ON c.Id = a.IdSubCtade ")
StrSQL.Append(" INNER JOIN MovimientosPoliza p ON IdCuenta = c.Id ") StrSQL.Append(" INNER JOIN MovimientosPoliza p ON IdCuenta = c.Id ")
StrSQL.Append(" LEFT JOIN SegmentosNegocio s ON p.IdSegNeg = s.Id ") StrSQL.Append(" LEFT JOIN SegmentosNegocio s ON p.IdSegNeg = s.Id ")
StrSQL.Append(" WHERE CAST (p.Fecha AS DATE)>= @FechaI AND CAST (p.Fecha AS DATE) <= @FechaF; ") StrSQL.Append(" WHERE CAST (p.Fecha AS DATE)>= @FechaI AND CAST (p.Fecha AS DATE) <= @FechaF AND (@IdSegNeg = -1 OR p.IdSegNeg = @IdSegNeg); ")
StrSQL.Append(" RETURN @Total; ") StrSQL.Append(" RETURN @Total; ")
StrSQL.Append(" END; ") StrSQL.Append(" END; ")

3
App_Code/ClsInventarios.vb
View File

@@ -869,7 +869,7 @@ Public Class ClsInventarios
Return Retorno Return Retorno
End Function End Function
Public Function GetMovimientosDetallePorPersonal(CvePersonal As Integer, CveAlmacen As Integer, CveCliente As Integer, CveProveedor As Integer) As Boolean Public Function GetMovimientosDetallePorPersonal(CvePersonal As Integer, CveAlmacen As Integer, CveCliente As Integer, CveProveedor As Integer, Optional Tipo As Integer = -1) As Boolean
Dim Retorno As Boolean = False Dim Retorno As Boolean = False
DataAdapter("PA_Inv_MovimientosPorPersonalGet") DataAdapter("PA_Inv_MovimientosPorPersonalGet")
@@ -879,6 +879,7 @@ Public Class ClsInventarios
.Add("@CveAlmacen", SqlDbType.Int).Value = CveAlmacen .Add("@CveAlmacen", SqlDbType.Int).Value = CveAlmacen
.Add("@CveCliente", SqlDbType.Int).Value = CveCliente .Add("@CveCliente", SqlDbType.Int).Value = CveCliente
.Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor
.Add("@Tipo", SqlDbType.Int).Value = Tipo
End With End With
Try Try
SqlAdapter.Fill(Data) SqlAdapter.Fill(Data)

2
Contabilidad/RepAnexoCatalogo.aspx.vb
View File

@@ -282,7 +282,7 @@ Partial Class AC_RepAnexoCatalogo
e.Row.FCHyperLink("HLSaldoActual").ForeColor = Drawing.Color.Red e.Row.FCHyperLink("HLSaldoActual").ForeColor = Drawing.Color.Red
End If End If
e.Row.FCHyperLink("HLSaldoActual").NavigateUrl = String.Format("/Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx?ID={0}&FI={1}&FF={2}", e.Row.DBCampo("ID"), FechaInicio.ToShortDateString, FechaFin.ToShortDateString) e.Row.FCHyperLink("HLSaldoActual").NavigateUrl = String.Format("/Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx?ID={0}&FI={1}&FF={2}&IdSegNeg={3}", e.Row.DBCampo("ID"), FechaInicio.ToShortDateString, FechaFin.ToShortDateString, DdlSegmentoNegocio.SelectedValue.ToEntero)
End If End If
End Sub End Sub
#End Region #End Region

6
Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx
View File

@@ -88,6 +88,12 @@
<asp:DropDownList ID="DdlMoneda" CssClass="form-control input-sm" runat="server" DataTextField="Moneda" DataValueField="CveMoneda" TabIndex="5" ClientIDMode="Static" style="margin-top:10%; width:140%"> <asp:DropDownList ID="DdlMoneda" CssClass="form-control input-sm" runat="server" DataTextField="Moneda" DataValueField="CveMoneda" TabIndex="5" ClientIDMode="Static" style="margin-top:10%; width:140%">
</asp:DropDownList> </asp:DropDownList>
</div> </div>
<label class="col-md-1 truncate" style="width: 90px; padding-right: 2px;">Segmento de negocio</label>
<div class="col-md-2">
<asp:DropDownList CssClass="form-control input-sm select2me" ID="DdlSegmentoNegocio" runat="server" DataTextField="Nombre" DataValueField="Id" Width="100%">
</asp:DropDownList>
</div>
</div> </div>
</div> </div>
</div> </div>

49
Contabilidad/RepMovimientosAuxiliaresCatalogo.aspx.vb
View File

@@ -52,6 +52,21 @@ Partial Class AC_RepMovimientosAuxiliaresCatalogo
ViewState("IdCuenta") = value ViewState("IdCuenta") = value
End Set End Set
End Property End Property
Private Property IdSegNeg As Integer
Get
If ViewState("IdSegNeg") Is Nothing Then
ViewState("IdSegNeg") = -1
End If
Return ViewState("IdSegNeg").ToString.ToEntero
End Get
Set(value As Integer)
ViewState("IdSegNeg") = value
End Set
End Property
Private Property TotalPadre As Boolean Private Property TotalPadre As Boolean
Get Get
TotalPadre = CBool(ViewState("TotalPadre")) TotalPadre = CBool(ViewState("TotalPadre"))
@@ -78,14 +93,19 @@ Partial Class AC_RepMovimientosAuxiliaresCatalogo
Dim ErrorParametros = True Dim ErrorParametros = True
CargaTipoCuentas() CargaTipoCuentas()
CargaMoneda()
CargaSegmentosNegocio()
TxtCuenta.Enabled = False TxtCuenta.Enabled = False
DdlMoneda.DataSource = GlobalDTMonedas
DdlMoneda.DataBind()
If Request("ID") IsNot Nothing AndAlso IsNumeric(Request("ID")) AndAlso Request("ID").ToEntero > 0 Then If Request("ID") IsNot Nothing AndAlso IsNumeric(Request("ID")) AndAlso Request("ID").ToEntero > 0 Then
If Request("FF") IsNot Nothing AndAlso Request("FF").ToString.Length = 10 AndAlso Request("FF").ToDate > "01/01/1000".ToDate Then If Request("FF") IsNot Nothing AndAlso Request("FF").ToString.Length = 10 AndAlso Request("FF").ToDate > "01/01/1000".ToDate Then
IdCuenta = Request("ID").ToEntero IdCuenta = Request("ID").ToEntero
IdSegNeg = If(Request("IdSegNeg") IsNot Nothing AndAlso Request("IdSegNeg").ToString.ToEntero > 0, Request("IdSegNeg").ToString.ToEntero, -1)
HdnCveCuenta.Value = IdCuenta.ToString HdnCveCuenta.Value = IdCuenta.ToString
FechaFin = Request("FF").ToDate FechaFin = Request("FF").ToDate
@@ -113,6 +133,8 @@ Partial Class AC_RepMovimientosAuxiliaresCatalogo
End If End If
End If End If
DdlSegmentoNegocio.SelectedValueExist(IdSegNeg)
End If End If
End If End If
@@ -128,6 +150,27 @@ Partial Class AC_RepMovimientosAuxiliaresCatalogo
End If End If
End Sub End Sub
Private Sub CargaSegmentosNegocio()
Dim ObjContpaq As New ClsContPAQi(UsuarioActual.Empresa)
Dim strGlobal As String = ""
If ObjContpaq.GetSegmentosNegocio(-1, "-1") Then
DdlSegmentoNegocio.DataSource = ObjContpaq.DtResultados
DdlSegmentoNegocio.DataBind()
End If
ObjContpaq.Dispose()
DdlSegmentoNegocio.Items.Insert(0, New ListItem("Todos", "-1"))
DdlSegmentoNegocio.SelectedValue = "-1"
End Sub
Private Sub CargaMoneda()
DdlMoneda.DataSource = GlobalDTMonedas
DdlMoneda.DataBind()
End Sub
Protected Sub BtnConsultar_Click(sender As Object, e As EventArgs) Protected Sub BtnConsultar_Click(sender As Object, e As EventArgs)
FechaInicio = If(TxtFechaDel.Text = "" Or TxtFechaDel.Text = "__/__/____", Date.Now, TxtFechaDel.Text.ToDate) FechaInicio = If(TxtFechaDel.Text = "" Or TxtFechaDel.Text = "__/__/____", Date.Now, TxtFechaDel.Text.ToDate)
@@ -178,7 +221,7 @@ Partial Class AC_RepMovimientosAuxiliaresCatalogo
Private Sub CargaDatos() Private Sub CargaDatos()
Dim ObjConta As New ClsContPAQi(UsuarioActual.Empresa, 60) Dim ObjConta As New ClsContPAQi(UsuarioActual.Empresa, 60)
If ObjConta.GetMovimientosAuxiliaresCatalogo(IdCuenta, FechaInicio, FechaFin, DdlMoneda.SelectedValue.ToEntero) Then If ObjConta.GetMovimientosAuxiliaresCatalogo(IdCuenta, FechaInicio, FechaFin, DdlMoneda.SelectedValue.ToEntero, DdlSegmentoNegocio.SelectedValue.ToEntero) Then
'DtTotales = DtDatos.Clone 'DtTotales = DtDatos.Clone
DtDatos = ObjConta.DtResultados DtDatos = ObjConta.DtResultados
CargaGrid() CargaGrid()

8
Inventarios/ResguardoMaterial.aspx
View File

@@ -52,8 +52,8 @@
<div class="row" style="margin-left: 0px; margin-right: 0px;"> <div class="row" style="margin-left: 0px; margin-right: 0px;">
<div class="col-md-6"> <div class="col-md-6" runat="server" >
<div class="portlet xspadding light bordered infomov"> <div class="portlet xspadding light bordered infomov" >
<div class="portlet-title"> <div class="portlet-title">
<div class="tools"> <div class="tools">
<a href="javascript;" data-idchekbox="<%= chkexpand.ClientID%>" class=" <%= IIf(chkexpand.Checked = True, "collapse", "expand")%>"></a> <a href="javascript;" data-idchekbox="<%= chkexpand.ClientID%>" class=" <%= IIf(chkexpand.Checked = True, "collapse", "expand")%>"></a>
@@ -377,7 +377,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body" >
<div class="row"> <div class="row">
<div class="col-md-1" style="max-width: 100px">Fecha</div> <div class="col-md-1" style="max-width: 100px">Fecha</div>
<div class="col-md-2"> <div class="col-md-2">
@@ -409,7 +409,7 @@
<div class="row" style="margin-left: 0px; margin-right: 0px;"> <div class="row" style="margin-left: 0px; margin-right: 0px;">
<div class="col-md-6"> <div class="col-md-6">
<div class="portlet smmallpadding light bordered infomov"> <div class="portlet smmallpadding light bordered infomov" runat="server" id ="DVInformacionMoviminetoLiberacion" >
<div class="portlet-title"> <div class="portlet-title">
<div class="tools"> <div class="tools">
<a href="javascript;" data-idchekbox="<%= chkexpand.ClientID%>" class=" <%= IIf(chkexpand.Checked = True, "collapse", "expand")%>"></a> <a href="javascript;" data-idchekbox="<%= chkexpand.ClientID%>" class=" <%= IIf(chkexpand.Checked = True, "collapse", "expand")%>"></a>

26
Inventarios/ResguardoMaterial.aspx.vb
View File

@@ -635,6 +635,12 @@ Partial Class Inventarios_ResguardoMaterial
#Region " CARGA RESGUARDOS PARA LIBERACION " #Region " CARGA RESGUARDOS PARA LIBERACION "
Protected Sub BtnVerificarExistencias_Click(sender As Object, e As EventArgs) Protected Sub BtnVerificarExistencias_Click(sender As Object, e As EventArgs)
If UsuarioActual.CveEmpresa <> 140 Then
If Not DdlProveedorLiberacion.SelectedValue.ToEntero > 0 AndAlso DdlTipo.SelectedValue.ToEntero = 3 Then If Not DdlProveedorLiberacion.SelectedValue.ToEntero > 0 AndAlso DdlTipo.SelectedValue.ToEntero = 3 Then
Alert("Tiene que seleccionar un proveedor.", TipoMensaje.MsgAdvertencia) Alert("Tiene que seleccionar un proveedor.", TipoMensaje.MsgAdvertencia)
Exit Sub Exit Sub
@@ -650,14 +656,32 @@ Partial Class Inventarios_ResguardoMaterial
Exit Sub Exit Sub
End If End If
End If
CargaResguardos() CargaResguardos()
If UsuarioActual.CveEmpresa = 140 Then
If DdlProveedorLiberacion.SelectedValue.ToEntero <= 0 Or DdlPersonalLiberacion.SelectedValue.ToEntero <= 0 Or DdlClienteLiberacion.SelectedValue.ToEntero <= 0 Then
DVInformacionMoviminetoLiberacion.Visible = False
BtnGuardarLiberacion.Visible = False
Else
DVInformacionMoviminetoLiberacion.Visible = True
BtnGuardarLiberacion.Visible = True
End If
UpGenerales.Update()
End If
End Sub End Sub
Private Sub CargaResguardos() Private Sub CargaResguardos()
Dim ObjInventario As New ClsInventarios() Dim ObjInventario As New ClsInventarios()
Dim Existencias As Double = 0 Dim Existencias As Double = 0
If ObjInventario.GetMovimientosDetallePorPersonal(DdlPersonalLiberacion.SelectedValue.ToEntero, DdlAlmacenLiberacion.SelectedValue.ToEntero, DdlClienteLiberacion.SelectedValue.ToEntero, DdlProveedorLiberacion.SelectedValue.ToEntero) Then If ObjInventario.GetMovimientosDetallePorPersonal(DdlPersonalLiberacion.SelectedValue.ToEntero, DdlAlmacenLiberacion.SelectedValue.ToEntero, DdlClienteLiberacion.SelectedValue.ToEntero, DdlProveedorLiberacion.SelectedValue.ToEntero, DdlTipo.SelectedValue.ToEntero) Then
DtMovimientosLiberacion = ObjInventario.DtResultados DtMovimientosLiberacion = ObjInventario.DtResultados
DtMovimientosLiberacion.Columns("No").AutoIncrement = True DtMovimientosLiberacion.Columns("No").AutoIncrement = True