From d92d188aa39fa9c22bff501e7931f72790074f13 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 31 Jan 2008 17:16:03 +0000 Subject: [PATCH] =?UTF-8?q?Subida=20con=20mejora=20en=20control=20de=20sto?= =?UTF-8?q?ck=20ya=20que=20podr=C3=A1=20filtrar=20el=20calculo=20de=20esto?= =?UTF-8?q?c=20(entradas,=20salidas=20...)=20a=20partir=20de=20una=20deter?= =?UTF-8?q?minada=20fecha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@98 1c943782-d109-9647-9548-93b3ac332352 --- Database/2.3 - vistas stock.sql | 60 +- Source/Cliente/AdminPV.rc | 2 +- Source/Cliente/AdminPV.res | Bin 18472 -> 18468 bytes .../Modulos/Parametros/Cliente/Parametros.dpk | 7 +- .../Parametros/Cliente/Parametros.dproj | 50 +- .../Modulos/Parametros/Cliente/Parametros.res | Bin 384 -> 4748 bytes .../Cliente/uViewParametrosFecha.dfm | 32 + .../Cliente/uViewParametrosFecha.pas | 63 + .../Stock/Cliente/uEditorControlStockEDI.dfm | 74 +- .../Stock/Cliente/uViewControGridStockEDI.dfm | 65 +- .../Stock/Cliente/uViewControGridStockEDI.pas | 19 +- .../uViewControGridStockEDIInventario.dfm | 71 +- .../uViewControGridStockEDIInventario.pas | 16 +- .../uViewControGridStockPrendasCentros.dfm | 40 +- .../uViewControGridStockPrendasCentros.pas | 18 +- .../Cliente/uViewControGridStockVARELA.dfm | 2 +- .../Cliente/uViewControGridStockVARELA.pas | 2 +- .../Stock/Reglas/schStockClient_Intf.pas | 1073 +++++++++++++- .../Stock/Reglas/schStockServer_Intf.pas | 1299 ++++++++++++++++- .../Modulos/Stock/Servidor/srvStock_Impl.dfm | 292 +++- Source/Servidor/AdminPV_Server.dproj | 7 + Source/Servidor/AdminPV_Server.rc | 2 +- Source/Servidor/AdminPV_Server.res | Bin 23340 -> 23336 bytes 23 files changed, 3036 insertions(+), 158 deletions(-) create mode 100644 Source/Modulos/Parametros/Cliente/uViewParametrosFecha.dfm create mode 100644 Source/Modulos/Parametros/Cliente/uViewParametrosFecha.pas diff --git a/Database/2.3 - vistas stock.sql b/Database/2.3 - vistas stock.sql index 7204afe..4302909 100644 --- a/Database/2.3 - vistas stock.sql +++ b/Database/2.3 - vistas stock.sql @@ -1,7 +1,5 @@ DROP VIEW [RDX_V_CONTROL_INVENTARIO] GO -DROP VIEW [RDX_V_INVENTARIO_STOCK] -GO DROP VIEW [RDX_V_INVENTARIO_STOCK_DESGLOSADO] GO DROP VIEW [RDX_V_STOCK_CALCULADO_DESGLOSADO] @@ -128,6 +126,7 @@ GO CREATE VIEW RDX_V_STOCK AS SELECT + FECHA = ISNULL(RDX_V_STOCK_INVENTARIO.FECHA, RDX_V_STOCK_VENTAS.FECHA), CENTRO = ISNULL(RDX_V_STOCK_INVENTARIO.CENTRO, RDX_V_STOCK_VENTAS.CENTRO), FILIAL = ISNULL(RDX_V_STOCK_INVENTARIO.FILIAL, RDX_V_STOCK_VENTAS.FILIAL), CODIGO = ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO), @@ -362,6 +361,7 @@ FULL OUTER JOIN RDX_V_STOCK_VENTAS ON LEFT OUTER JOIN PRODUTOS ON (PRODUTOS.PRODUTO = ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO)) GROUP BY + ISNULL(RDX_V_STOCK_INVENTARIO.FECHA, RDX_V_STOCK_VENTAS.FECHA), ISNULL(RDX_V_STOCK_INVENTARIO.CENTRO, RDX_V_STOCK_VENTAS.CENTRO), ISNULL(RDX_V_STOCK_INVENTARIO.FILIAL, RDX_V_STOCK_VENTAS.FILIAL), ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO), @@ -376,6 +376,7 @@ GO CREATE VIEW RDX_V_STOCK_CALCULADO AS SELECT + FECHA, CENTRO, FILIAL, CODIGO, @@ -416,7 +417,8 @@ GO /*Y NO LAS DE TIPO2(S,M,L,XL)*/ CREATE VIEW RDX_V_STOCK_CALCULADO_DESGLOSADO AS -SELECT CENTRO, +SELECT FECHA, + CENTRO, FILIAL, CODIGO, PRODUCTO, @@ -444,6 +446,7 @@ GO CREATE VIEW RDX_V_INVENTARIO_STOCK_DESGLOSADO AS SELECT + ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.FECHA, RDX_V_ULTIMO_INVENTARIO.FECHA) as FECHA, ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.CENTRO, RDX_V_ULTIMO_INVENTARIO.CENTRO) as CENTRO, ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.FILIAL, RDX_V_ULTIMO_INVENTARIO.FILIAL) as FILIAL, ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.CODIGO, RDX_V_ULTIMO_INVENTARIO.CODIGO) as CODIGO, @@ -464,12 +467,14 @@ FULL OUTER JOIN RDX_V_STOCK_CALCULADO_DESGLOSADO ON AND (RDX_V_ULTIMO_INVENTARIO.CODIGO = RDX_V_STOCK_CALCULADO_DESGLOSADO.CODIGO) AND (RDX_V_ULTIMO_INVENTARIO.COLOR = RDX_V_STOCK_CALCULADO_DESGLOSADO.COLOR) AND (RDX_V_ULTIMO_INVENTARIO.TALLA = RDX_V_STOCK_CALCULADO_DESGLOSADO.TALLA) +AND (RDX_V_ULTIMO_INVENTARIO.FECHA = RDX_V_STOCK_CALCULADO_DESGLOSADO.FECHA) GO /*--------------- SQL ---------------*/ -CREATE VIEW RDX_V_INVENTARIO_STOCK AS +CREATE VIEW RDX_V_CONTROL_INVENTARIO AS select + FECHA, CENTRO, FILIAL, CODIGO, @@ -552,7 +557,8 @@ select from RDX_V_INVENTARIO_STOCK_DESGLOSADO -group by CENTRO, +group by FECHA, + CENTRO, FILIAL, CODIGO, PRODUCTO, @@ -564,47 +570,3 @@ GO /*--------------- SQL ---------------*/ -CREATE VIEW RDX_V_CONTROL_INVENTARIO AS -SELECT - CENTRO, - FILIAL, - CODIGO, - PRODUCTO, - COLOR, - TIPO_PRODUCTO, - GRUPO_PRODUCTO, - COLECCION, - - I38, - I40, - I42, - I44, - I46, - I48, - TI = ISNULL(I38, 0) + ISNULL(I40, 0) + ISNULL(I42, 0) + ISNULL(I44, 0) + ISNULL(I46, 0) + ISNULL(I48, 0), - - K38, - K40, - K42, - K44, - K46, - K48, - TK = ISNULL(K38, 0) + ISNULL(K40, 0) + ISNULL(K42, 0) + ISNULL(K44, 0) + ISNULL(K46, 0) + ISNULL(K48, 0), - - D38 = ISNULL(I38, 0) - ISNULL(K38, 0), - D40 = ISNULL(I40, 0) - ISNULL(K40, 0), - D42 = ISNULL(I42, 0) - ISNULL(K42, 0), - D44 = ISNULL(I44, 0) - ISNULL(K44, 0), - D46 = ISNULL(I46, 0) - ISNULL(K46, 0), - D48 = ISNULL(I48, 0) - ISNULL(K48, 0), - DT = ISNULL(I38, 0) - ISNULL(K38, 0) + ISNULL(I40, 0) - ISNULL(K40, 0) + - ISNULL(I42, 0) - ISNULL(K42, 0) + ISNULL(I44, 0) - ISNULL(K44, 0) + - ISNULL(I46, 0) - ISNULL(K46, 0) + ISNULL(I48, 0) - ISNULL(K48, 0) - -FROM RDX_V_INVENTARIO_STOCK -where ((ISNULL(I38, 0) - ISNULL(K38, 0) + ISNULL(I40, 0) - ISNULL(K40, 0) + - ISNULL(I42, 0) - ISNULL(K42, 0) + ISNULL(I44, 0) - ISNULL(K44, 0) + - ISNULL(I46, 0) - ISNULL(K46, 0) + ISNULL(I48, 0) - ISNULL(K48, 0)) <> 0) - -GO -/* EOF */ diff --git a/Source/Cliente/AdminPV.rc b/Source/Cliente/AdminPV.rc index afcfcb5..0d42ed9 100644 --- a/Source/Cliente/AdminPV.rc +++ b/Source/Cliente/AdminPV.rc @@ -17,7 +17,7 @@ BEGIN VALUE "InternalName", "Administración de puntos de venta\0" VALUE "ProductName", "Administración de puntos de venta\0" VALUE "ProductVersion", "1.0.0.0\0" - VALUE "CompileDate", "lunes, 08 de octubre de 2007 12:43\0" + VALUE "CompileDate", "jueves, 24 de enero de 2008 19:08\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res index bef3f48d0fdb97d13584cdb9f2ea042965796538..b50bec2f9f3d45dcf9925391c12fd0c416604acc 100644 GIT binary patch delta 112 zcmZ26fpN(M#ti|kj9VrLy2=B|Lf2?Uk;!LWl^H*5{^;7x$ehBUG`Zeg)-j8rlp&R& w42X*vbQlyEj2KLSWD1b40K|DfT*QzM7cpWm0745O-;lwQ!3xBl{LtMU03HMy^Z)<= delta 116 zcmZ27fpNtI#ti|kj5{U=y2=B|Lf2?UvB_s$l^H*6{^;7x$ehNYJh|Ro)-{Krlp&8H zm7$nHhe3hCfWZPtrU3a04EYSn3?)F>B!(g|A0lc5RAazk4wN@!Fk-M`FkvueV3>T@ G-5mgr9vf@` diff --git a/Source/Modulos/Parametros/Cliente/Parametros.dpk b/Source/Modulos/Parametros/Cliente/Parametros.dpk index dc156f8..fd386ed 100644 --- a/Source/Modulos/Parametros/Cliente/Parametros.dpk +++ b/Source/Modulos/Parametros/Cliente/Parametros.dpk @@ -46,13 +46,16 @@ requires JvStdCtrlsD10R, JvSystemD10R, tbx_D10, - tb2k_D10; + tb2k_D10, + DataAbstract_Core_D10, + RemObjects_Core_D10; contains uDataModuleParametros in 'uDataModuleParametros.pas' {dmParametros: TDAClientDataModule}, schParametrosClient_Intf in '..\Reglas\schParametrosClient_Intf.pas', uBizParametros in '..\Reglas\uBizParametros.pas', uViewParametrosCentro in 'uViewParametrosCentro.pas' {frViewParametrosCentro: TCustomView}, - uViewParametrosColeccion in 'uViewParametrosColeccion.pas' {frViewParametrosColeccion: TCustomView}; + uViewParametrosColeccion in 'uViewParametrosColeccion.pas' {frViewParametrosColeccion: TCustomView}, + uViewParametrosFecha in 'uViewParametrosFecha.pas' {frViewParametrosFecha: TCustomView}; end. diff --git a/Source/Modulos/Parametros/Cliente/Parametros.dproj b/Source/Modulos/Parametros/Cliente/Parametros.dproj index 3f291b5..3fb15a4 100644 --- a/Source/Modulos/Parametros/Cliente/Parametros.dproj +++ b/Source/Modulos/Parametros/Cliente/Parametros.dproj @@ -1,4 +1,5 @@ - + + {6be250c1-7a66-46ce-a9aa-2c4fe6aa768e} Parametros.dpk @@ -53,27 +54,25 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
dmParametros
@@ -83,6 +82,13 @@
frViewParametrosColeccion
+ +
frViewParametrosColeccion
+
+ + + +