From 1bf5d40c34357df17b5a213a30a74ca138204429 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Thu, 20 Jan 2022 07:48:39 -0700 Subject: [PATCH] --- App_Code/ClsInventarios.vb | 9 +- App_Code/ClsNominas.vb | 23 ++++ Inventarios/CatUnidades.aspx | 235 ++++++++++++++++---------------- Inventarios/CatUnidades.aspx.vb | 18 ++- Nomina/CalculoISRAnual.aspx | 2 +- vwd.webinfo | 2 + 6 files changed, 166 insertions(+), 123 deletions(-) diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb index ef302e425..7d53118dc 100644 --- a/App_Code/ClsInventarios.vb +++ b/App_Code/ClsInventarios.vb @@ -5530,10 +5530,11 @@ Public Class ClsInventarios End Try Return Retorno End Function + Public Function AddCamiones(Placa As String, Especificacion As String, CveEmpresa As Integer, ConfigCartaPorte As String, Anio As Integer, CveTipoPermisoSCT As Integer, NumPermisoSCT As String, NombreAseguradora As String, NumPolizaSeguro As String, CveUsuario As Integer, NombreAseguradoraMedioAmbiente As String, NumPolizaSeguroMedioAmbiente As String, NombreAseguradoraCarga As String, NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = 1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", - Optional NumeroTrailer As String = "") As Boolean + Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_CamionesAdd") With SqlAdapter.SelectCommand.Parameters @@ -5552,7 +5553,7 @@ Public Class ClsInventarios .Add("@NombreAseguradoraCarga", SqlDbType.VarChar).Value = NombreAseguradoraCarga .Add("@NumPolizaSeguroCarga", SqlDbType.VarChar).Value = NumPolizaSeguroCarga .Add("@CveTipoCamion", SqlDbType.Int).Value = CveTipoCamion - + .Add("@CveTipoRemolque", SqlDbType.Int).Value = CveTipoRemolque .Add("@LongitudCaja", SqlDbType.VarChar).Value = LongitudCaja .Add("@LineaTransportacion", SqlDbType.VarChar).Value = LineaTransportacion .Add("@SCAC", SqlDbType.VarChar).Value = SCAC @@ -5584,7 +5585,8 @@ Public Class ClsInventarios End Function Public Function UpdateCamiones(CveCamion As Integer, Placa As String, Especificacion As String, ConfigCartaPorte As String, Anio As Integer, CveTipoPermisoSCT As Integer, NumPermisoSCT As String, NombreAseguradora As String, NumPolizaSeguro As String, CveUsuario As Integer, CveEmpresa As Integer, NombreAseguradoraMedioAmbiente As String, NumPolizaSeguroMedioAmbiente As String, NombreAseguradoraCarga As String, - NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = -1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", Optional NumeroTrailer As String = "") As Boolean + NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = -1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", + Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_CamionesUpdate") With SqlAdapter.SelectCommand.Parameters @@ -5604,6 +5606,7 @@ Public Class ClsInventarios .Add("@NombreAseguradoraCarga", SqlDbType.VarChar).Value = NombreAseguradoraCarga .Add("@NumPolizaSeguroCarga", SqlDbType.VarChar).Value = NumPolizaSeguroCarga .Add("@CveTipoCamion", SqlDbType.Int).Value = CveTipoCamion + .Add("@CveTipoRemolque", SqlDbType.Int).Value = CveTipoRemolque .Add("@LongitudCaja", SqlDbType.VarChar).Value = LongitudCaja .Add("@LineaTransportacion", SqlDbType.VarChar).Value = LineaTransportacion .Add("@SCAC", SqlDbType.VarChar).Value = SCAC diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 73d098a52..d2f7e6a76 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -174,6 +174,29 @@ Public Class ClsNominas End Sub #End Region + Public Function ManifiestoForVtaGet(CveEmpresa As Integer, CveUsuario As Integer, PersonalXml As String, CveEmbarqueManifiesto As Integer) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Vta_ManifiestoForVtaGet", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmbarqueManifiesto", SqlDbType.Int).Value = CveEmbarqueManifiesto + + End With + Try + SqlAdapter.Fill(DTSet) + If DTSet.Tables.Count > 0 Then + Data = DTSet.Tables(0) + End If + retorno = True + Catch Ex1 As SqlException + + Me.OnError("Ocurrió un error al obtener datos manifiesto.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + Catch ex As Exception + OnError("Ocurrió un error al obtener los datos manifiesto.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + Return retorno + End Function Public Function AutorizaCalculoAnual(CveEmpresa As Integer, CveUsuario As Integer, PersonalXml As String, Optional Numpagos As Integer = 1) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Nom_AutorizaCalculoAnual", CommandType.StoredProcedure) diff --git a/Inventarios/CatUnidades.aspx b/Inventarios/CatUnidades.aspx index e2c405e14..6df94e0e3 100644 --- a/Inventarios/CatUnidades.aspx +++ b/Inventarios/CatUnidades.aspx @@ -1,49 +1,46 @@ <%@ Page Title="Catálogo de Unidades" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="CatUnidades.aspx.vb" Inherits="Inventarios_CatUnidades" EnableEventValidation="false" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> - + - + - - Catálogo de Unidades + + Catálogo de Unidades - - + - +
  • - +
    • - + - + - - + + - - + + - + @@ -57,7 +54,7 @@ - +