From e2a1f9f3125a686e3a128b2cbdfd2e0293f8d3d0 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 19 May 2008 15:04:59 +0000 Subject: [PATCH] =?UTF-8?q?Arreglado=20fallo=20en=20el=20esquema=20del=20m?= =?UTF-8?q?=C3=B3dulo=20de=20recepciones=20porque=20no=20se=20pod=C3=ADa?= =?UTF-8?q?=20cambiar=20de=20estado=20a=20las=20tuplas.?= 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@122 1c943782-d109-9647-9548-93b3ac332352 --- Source/Base/Base.dproj | 30 ---- Source/Base/Base.drc | 2 +- Source/CargaEDI/CargaEDI.dproj | 7 +- Source/CargaEDI/CargaEDI.drc | 2 +- Source/CargaEDI/CargaEDI.rc | 8 +- Source/CargaEDI/CargaEDI.res | Bin 15548 -> 15548 bytes Source/Cliente/AdminPV.dproj | 2 +- Source/Cliente/AdminPV.drc | 2 +- Source/Cliente/AdminPV.rc | 10 +- Source/Cliente/AdminPV.res | Bin 18468 -> 18464 bytes Source/ControlesBase/ControlesBase.drc | 2 +- .../Devoluciones/Cliente/Devoluciones.drc | 2 +- .../FicherosEDI/Cliente/FicherosEDI.drc | 2 +- .../Modulos/Parametros/Cliente/Parametros.drc | 2 +- .../Recepciones/Cliente/Recepciones.drc | 2 +- .../Cliente/uDataModuleRecepciones.dfm | 4 - .../Servidor/srvRecepciones_Impl.dfm | 147 ++++++++---------- .../Cliente/ReferenciaGenerica.drc | 2 +- Source/Modulos/Stock/Cliente/Stock.drc | 2 +- .../Modulos/Traspasos/Cliente/Traspasos.drc | 2 +- .../VentasProceso/Cliente/VentasProceso.drc | 2 +- .../Cliente/VentasTerminadas.drc | 2 +- Source/Servidor/AdminPV_Server.dproj | 2 +- Source/Servidor/AdminPV_Server.drc | 4 +- Source/Servidor/AdminPV_Server.rc | 10 +- Source/Servidor/AdminPV_Server.res | Bin 23336 -> 23332 bytes Source/Servidor/EDI/EDI_Inventary_Impl.dfm | 8 +- Source/Servidor/EDI/EDI_Inventary_Impl.pas | 113 +++++++++++++- 28 files changed, 221 insertions(+), 150 deletions(-) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index ef68c67..7f91f97 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -40,36 +40,6 @@ Package FalseTrueFalseFalseFalseTrueC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2000FalseFalseFalseFalseFalse308212522.0.0.01.0.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CodeGear WebSnap Components CodeGear SOAP Components Microsoft Office XP Sample Automation Server Wrapper Components diff --git a/Source/Base/Base.drc b/Source/Base/Base.drc index 47ebfe2..aeca9cb 100644 --- a/Source/Base/Base.drc +++ b/Source/Base/Base.drc @@ -29,4 +29,4 @@ END /* C:\Varela_D2007\Source\Base\uViewBarraSeleccion.dfm */ /* C:\Varela_D2007\Source\Base\uViewGrid.dfm */ /* C:\Varela_D2007\Source\Base\Base.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2E.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf32.tmp */ diff --git a/Source/CargaEDI/CargaEDI.dproj b/Source/CargaEDI/CargaEDI.dproj index 1414863..e90f8e6 100644 --- a/Source/CargaEDI/CargaEDI.dproj +++ b/Source/CargaEDI/CargaEDI.dproj @@ -43,7 +43,12 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2120FalseFalseFalseFalseFalse308212522.1.2.02.1.2.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2140FalseFalseFalseFalseFalse308212522.1.4.02.1.4.0 + + + + + diff --git a/Source/CargaEDI/CargaEDI.drc b/Source/CargaEDI/CargaEDI.drc index f3730d1..3f93cff 100644 --- a/Source/CargaEDI/CargaEDI.drc +++ b/Source/CargaEDI/CargaEDI.drc @@ -15,4 +15,4 @@ END /* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */ /* C:\Varela_D2007\Source\CargaEDI\uCargaEDI.dfm */ /* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf48.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4C.tmp */ diff --git a/Source/CargaEDI/CargaEDI.rc b/Source/CargaEDI/CargaEDI.rc index c135b38..ec4ed75 100644 --- a/Source/CargaEDI/CargaEDI.rc +++ b/Source/CargaEDI/CargaEDI.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Varela_D2007\Resources\Iconos\CargaEDI.ico" 1 VERSIONINFO -FILEVERSION 2,1,2,0 -PRODUCTVERSION 2,1,2,0 +FILEVERSION 2,1,4,0 +PRODUCTVERSION 2,1,4,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,8 +12,8 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "2.1.2.0\0" - VALUE "ProductVersion", "2.1.2.0\0" + VALUE "FileVersion", "2.1.4.0\0" + VALUE "ProductVersion", "2.1.4.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/CargaEDI/CargaEDI.res b/Source/CargaEDI/CargaEDI.res index 045ada7732f72278d9ce2896dedcfd1005200eec..120483d610a4cd2b3442ab7228ce190824e78955 100644 GIT binary patch delta 33 ncmdl}xu21W)Z1_lO}$-Au^8BHeJ+86`LLK|-Ytg8uH delta 33 ncmdl}xuDelphi.Personality VCLApplication - FalseTrueFalseTrueFalse2130FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.3.0Administración de puntos de ventaAdministración de puntos de venta2.1.3.0miércoles, 07 de mayo de 2008 18:40 + FalseTrueFalseTrueFalse2140FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.4.0Administración de puntos de ventaAdministración de puntos de venta2.1.4.0viernes, 09 de mayo de 2008 11:23 CodeGear WebSnap Components CodeGear SOAP Components Microsoft Office XP Sample Automation Server Wrapper Components diff --git a/Source/Cliente/AdminPV.drc b/Source/Cliente/AdminPV.drc index 560f833..259dc56 100644 --- a/Source/Cliente/AdminPV.drc +++ b/Source/Cliente/AdminPV.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */ /* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */ /* C:\Varela_D2007\Source\Cliente\AdminPV.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf46.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4A.tmp */ diff --git a/Source/Cliente/AdminPV.rc b/Source/Cliente/AdminPV.rc index 998e11f..ee59d11 100644 --- a/Source/Cliente/AdminPV.rc +++ b/Source/Cliente/AdminPV.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Cliente.ico" 1 VERSIONINFO -FILEVERSION 2,1,3,0 -PRODUCTVERSION 2,1,3,0 +FILEVERSION 2,1,4,0 +PRODUCTVERSION 2,1,4,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,11 +13,11 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.1.3.0\0" + VALUE "FileVersion", "2.1.4.0\0" VALUE "InternalName", "Administración de puntos de venta\0" VALUE "ProductName", "Administración de puntos de venta\0" - VALUE "ProductVersion", "2.1.3.0\0" - VALUE "CompileDate", "viernes, 09 de mayo de 2008 11:23\0" + VALUE "ProductVersion", "2.1.4.0\0" + VALUE "CompileDate", "lunes, 19 de mayo de 2008 16:33\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res index d01abb078aa75853066c3a7448bc5164caf02085..fe73d6894f0bfe951f8286f6471506af9a281410 100644 GIT binary patch delta 99 zcmZ27fpNhE#ti|kj2k8gy2=B|LRV8x76wKJCI$uumdWc~Wf=t~pLJDcd^7o@YdfRK zl CtQx=o delta 103 zcmZ25fpN(M#ti|kj9VrLy2=B|LRV8xW(GzECI$uu=E>__Wf?^#pLJDc{4n{WYdfRy z-gcXd`n1}g@m$=BUI E0sBxJoB#j- diff --git a/Source/ControlesBase/ControlesBase.drc b/Source/ControlesBase/ControlesBase.drc index 6f297c8..7619fac 100644 --- a/Source/ControlesBase/ControlesBase.drc +++ b/Source/ControlesBase/ControlesBase.drc @@ -26,4 +26,4 @@ END /* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlBase.dfm */ /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewPeriodoFechas.dfm */ /* C:\Varela_D2007\Source\ControlesBase\ControlesBase.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf30.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf34.tmp */ diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc index c2bf136..e218c13 100644 --- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc +++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uPluginControllerDevoluciones.dfm */ /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uEditorAjustarDevoluciones.dfm */ /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf40.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf44.tmp */ diff --git a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc index 1cf1173..185f842 100644 --- a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc +++ b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uEditorHistorialCargasEDI.dfm */ /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uPluginControllerFicherosEDI.dfm */ /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf36.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3A.tmp */ diff --git a/Source/Modulos/Parametros/Cliente/Parametros.drc b/Source/Modulos/Parametros/Cliente/Parametros.drc index 0a9da68..7da7300 100644 --- a/Source/Modulos/Parametros/Cliente/Parametros.drc +++ b/Source/Modulos/Parametros/Cliente/Parametros.drc @@ -17,4 +17,4 @@ END /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosColeccion.dfm */ /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosFecha.dfm */ /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf32.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf36.tmp */ diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.drc b/Source/Modulos/Recepciones/Cliente/Recepciones.drc index a437c7b..6b1ba85 100644 --- a/Source/Modulos/Recepciones/Cliente/Recepciones.drc +++ b/Source/Modulos/Recepciones/Cliente/Recepciones.drc @@ -19,4 +19,4 @@ END /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorListaRecepcionesAlbaran.dfm */ /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uPluginControllerRecepciones.dfm */ /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3E.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf42.tmp */ diff --git a/Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm b/Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm index 8570b55..2c538a6 100644 --- a/Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm +++ b/Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm @@ -76,7 +76,6 @@ object dmRecepciones: TdmRecepciones Name = 'ALBARAN' DataType = datString Size = 7 - LogChanges = False ReadOnly = True DictionaryEntry = 'Recepciones_ALBARAN' end @@ -377,7 +376,6 @@ object dmRecepciones: TdmRecepciones Name = 'ALBARAN' DataType = datString Size = 7 - LogChanges = False ReadOnly = True DictionaryEntry = 'Recepciones_ALBARAN' end @@ -678,7 +676,6 @@ object dmRecepciones: TdmRecepciones Name = 'ALBARAN' DataType = datString Size = 7 - LogChanges = False ReadOnly = True DictionaryEntry = 'Recepciones_ALBARAN' end @@ -920,7 +917,6 @@ object dmRecepciones: TdmRecepciones Name = 'ALBARAN' DataType = datString Size = 7 - LogChanges = False ReadOnly = True DictionaryEntry = 'Recepciones_ALBARAN' end diff --git a/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm b/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm index 5936835..e53de73 100644 --- a/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm +++ b/Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm @@ -1320,162 +1320,153 @@ object srvRecepciones: TsrvRecepciones DataType = datString Size = 7 Value = '' - ParamType = daptInput end item Name = 'ESTADO_ALBARAN' DataType = datString Size = 15 Value = '' - ParamType = daptInput end item Name = 'OBSERVACIONES_ALBARAN' DataType = datString Size = 255 Value = '' - ParamType = daptInput end item Name = 'CONTABILIZAR_ALBARAN' DataType = datString Size = 1 Value = '' - ParamType = daptInput + end + item + Name = 'RR36' + DataType = datInteger + Value = '' end item Name = 'RR38' - DataType = datFloat + DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'RR40' - DataType = datFloat + DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'RR42' - DataType = datFloat + DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'RR44' - DataType = datFloat + DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'RR46' - DataType = datFloat + DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'RR48' - DataType = datFloat + DataType = datInteger Value = '' - ParamType = daptInput end item Name = 'APROBADO' DataType = datString Size = 1 Value = '' - ParamType = daptInput end item Name = 'FECHA' DataType = datDateTime Value = '' - ParamType = daptInput end item Name = 'CENTRO' DataType = datString Size = 17 Value = '' - ParamType = daptInput end item Name = 'CODIGO' DataType = datString Size = 12 Value = '' - ParamType = daptInput end item Name = 'COLOR' DataType = datString Size = 10 Value = '' - ParamType = daptInput end> Statements = < item Connection = 'GFT_VARELA' - TargetTable = 'RDX_V_CONTROL_RECEPCION' SQL = 'begin'#10' declare @rowcount_var int'#10' declare @ALBARAN char(7)' + #10' declare @ESTADO_ALBARAN varchar(20)'#10' declare @OBSERVACIO' + 'NES_ALBARAN varchar(255)'#10' declare @CONTABILIZAR_ALBARAN char(' + - '1)'#10#10' declare @RR38 numeric(15,0)'#10' declare @RR40 numeric(15' + - ',0)'#10' declare @RR42 numeric(15,0)'#10' declare @RR44 numeric(15' + - ',0)'#10' declare @RR46 numeric(15,0)'#10' declare @RR48 numeric(15' + - ',0)'#10' declare @RR_S numeric(15,0)'#10' declare @RR_M numeric(15' + - ',0)'#10' declare @RR_L numeric(15,0)'#10' declare @RR_XL numeric(1' + - '5,0)'#10#10' declare @APROBADO char(1)'#10' declare @FECHA datetime'#10 + - ' declare @CENTRO varchar(17)'#10' declare @CODIGO varchar(12)'#10 + - ' declare @COLOR varchar(10)'#10' '#10' declare @TIPO_TALLAJE sm' + - 'allint'#10#10' set @ALBARAN = :ALBARAN'#10' set @ESTADO_ALBARAN = :E' + - 'STADO_ALBARAN'#10' set @OBSERVACIONES_ALBARAN = :OBSERVACIONES_AL' + - 'BARAN'#10' set @CONTABILIZAR_ALBARAN = :CONTABILIZAR_ALBARAN'#10#10' ' + - ' set @RR38 = :RR38'#10' set @RR40 = :RR40'#10' set @RR42 = :RR42'#10' ' + - ' set @RR44 = :RR44'#10' set @RR46 = :RR46'#10' set @RR48 = :RR48' + - #10' set @RR_S = :RR38'#10' set @RR_M = :RR40'#10' set @RR_L = :RR' + - '42'#10' set @RR_XL = :RR44'#10#10' set @APROBADO = :APROBADO'#10' set' + - ' @FECHA = :FECHA'#10' set @CENTRO = :CENTRO'#10' set @CODIGO = :CO' + - 'DIGO'#10' set @COLOR = :COLOR'#10#10#10' /* **************************' + - '********* */'#10' if @ALBARAN <> '#39#39#10' begin'#10' update RDX' + - '_AJUSTES_ALBARAN set'#10#9' ESTADO = @ESTADO_ALBARAN,'#10#9' O' + - 'BSERVACIONES = @OBSERVACIONES_ALBARAN,'#10#9' CONTABILIZAR = @C' + - 'ONTABILIZAR_ALBARAN'#10' where RDX_AJUSTES_ALBARAN.ALBARAN =' + - ' @ALBARAN'#10#10#9' select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10' if @ROW' + - 'COUNT_VAR = 0'#10#9' begin'#10' insert into RDX_AJUSTES_ALBAR' + - 'AN'#10' (ALBARAN, ESTADO, OBSERVACIONES, CONTABIL' + - 'IZAR)'#10' values (@ALBARAN, @ESTADO_ALBARAN,'#10' ' + - ' @OBSERVACIONES_ALBARAN, @CONTABILIZAR_ALBARAN)'#10#10' ' + - ' select @ROWCOUNT_VAR = @@ROWCOUNT'#10' end'#10' end'#10 + - #10#10' /* ARREGLO PARA QUE SOPORTE LOS NUEVOS TALLAJES*** */'#10' ' + - #10' execute RDX_P_TIPO_TALLAJE @CODIGO, @TIPO_TALLAJE OUTPUT'#10#10' ' + - ' if @TIPO_TALLAJE = 1'#10' begin'#10' set @RR_S = NULL'#10' ' + - ' set @RR_M = NULL'#10' set @RR_L = NULL'#10' set @RR_XL = NU' + - 'LL'#10' end'#10#10' if @TIPO_TALLAJE = 2'#10' begin'#10' set @RR38 ' + - '= NULL'#10' set @RR40 = NULL'#10' set @RR42 = NULL'#10' se' + - 't @RR44 = NULL'#10' set @RR46 = NULL'#10' set @RR48 = NULL'#10' ' + - ' end'#10#10' '#10' /* *********************************** */'#10#9'upda' + - 'te RDX_RECEPCION_AJUSTES set'#10#9' CANT38 = @RR38,'#10#9' ' + - ' CANT40 = @RR40,'#10#9' CANT42 = @RR42,'#10#9' CAN' + - 'T44 = @RR44,'#10#9' CANT46 = @RR46,'#10#9' CANT48 = @R' + - 'R48,'#10#9' CANT_S = @RR_S,'#10#9' CANT_M = @RR_M,'#10#9' ' + - ' CANT_L = @RR_L,'#10#9' CANT_XL = @RR_XL,'#10' ' + - ' APROBADO = @APROBADO,'#10' FECHACAMBIO = CURRENT' + - '_TIMESTAMP'#10#9'where'#10' (RDX_RECEPCION_AJUSTES.CENTRO = @' + - 'CENTRO and'#10#9' RDX_RECEPCION_AJUSTES.CODIGO = @CODIGO and'#10#9' ' + - ' RDX_RECEPCION_AJUSTES.COLOR = @COLOR and'#10#9' RDX_RECEPCIO' + - 'N_AJUSTES.FECHA = @FECHA)'#10#10#9'select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10#9 + - 'if @ROWCOUNT_VAR = 0'#10' begin'#10' insert into RDX_RECE' + - 'PCION_AJUSTES'#10' (FECHA, CENTRO, CODIGO, COLOR,'#10' ' + - ' APROBADO, FECHACAMBIO,'#10' CANT38, CA' + - 'NT40, CANT42,'#10' CANT44, CANT46, CANT48,'#10' ' + - ' CANT_S, CANT_M, CANT_L, CANT_XL)'#10' values ('#10' ' + - ' @FECHA, @CENTRO, @CODIGO,'#10' @COLOR, @' + - 'APROBADO, CURRENT_TIMESTAMP,'#10' @RR38, @RR40, @RR4' + - '2,'#10' @RR44, @RR46, @RR48,'#10' @RR_S,' + - ' @RR_M, @RR_L, @RR_XL)'#10#10' select @ROWCOUNT_VAR = @@ROWCOU' + - 'NT'#10' end'#10'end'#10 + '1)'#10#10' declare @RR36 numeric(15,0)'#10' declare @RR38 numeric(15' + + ',0)'#10' declare @RR40 numeric(15,0)'#10' declare @RR42 numeric(15' + + ',0)'#10' declare @RR44 numeric(15,0)'#10' declare @RR46 numeric(15' + + ',0)'#10' declare @RR48 numeric(15,0)'#10' declare @RR_S numeric(15' + + ',0)'#10' declare @RR_M numeric(15,0)'#10' declare @RR_L numeric(15' + + ',0)'#10' declare @RR_XL numeric(15,0)'#10#10' declare @APROBADO char' + + '(1)'#10' declare @FECHA datetime'#10' declare @CENTRO varchar(17)'#10 + + ' declare @CODIGO varchar(12)'#10' declare @COLOR varchar(10)'#10' ' + + ' '#10' declare @TIPO_TALLAJE smallint'#10#10' set @ALBARAN = :ALBA' + + 'RAN'#10' set @ESTADO_ALBARAN = :ESTADO_ALBARAN'#10' set @OBSERVACI' + + 'ONES_ALBARAN = :OBSERVACIONES_ALBARAN'#10' set @CONTABILIZAR_ALBA' + + 'RAN = :CONTABILIZAR_ALBARAN'#10#10' set @RR36 = :RR36'#10' set @RR38' + + ' = :RR38'#10' set @RR40 = :RR40'#10' set @RR42 = :RR42'#10' set @RR' + + '44 = :RR44'#10' set @RR46 = :RR46'#10' set @RR48 = :RR48'#10' set @' + + 'RR_S = :RR38'#10' set @RR_M = :RR40'#10' set @RR_L = :RR42'#10' set' + + ' @RR_XL = :RR44'#10#10' set @APROBADO = :APROBADO'#10' set @FECHA = ' + + ':FECHA'#10' set @CENTRO = :CENTRO'#10' set @CODIGO = :CODIGO'#10' s' + + 'et @COLOR = :COLOR'#10#10#10' /* *********************************** ' + + '*/'#10' if @ALBARAN <> '#39#39#10' begin'#10' update RDX_AJUSTES_A' + + 'LBARAN set'#10#9' ESTADO = @ESTADO_ALBARAN,'#10#9' OBSERVACION' + + 'ES = @OBSERVACIONES_ALBARAN,'#10#9' CONTABILIZAR = @CONTABILIZA' + + 'R_ALBARAN'#10' where RDX_AJUSTES_ALBARAN.ALBARAN = @ALBARAN'#10 + + #10#9' select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10' if @ROWCOUNT_VAR ' + + '= 0'#10#9' begin'#10' insert into RDX_AJUSTES_ALBARAN'#10' ' + + ' (ALBARAN, ESTADO, OBSERVACIONES, CONTABILIZAR)'#10' ' + + ' values (@ALBARAN, @ESTADO_ALBARAN,'#10' ' + + ' @OBSERVACIONES_ALBARAN, @CONTABILIZAR_ALBARAN)'#10#10' se' + + 'lect @ROWCOUNT_VAR = @@ROWCOUNT'#10' end'#10' end'#10#10#10' /* A' + + 'RREGLO PARA QUE SOPORTE LOS NUEVOS TALLAJES*** */'#10' '#10' execu' + + 'te RDX_P_TIPO_TALLAJE @CODIGO, @TIPO_TALLAJE OUTPUT'#10#10' if @TIP' + + 'O_TALLAJE = 1'#10' begin'#10' set @RR_S = NULL'#10' set @RR_M' + + ' = NULL'#10' set @RR_L = NULL'#10' set @RR_XL = NULL'#10' end' + + #10#10' if @TIPO_TALLAJE = 2'#10' begin'#10' set @RR36 = NULL'#10' ' + + ' set @RR38 = NULL'#10' set @RR40 = NULL'#10' set @RR42 = ' + + 'NULL'#10' set @RR44 = NULL'#10' set @RR46 = NULL'#10' set ' + + '@RR48 = NULL'#10' end'#10#10' '#10' /* ******************************' + + '***** */'#10#9'update RDX_RECEPCION_AJUSTES set'#10#9' CANT36 = ' + + '@RR36,'#10#9' CANT38 = @RR38,'#10#9' CANT40 = @RR40,'#10#9 + + ' CANT42 = @RR42,'#10#9' CANT44 = @RR44,'#10#9' ' + + ' CANT46 = @RR46,'#10#9' CANT48 = @RR48,'#10#9' CANT_' + + 'S = @RR_S,'#10#9' CANT_M = @RR_M,'#10#9' CANT_L = @RR_' + + 'L,'#10#9' CANT_XL = @RR_XL,'#10' APROBADO = @APRO' + + 'BADO,'#10' FECHACAMBIO = CURRENT_TIMESTAMP'#10#9'where'#10' ' + + ' (RDX_RECEPCION_AJUSTES.CENTRO = @CENTRO and'#10#9' RDX_' + + 'RECEPCION_AJUSTES.CODIGO = @CODIGO and'#10#9' RDX_RECEPCION_AJUS' + + 'TES.COLOR = @COLOR and'#10#9' RDX_RECEPCION_AJUSTES.FECHA = @FEC' + + 'HA)'#10#10#9'select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10#9'if @ROWCOUNT_VAR = 0'#10' ' + + ' begin'#10' insert into RDX_RECEPCION_AJUSTES'#10' ' + + ' (FECHA, CENTRO, CODIGO, COLOR,'#10' APROBADO' + + ', FECHACAMBIO, CANT36,'#10' CANT38, CANT40, CANT42,'#10 + + ' CANT44, CANT46, CANT48,'#10' CANT_S' + + ', CANT_M, CANT_L, CANT_XL)'#10' values ('#10' @F' + + 'ECHA, @CENTRO, @CODIGO,'#10' @COLOR, @APROBADO, CURR' + + 'ENT_TIMESTAMP, @RR36,'#10' @RR38, @RR40, @RR42,'#10' ' + + ' @RR44, @RR46, @RR48,'#10' @RR_S, @RR_M,' + + ' @RR_L, @RR_XL)'#10#10' select @ROWCOUNT_VAR = @@ROWCOUNT'#10' ' + + ' end'#10'end'#10 StatementType = stSQL ColumnMappings = <> end> @@ -1578,9 +1569,7 @@ object srvRecepciones: TsrvRecepciones Name = 'Recepciones_ALBARAN' DataType = datString Size = 7 - LogChanges = False DisplayLabel = 'ALBARAN' - ReadOnly = True end item Name = 'Recepciones_ESTADO_ALBARAN' diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc index 0bbef16..8847e11 100644 --- a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc +++ b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uPluginControllerReferenciaGenerica.dfm */ /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uEditorCambioReferenciaGenerica.dfm */ /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3C.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf40.tmp */ diff --git a/Source/Modulos/Stock/Cliente/Stock.drc b/Source/Modulos/Stock/Cliente/Stock.drc index 33e5f04..8439e96 100644 --- a/Source/Modulos/Stock/Cliente/Stock.drc +++ b/Source/Modulos/Stock/Cliente/Stock.drc @@ -21,4 +21,4 @@ END /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uEditorControlStockVARELA.dfm */ /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uPluginControllerStock.dfm */ /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf44.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf48.tmp */ diff --git a/Source/Modulos/Traspasos/Cliente/Traspasos.drc b/Source/Modulos/Traspasos/Cliente/Traspasos.drc index e680f60..ea46ab5 100644 --- a/Source/Modulos/Traspasos/Cliente/Traspasos.drc +++ b/Source/Modulos/Traspasos/Cliente/Traspasos.drc @@ -18,4 +18,4 @@ END /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uPluginControllerTraspasos.dfm */ /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uEditorAjustarTraspasos.dfm */ /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\Traspasos.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf42.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf46.tmp */ diff --git a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc index 23a3e99..7227262 100644 --- a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc +++ b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc @@ -20,4 +20,4 @@ END /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uViewControlVentaProceso.dfm */ /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uEditorControlVentaProceso.dfm */ /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\VentasProceso.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3A.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3E.tmp */ diff --git a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc index ed60e90..4860c56 100644 --- a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc +++ b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc @@ -22,4 +22,4 @@ END /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uPluginControllerVentasTerminadas.dfm */ /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uEditorControlVentasTerminadas.dfm */ /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\VentasTerminadas.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf38.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3C.tmp */ diff --git a/Source/Servidor/AdminPV_Server.dproj b/Source/Servidor/AdminPV_Server.dproj index 87109eb..d78046a 100644 --- a/Source/Servidor/AdminPV_Server.dproj +++ b/Source/Servidor/AdminPV_Server.dproj @@ -44,7 +44,7 @@ Delphi.Personality VCLApplication - FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2130FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.3.0AdminPV_Server2.1.3.0miércoles, 07 de mayo de 2008 18:40AdminPV_Server.dpr + FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2140FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.4.0AdminPV_Server2.1.4.0viernes, 09 de mayo de 2008 11:23AdminPV_Server.dpr ExpressPrinting System by Developer Express Inc. CodeGear WebSnap Components CodeGear SOAP Components diff --git a/Source/Servidor/AdminPV_Server.drc b/Source/Servidor/AdminPV_Server.drc index eaa1aa8..333ee1d 100644 --- a/Source/Servidor/AdminPV_Server.drc +++ b/Source/Servidor/AdminPV_Server.drc @@ -2977,8 +2977,8 @@ END /* C:\Varela_D2007\Source\Servidor\Services\EDI_Sales\uDataModuleEDI_Sales.dfm */ /* C:\Varela_D2007\Source\Servidor\uAcercaDe.dfm */ /* C:\Varela_D2007\Source\Servidor\fServerForm.dfm */ -/* C:\Varela_D2007\Source\Servidor\EDI\EDI_Inventary_Impl.dfm */ /* C:\Varela_D2007\Source\Servidor\Services\EDI_Inventary\uDataModuleEDI_Inventary.dfm */ +/* C:\Varela_D2007\Source\Servidor\EDI\EDI_Inventary_Impl.dfm */ /* C:\Varela_D2007\Source\Servidor\Services\Login\srvLogin_Impl.dfm */ /* C:\Varela_D2007\Source\Servidor\srvInformes_Impl.dfm */ /* C:\Varela_D2007\Source\Servidor\Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.dfm */ @@ -2995,4 +2995,4 @@ END /* C:\Varela_D2007\Source\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.dfm */ /* C:\Varela_D2007\Source\Servidor\AdminPV_Server.res */ /* C:\Varela_D2007\Source\Servidor\RODLFILE.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4A.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4E.tmp */ diff --git a/Source/Servidor/AdminPV_Server.rc b/Source/Servidor/AdminPV_Server.rc index 691c632..4fc7150 100644 --- a/Source/Servidor/AdminPV_Server.rc +++ b/Source/Servidor/AdminPV_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 2,1,3,0 -PRODUCTVERSION 2,1,3,0 +FILEVERSION 2,1,4,0 +PRODUCTVERSION 2,1,4,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.1.3.0\0" + VALUE "FileVersion", "2.1.4.0\0" VALUE "ProductName", "AdminPV_Server\0" - VALUE "ProductVersion", "2.1.3.0\0" - VALUE "CompileDate", "viernes, 09 de mayo de 2008 11:23\0" + VALUE "ProductVersion", "2.1.4.0\0" + VALUE "CompileDate", "lunes, 19 de mayo de 2008 16:33\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/AdminPV_Server.res b/Source/Servidor/AdminPV_Server.res index d4aadac88b481bec990b8b23e29a416c115b9f73..c88b966683b051669cefa337c42eb12028cb1432 100644 GIT binary patch delta 123 zcmZ3njd95~#tnBO7&Ru}jgSYDe3usSSDLX$})CLj*L`hOqpC8+0JM( znKi1|+=M}o!2l?qz@PwB>CBMNkjqfOkjaq4kjmh~kjPL1q(LBup_CyH$S!8k0je~d Syg5pp)r`T4!FclhC{F;p#~kJW delta 127 zcmZ3ojd8^`#tnBO73usm?v9D$};v$j*L`h%$Qso+0JM@ znKi1|+L%F)!2l?q!k`3H>CBMNkjqfOkjaq4kjmh~kjPL1q(PtzD3;1l#E=Ihiy3qn W6c`L9ua8n^HDs`2Fq(Wj$`b%IsvW`r diff --git a/Source/Servidor/EDI/EDI_Inventary_Impl.dfm b/Source/Servidor/EDI/EDI_Inventary_Impl.dfm index 29be14a..5c006e8 100644 --- a/Source/Servidor/EDI/EDI_Inventary_Impl.dfm +++ b/Source/Servidor/EDI/EDI_Inventary_Impl.dfm @@ -1,7 +1,9 @@ -inherited EDI_Inventary: TEDI_Inventary +object EDI_Inventary: TEDI_Inventary OldCreateOrder = True - Left = 200 - Top = 200 + OnAfterProcessTransactionAction = pptaNone + ExportedDataTables = <> + CacheElements = <> + Options = [rsoProcessDeltasWithoutUpdateRules] Height = 300 Width = 300 end diff --git a/Source/Servidor/EDI/EDI_Inventary_Impl.pas b/Source/Servidor/EDI/EDI_Inventary_Impl.pas index 27971a8..b66c625 100644 --- a/Source/Servidor/EDI/EDI_Inventary_Impl.pas +++ b/Source/Servidor/EDI/EDI_Inventary_Impl.pas @@ -12,7 +12,7 @@ unit EDI_Inventary_Impl; interface uses - {vcl:} Classes, SysUtils, + {vcl:} Classes, SysUtils, {RemObjects:} uROXMLIntf, uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions, {Required:} uRORemoteDataModule, {Ancestor Implementation:} DARemoteService_Impl, @@ -23,6 +23,7 @@ type { TEDI_Inventary } TEDI_Inventary = class(TDARemoteService, IEDI_Inventary) private + procedure InsertarLog(OK: Boolean; Error_msg: String); protected { IEDI_Inventary methods } function CargarFicheroEDI(const FicheroCAB: String; const FicheroLIN: String; const FicheroCANT: String; out MsgError: String): Boolean; @@ -32,7 +33,8 @@ implementation {$R *.dfm} uses - {Generated:} VARELA_Invk; + {Generated:} VARELA_Invk, uDataModuleServer, + EDI_Log_Impl, JclFileUtils, DateUtils, uDataModuleEDI_Inventary; procedure Create_EDI_Inventary(out anInstance : IUnknown); begin @@ -41,9 +43,116 @@ end; { EDI_Inventary } function TEDI_Inventary.CargarFicheroEDI(const FicheroCAB: String; const FicheroLIN: String; const FicheroCANT: String; out MsgError: String): Boolean; +var + ADirEntrada : String; + ADirTemp : String; + NumRegNuevos : Integer; + bCargarFicheros: Boolean; + + procedure GuardarFicheros; + var + AAlmacen : String; + ADate : String; + begin + DateTimeToString(ADate, 'yyyymmddhhnn', Now); + AAlmacen := PathAddSeparator(dmServer.FDirAlmacen); + AAlmacen := PathAddSeparator(AAlmacen + ADate); + if not DirectoryExists(AAlmacen) then + ForceDirectories(AAlmacen); + FileMove(ADirTemp + FicheroCAB, AAlmacen + FicheroCAB); + FileMove(ADirTemp + FicheroLIN, AAlmacen + FicheroLIN); + FileMove(ADirTemp + FicheroCANT, AAlmacen + FicheroCANT); + DeleteDirectory(ADirTemp, False); + end; + begin + Result := False; + + // Hay que comprobar que existen los ficheros. + ADirEntrada := PathAddSeparator(dmServer.FDirEntrada); + + if not FileExists(ADirEntrada + FicheroCAB) or + not FileExists(ADirEntrada + FicheroLIN) or + not FileExists(ADirEntrada + FicheroCANT) then + begin + MsgError := 'No hay ficheros de datos'; + InsertarLog(False, MsgError + ' (CargarFicheroEDI1 INV)'); + end + else begin + + // Muevo los ficheros de carga a un directorio temporal + ADirTemp := PathAddSeparator(ADirEntrada + GetTempDirectory(ADirEntrada)); + try + if not DirectoryExists(ADirTemp) then + ForceDirectories(ADirTemp); + + if not FileMove(ADirEntrada + FicheroCAB, ADirTemp + FicheroCAB) then + begin + MsgError := 'No se ha podido mover FicheroCAB'; + bCargarFicheros := False; + end; + + if not FileMove(ADirEntrada + FicheroLIN, ADirTemp + FicheroLIN) then + begin + MsgError := 'No se ha podido mover FicheroLIN'; + bCargarFicheros := False; + end; + + if not FileMove(ADirEntrada + FicheroCANT, ADirTemp + FicheroCANT) then + begin + MsgError := 'No se ha podido mover FicheroCANT'; + bCargarFicheros := False; + end; + + except + on E: Exception do + begin + MsgError := E.Message; + InsertarLog(False, MsgError + ' (CargarFicheroEDI2 INV)'); + Exit; + end; + end; + + try + if bCargarFicheros then + begin + try + dmEDIInventary.CargarFicheros (ADirTemp + FicheroCAB, ADirTemp + FicheroLIN, ADirTemp + FicheroCANT, NumRegNuevos); + if NumRegNuevos > 0 then + InsertarLog(True, Format('Se han cargado %d registros de inventario nuevos', [NumRegNuevos])) + else + InsertarLog(True, 'El fichero se ha cargado pero no hay registros de inventario nuevos'); + Result := True; + finally + GuardarFicheros; + dmServer.BorrarFicherosDeCargaAntiguos; + end; + end + else + InsertarLog(False, MsgError + ' (CargarFicheroEDI3 INV)'); + except + on E: Exception do + begin + MsgError := E.Message; + InsertarLog(False, MsgError + ' (CargarFicheroEDI3 INV)'); + end; + end; + end; end; +procedure TEDI_Inventary.InsertarLog(OK: Boolean; Error_msg: String); +var + LogService : IEDI_Log; +begin + LogService := EDI_Log_Impl.TEDI_Log.Create(Self); + try + LogService.InsertarLog(Now, 'INVRPT', OK, Error_msg); + finally + LogService := nil; + end; +end; + + initialization TROClassFactory.Create('EDI_Inventary', Create_EDI_Inventary, TEDI_Inventary_Invoker);