From cfad8f03cdbcf058e6bfdb9009c29b363a54387e Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Sat, 16 May 2020 12:52:17 -0700 Subject: [PATCH] 4 campos agregados a productos servicio y columnas renombradas en los reportes --- App_Code/ClsProductosServicios.vb | 16 +- Empresas/72/Formatos/ConsumoInterno.rdlc | 109 ++++++++- Empresas/72/Formatos/DevolucionCliente.rdlc | 105 ++++++++- Empresas/72/Formatos/DevolucionProveedor.rdlc | 104 ++++++++- Empresas/72/Formatos/EntradaGarantia.rdlc | 109 +++++++-- Empresas/72/Formatos/EntradaSalida.rdlc | 103 ++++++++- Empresas/72/Formatos/Entradas.rdlc | 107 ++++++++- Empresas/72/Formatos/Inicial.rdlc | 103 ++++++++- .../Formatos/RepInventarioFisicoDetalle.rdlc | 99 +++++++- Empresas/72/Formatos/Salidas.rdlc | 103 ++++++++- Empresas/72/Formatos/Salidas2.rdlc | 103 ++++++++- Empresas/72/Formatos/SalidasGarantia.rdlc | 103 ++++++++- Empresas/72/Formatos/Traslado.rdlc | 106 ++++++++- Empresas/72/Formatos/TrasladoAlmacen.rdlc | 216 ++++++++++++++++-- Ventas/ProductosServicios.aspx | 32 +++ Ventas/ProductosServicios.aspx.vb | 10 +- 16 files changed, 1386 insertions(+), 142 deletions(-) diff --git a/App_Code/ClsProductosServicios.vb b/App_Code/ClsProductosServicios.vb index 786b97c24..6b4c01406 100644 --- a/App_Code/ClsProductosServicios.vb +++ b/App_Code/ClsProductosServicios.vb @@ -389,7 +389,8 @@ Public Class ClsProductosServicios Optional CveMoneda As Integer = 1, Optional RetISR As Double = 0, Optional PrecioMinimo As Decimal = Nothing, Optional CveTipoFactor As Integer = 1, Optional CveFraccionArancelaria As Integer = -1, Optional CveClasificacionDetalle As Integer = -1, Optional CveTamaño As Integer = -1, Optional CveModelo As Integer = -1, Optional CveMedida As Integer = -1, Optional CveRinTamaño As Integer = -1, Optional ClaveImpuestoEmpaque As String = "", Optional ClaveImpuestoUM As String = "", - Optional ClaveCategoriaToxicidad As String = "", Optional ClaveImpuestoTipoProducto As String = "", Optional Litraje As Double = -1, Optional EsOutSourcing As Boolean = False) As Integer + Optional ClaveCategoriaToxicidad As String = "", Optional ClaveImpuestoTipoProducto As String = "", Optional Litraje As Double = -1, Optional EsOutSourcing As Boolean = False, Optional AplicaSerie As Boolean = False, Optional AplicaLote As Boolean = False, + Optional AplicaCaducidad As Boolean = False, Optional AplicaSeccion As Boolean = False) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_ProductosServiciosAdd") @@ -463,6 +464,11 @@ Public Class ClsProductosServicios .Add("@ClaveCategoriaToxicidad", SqlDbType.VarChar).Value = ClaveCategoriaToxicidad .Add("@Litraje", SqlDbType.Float).Value = Litraje .Add("@EsOutSourcing", SqlDbType.Bit).Value = EsOutSourcing + + .Add("@AplicaSerie", SqlDbType.Bit).Value = AplicaSerie + .Add("@AplicaLote", SqlDbType.Bit).Value = AplicaLote + .Add("@AplicaCaducidad", SqlDbType.Bit).Value = AplicaCaducidad + .Add("@AplicaSeccion", SqlDbType.Bit).Value = AplicaSeccion End With Try @@ -608,7 +614,8 @@ Public Class ClsProductosServicios Optional CveMoneda As Integer = 1, Optional RetISR As Double = 0, Optional PrecioMinimo As Decimal = Nothing, Optional CveTipoFactor As Integer = 1, Optional CveFraccionArancelaria As Integer = -1, Optional CveUsuarioModifico As Integer = -1, Optional CveClasificacionDetalle As Integer = -1, Optional CveTamaño As Integer = -1, Optional CveModelo As Integer = -1, Optional CveMedida As Integer = -1, Optional CveRinTamaño As Integer = -1, Optional ClaveImpuestoEmpaque As String = "", Optional ClaveImpuestoUM As String = "", - Optional ClaveCategoriaToxicidad As String = "", Optional ClaveImpuestoTipoProducto As String = "", Optional Litraje As Double = -1, Optional EsOutSourcing As Boolean = False) As Boolean + Optional ClaveCategoriaToxicidad As String = "", Optional ClaveImpuestoTipoProducto As String = "", Optional Litraje As Double = -1, Optional EsOutSourcing As Boolean = False, Optional AplicaSerie As Boolean = False, Optional AplicaLote As Boolean = False, + Optional AplicaCaducidad As Boolean = False, Optional AplicaSeccion As Boolean = False) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_ProductosServiciosUpdate") @@ -683,6 +690,11 @@ Public Class ClsProductosServicios .Add("@ClaveCategoriaToxicidad", SqlDbType.VarChar).Value = ClaveCategoriaToxicidad .Add("@Litraje", SqlDbType.Float).Value = Litraje .Add("@EsOutSourcing", SqlDbType.Bit).Value = EsOutSourcing + + .Add("@AplicaSerie", SqlDbType.Bit).Value = AplicaSerie + .Add("@AplicaLote", SqlDbType.Bit).Value = AplicaLote + .Add("@AplicaCaducidad", SqlDbType.Bit).Value = AplicaCaducidad + .Add("@AplicaSeccion", SqlDbType.Bit).Value = AplicaSeccion End With Try diff --git a/Empresas/72/Formatos/ConsumoInterno.rdlc b/Empresas/72/Formatos/ConsumoInterno.rdlc index 4f83b35f6..cf6d31666 100644 --- a/Empresas/72/Formatos/ConsumoInterno.rdlc +++ b/Empresas/72/Formatos/ConsumoInterno.rdlc @@ -6,19 +6,22 @@ - 1.08025cm + 1.10177cm - 2.86537cm + 2.88689cm - 10.83004cm + 7.80282cm - 2.36735cm + 2.38887cm - 2.1384cm + 2.86584cm + + + 2.15992cm @@ -169,7 +172,7 @@ - Serie/Lote + Serie + + + + + + Textbox4 + + + + + 1pt + + + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -356,14 +404,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + @@ -1645,8 +1726,12 @@ Almacen System.String - - SerieLote + + Serie + System.String + + + SeccionAlmacen System.String diff --git a/Empresas/72/Formatos/DevolucionCliente.rdlc b/Empresas/72/Formatos/DevolucionCliente.rdlc index ba12d2d1f..b04d46e3c 100644 --- a/Empresas/72/Formatos/DevolucionCliente.rdlc +++ b/Empresas/72/Formatos/DevolucionCliente.rdlc @@ -6,19 +6,22 @@ - 1.4138cm + 1.08751cm 2.86537cm - 7.90885cm + 5.59405cm 2.36735cm - 2.7734cm + 2.92336cm + + + 2.35004cm @@ -169,7 +172,7 @@ - Serie/Lote + Serie + + + + + + Textbox17 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -350,14 +398,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value @@ -366,7 +414,37 @@ + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + @@ -419,6 +497,7 @@ + @@ -435,7 +514,7 @@ 0.17639cm 0.12931cm 0.96717cm - 17.32877cm + 17.18768cm @@ -667,7 +746,7 @@ 1.28125in + + + + + + Textbox5 + + + + Black + + 1pt + + + Black + + 1pt + + 2pt + 2pt + 2pt + 2pt + + + + @@ -382,14 +429,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value @@ -400,7 +447,39 @@ - SerieLote1 + Serie + + + 2pt + 2pt + =IIf(rownumber(nothing) = 1, "1pt", "0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + + + + SeccionAlmacen @@ -423,6 +502,7 @@ + @@ -1014,8 +1094,12 @@ Almacen System.String - - SerieLote + + Serie + System.String + + + SeccionAlmacen System.String diff --git a/Empresas/72/Formatos/EntradaGarantia.rdlc b/Empresas/72/Formatos/EntradaGarantia.rdlc index 82e7a4f82..1232b8f04 100644 --- a/Empresas/72/Formatos/EntradaGarantia.rdlc +++ b/Empresas/72/Formatos/EntradaGarantia.rdlc @@ -6,19 +6,22 @@ - 1.4138cm + 1.19235cm - 2.86537cm + 2.76934cm - 7.90885cm + 6.51065cm 2.36735cm - 2.7734cm + 2.8175cm + + + 1.6716cm @@ -169,7 +172,7 @@ - Serie/Lote + Serie + + + + + + Textbox10 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -214,7 +262,7 @@ - Unidad Medida + U. M. @@ -366,7 +414,37 @@ + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + @@ -419,6 +497,7 @@ + @@ -435,7 +514,7 @@ 0.17639cm 0.09031cm 0.96717cm - 17.32877cm + 17.32879cm @@ -458,7 +537,7 @@ 0.54167in + + + + + + Textbox17 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -214,7 +262,7 @@ - Unidad Medida + U.M. @@ -366,7 +414,37 @@ + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + @@ -419,6 +497,7 @@ + @@ -435,7 +514,7 @@ 0.17639cm 0.12931cm 0.96717cm - 17.17002cm + 17.12418cm @@ -1523,8 +1602,12 @@ Almacen System.String - - SerieLote + + Serie + System.String + + + SeccionAlmacen System.String diff --git a/Empresas/72/Formatos/Entradas.rdlc b/Empresas/72/Formatos/Entradas.rdlc index 5a9ef0bb3..beab2af56 100644 --- a/Empresas/72/Formatos/Entradas.rdlc +++ b/Empresas/72/Formatos/Entradas.rdlc @@ -12,13 +12,16 @@ 2.06688cm - 7.9493cm + 6.26873cm - 2.51129cm + 1.69187cm - 1.43594cm + 2.8175cm + + + 1.11844cm 1.56514cm @@ -175,7 +178,7 @@ - Serie/Lote + Serie + + + + + + Textbox1 + + + + + 1pt + + + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -454,14 +502,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + @@ -787,7 +868,7 @@ 1.75444in + + + + + + Textbox2 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -448,14 +496,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value @@ -464,7 +512,37 @@ + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + @@ -589,6 +667,7 @@ + @@ -783,7 +862,7 @@ 1.83333in + + + + + + Textbox45 + + + + + + + + + Silver + 2pt + 2pt + 2pt + + + + @@ -590,7 +634,7 @@ - =Fields!SerieLote.Value + =Fields!Serie.Value + + + + + + SeccionAlmacen + + + =IIF(RowNumber(nothing) Mod 2 = 0,"LightGrey","White") + 2pt + 2pt + 2pt + 2pt + + + + @@ -737,6 +815,7 @@ + @@ -2104,8 +2183,12 @@ PS System.String - - SerieLote + + Serie + System.String + + + SeccionAlmacen System.String diff --git a/Empresas/72/Formatos/Salidas.rdlc b/Empresas/72/Formatos/Salidas.rdlc index 6d8f328e2..41362ace5 100644 --- a/Empresas/72/Formatos/Salidas.rdlc +++ b/Empresas/72/Formatos/Salidas.rdlc @@ -6,19 +6,22 @@ - 1.08025cm + 1.04906cm 2.86537cm - 10.83004cm + 8.0952cm 2.36735cm - 2.1384cm + 2.73484cm + + + 2.16959cm @@ -169,7 +172,7 @@ - Serie/Lote + Serie + + + + + + Textbox1 + + + + + 1pt + + + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -356,14 +404,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + + + + + + + Textbox3 + + + + + 1pt + + + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -348,14 +395,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value @@ -364,7 +411,38 @@ + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + @@ -489,7 +568,7 @@ 1.76239in + + + + + + Textbox10 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + @@ -350,14 +398,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value @@ -366,7 +414,37 @@ + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + @@ -419,6 +497,7 @@ + @@ -435,7 +514,7 @@ 0.17639cm 0.09031cm 0.96717cm - 17.32877cm + 17.32879cm @@ -458,7 +537,7 @@ 0.54167in + + + + + + Textbox10 + + + + Black + + 1pt + + + Black + + 1pt + + #0e2455 + 2pt + 2pt + 2pt + 2pt + + + + @@ -401,14 +449,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value @@ -419,7 +467,40 @@ - SerieLote + Serie + + + Bottom + 2pt + 2pt + =IIf(rownumber(nothing) = 1, "2pt", "0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + + + + SeccionAlmacen @@ -443,6 +524,7 @@ + @@ -459,7 +541,7 @@ 0.07056cm 0.03488cm 0.92264cm - 20.29478cm + 20.18483cm @@ -545,8 +627,8 @@ Textbox31 - 1.15947cm - 2.85732cm + 1.13431cm + 2.8926cm 0.90014cm 17.46676cm 3 @@ -1564,8 +1646,12 @@ Almacen System.String - - SerieLote + + Serie + System.String + + + SeccionAlmacen System.String diff --git a/Empresas/72/Formatos/TrasladoAlmacen.rdlc b/Empresas/72/Formatos/TrasladoAlmacen.rdlc index 00ae4fedc..1714ac257 100644 --- a/Empresas/72/Formatos/TrasladoAlmacen.rdlc +++ b/Empresas/72/Formatos/TrasladoAlmacen.rdlc @@ -6,7 +6,7 @@ - 1.37635cm + 1.03892cm 1.74824cm @@ -15,21 +15,24 @@ 1.41283cm - 8.7207cm + 7.13876cm - 2.50488cm + 2.21384cm + + + 2.51239cm 2.15376cm - 2.60235cm + 2.07958cm - 0.51314cm + 1.01502cm @@ -229,7 +232,7 @@ - Serie/Lote + Serie + + + + + + Textbox2 + + + + Black + + 1pt + + + Black + + 1pt + + #0e2455 + 2pt + 2pt + 2pt + 2pt + + + + @@ -497,14 +545,14 @@ - + true true - =Fields!SerieLote.Value + =Fields!Serie.Value @@ -515,7 +563,40 @@ - SerieLote + Serie + + + Bottom + 2pt + 2pt + =IIf(rownumber(nothing) = 1, "2pt", "0pt") + + + + + + + + true + true + + + + + =Fields!SeccionAlmacen.Value + + + + + + + SeccionAlmacen @@ -772,6 +853,40 @@ + + + + true + true + + + + + + + + + + + + Textbox15 + + + Bottom + 2pt + 2pt + =IIf(rownumber(nothing) = 1, "2pt", "0pt") + + + + @@ -1026,6 +1141,40 @@ + + + + true + true + + + + + + + + + + + + Textbox18 + + + Bottom + 2pt + 2pt + =IIf(rownumber(nothing) = 1, "2pt", "0pt") + + + + @@ -1280,6 +1429,40 @@ + + + + true + true + + + + + + + + + + + + Textbox42 + + + Bottom + 2pt + 2pt + =IIf(rownumber(nothing) = 1, "2pt", "0pt") + + + + @@ -1371,6 +1554,7 @@ + @@ -1395,8 +1579,8 @@ DsInventarios 0.07056cm 0.03488cm - 2.80201cm - 20.51911cm + 3.30389cm + 20.29832cm @@ -1504,7 +1688,7 @@ 1.68587in