Compare commits

..

1 Commits

Author SHA1 Message Date
efa3f6782b made a copy
git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/tags/2.1.3@121 1c943782-d109-9647-9548-93b3ac332352
2008-05-10 12:07:37 +00:00
37 changed files with 207 additions and 289 deletions

View File

@ -148,14 +148,12 @@ SELECT
TIPO_PRODUTO = ISNULL(PRODUTOS.TIPO_PRODUTO, RDX_V_VENTASEDI.TIPO_PRODUTO),
GRUPO_PRODUTO = ISNULL(PRODUTOS.GRUPO_PRODUTO, RDX_V_VENTASEDI.GRUPO_PRODUTO),
PRODUTOS.COLECAO,
DESC_COLECAO = ISNULL(COLECOES.DESC_COLECAO, RDX_V_VENTASEDI.DESC_COLECAO),
VALVEN = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.VALVEN, RDX_V_VENTASEDI.VALVEN),
CANVEN = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANVEN, RDX_V_VENTASEDI.CANVEN),
DESC_COLECAO = ISNULL(COLECOES.DESC_COLECAO, RDX_V_VENTASEDI.DESC_COLECAO),
RDX_V_VENTASEDI.VALVEN,
RDX_V_VENTASEDI.CANVEN,
RDX_V_VENTASEDI.CANDEV,
CANVENNET = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANVENNET, RDX_V_VENTASEDI.CANVENNET),
CANESP = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANESP, RDX_V_VENTASEDI.CANESP)
RDX_V_VENTASEDI.CANVENNET,
RDX_V_VENTASEDI.CANESP
FROM RDX_V_VENTASEDI
LEFT JOIN RDX_V_REFERENCIAS_RESUELTAS ON (
(RDX_V_REFERENCIAS_RESUELTAS.NUMINF = RDX_V_VENTASEDI.NUMINF) AND

View File

@ -94,7 +94,8 @@ FULL OUTER JOIN RDX_V_TRASPASOS_AJUSTES_DESGLOSADO ON
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CODIGO = RDX_V_INVENTARIOEDI.CODIGO) AND
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.COLOR = RDX_V_INVENTARIOEDI.COLOR) AND
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TALLA = RDX_V_INVENTARIOEDI.TALLA) AND
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA)
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA) AND
(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TIPO = RDX_V_INVENTARIOEDI.TIPOCANT)
FULL OUTER JOIN RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO ON
(RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CENTRO = RDX_V_INVENTARIOEDI.CENTRO) AND
(RDX_V_INVENTARIOEDI.CENTRO = RDX_V_INVENTARIOEDI.CENTRO2) AND

View File

@ -46,6 +46,30 @@
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

View File

@ -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\dtf2C.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2E.tmp */

View File

@ -43,7 +43,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>

View File

@ -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\dtf46.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf48.tmp */

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Varela_D2007\Resources\Iconos\CargaEDI.ico"
1 VERSIONINFO
FILEVERSION 2,1,6,0
PRODUCTVERSION 2,1,6,0
FILEVERSION 2,1,2,0
PRODUCTVERSION 2,1,2,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -12,8 +12,8 @@ BEGIN
BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "FileVersion", "2.1.6.0\0"
VALUE "ProductVersion", "2.1.6.0\0"
VALUE "FileVersion", "2.1.2.0\0"
VALUE "ProductVersion", "2.1.2.0\0"
END
END
BLOCK "VarFileInfo"

Binary file not shown.

View File

@ -42,7 +42,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 16 de octubre de 2008 13:41</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 07 de mayo de 2008 18:40</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

View File

@ -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\dtf44.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf46.tmp */

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Cliente.ico"
1 VERSIONINFO
FILEVERSION 2,1,6,0
PRODUCTVERSION 2,1,6,0
FILEVERSION 2,1,3,0
PRODUCTVERSION 2,1,3,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.6.0\0"
VALUE "FileVersion", "2.1.3.0\0"
VALUE "InternalName", "Administración de puntos de venta\0"
VALUE "ProductName", "Administración de puntos de venta\0"
VALUE "ProductVersion", "2.1.6.0\0"
VALUE "CompileDate", "jueves, 16 de octubre de 2008 18:17\0"
VALUE "ProductVersion", "2.1.3.0\0"
VALUE "CompileDate", "viernes, 09 de mayo de 2008 11:23\0"
END
END
BLOCK "VarFileInfo"

Binary file not shown.

View File

@ -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\dtf2E.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf30.tmp */

View File

@ -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\dtf3E.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf40.tmp */

View File

@ -23,7 +23,7 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
Column = cxGridViewDIFERENCIA
end
item
Format = ',0;-,0'
Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
Kind = skSum
Column = cxGridViewDIFERENCIA
end>

View File

@ -634,7 +634,7 @@ var
begin
inherited;
Val1 := AText + ' ' + Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
Val1 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index];
AText := 'Producto: ' + Val1 + ' - Color: ' + Val2;
end;

View File

@ -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\dtf34.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf36.tmp */

View File

@ -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\dtf30.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf32.tmp */

View File

@ -70,10 +70,7 @@ requires
dxPSLnksD10,
designide,
vclshlctrls,
dclcxLibraryD10,
dxLayoutControlD10,
DataAbstract_Core_D11,
RemObjects_Core_D11;
dclcxLibraryD10;
contains
uPluginControllerRecepciones in 'uPluginControllerRecepciones.pas' {ModuleRecepciones: TModuleController},
@ -82,7 +79,6 @@ contains
uViewListaRecepciones in 'uViewListaRecepciones.pas' {frViewListaRecepciones: TCustomView},
uEditorListaRecepciones in 'uEditorListaRecepciones.pas' {fEditorListaRecepciones: TCustomEditor},
uViewListaRecepcionesAlbaran in 'uViewListaRecepcionesAlbaran.pas' {frViewListaRecepcionesAlbaran: TCustomView},
uEditorListaRecepcionesAlbaran in 'uEditorListaRecepcionesAlbaran.pas' {fEditorListaRecepcionesAlbaran: TCustomEditor},
uEditorAjustarRecepciones in 'uEditorAjustarRecepciones.pas' {fEditorAjustarRecepciones: TCustomEditor};
uEditorListaRecepcionesAlbaran in 'uEditorListaRecepcionesAlbaran.pas' {fEditorListaRecepcionesAlbaran: TCustomEditor};
end.

View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{5990f68e-d16f-46ae-93db-ba7d141d4021}</ProjectGuid>
<MainSource>Recepciones.dpk</MainSource>
@ -47,6 +46,8 @@
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">Recepciones.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
@ -56,52 +57,55 @@
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Reglas\uBizRecepciones.pas" />
<DCCReference Include="adortl.dcp" />
<DCCReference Include="Base.dcp" />
<DCCReference Include="bdertl.dcp" />
<DCCReference Include="ControlesBase.dcp" />
<DCCReference Include="cxDataD10.dcp" />
<DCCReference Include="cxEditorsD10.dcp" />
<DCCReference Include="cxExportD10.dcp" />
<DCCReference Include="cxExtEditorsD10.dcp" />
<DCCReference Include="cxGridD10.dcp" />
<DCCReference Include="cxLibraryD10.dcp" />
<DCCReference Include="cxPageControlD10.dcp" />
<DCCReference Include="cxTreeListD10.dcp" />
<DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="dbrtl.dcp" />
<DCCReference Include="dclcxLibraryD10.dcp" />
<DCCReference Include="designide.dcp" />
<DCCReference Include="dsnap.dcp" />
<DCCReference Include="dxComnD10.dcp" />
<DCCReference Include="dxLayoutControlD10.dcp" />
<DCCReference Include="dxPSCoreD10.dcp" />
<DCCReference Include="dxPScxCommonD10.dcp" />
<DCCReference Include="dxPScxGridLnkD10.dcp" />
<DCCReference Include="dxPSLnksD10.dcp" />
<DCCReference Include="dxThemeD10.dcp" />
<DCCReference Include="GUISDK_D11.dcp" />
<DCCReference Include="Jcl.dcp" />
<DCCReference Include="JclVcl.dcp" />
<DCCReference Include="JvCoreD11R.dcp" />
<DCCReference Include="JvCustomD11R.dcp" />
<DCCReference Include="JvGlobusD11R.dcp" />
<DCCReference Include="JvPageCompsD11R.dcp" />
<DCCReference Include="JvStdCtrlsD11R.dcp" />
<DCCReference Include="JvSystemD11R.dcp" />
<DCCReference Include="Parametros.dcp" />
<DCCReference Include="PluginSDK_D11R.dcp" />
<DCCReference Include="PngComponentsD10.dcp" />
<DCCReference Include="PNG_D10.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="tb2k_D10.dcp" />
<DCCReference Include="tbx_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ControlesBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExportD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxGridD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxTreeListD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dclcxLibraryD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxComnD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGridLnkD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPSLnksD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCustomD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Parametros.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tb2k_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclshlctrls.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="uDataModuleRecepciones.pas">
<Form>dmRecepciones</Form>
<DesignClass>TDAClientDataModule</DesignClass>
</DCCReference>
<DCCReference Include="uEditorAjustarRecepciones.pas" />
<DCCReference Include="uEditorListaRecepciones.pas">
<Form>fEditorListaRecepciones</Form>
<DesignClass>TCustomEditor</DesignClass>
@ -122,13 +126,6 @@
<Form>frViewListaRecepcionesAlbaran</Form>
<DesignClass>TCustomView</DesignClass>
</DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclshlctrls.dcp" />
<DCCReference Include="VclSmp.dcp" />
<DCCReference Include="vclx.dcp" />
</ItemGroup>
</Project>
<!-- EurekaLog First Line

View File

@ -18,6 +18,5 @@ END
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uViewListaRecepcionesAlbaran.dfm */
/* 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\uEditorAjustarRecepciones.dfm */
/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3C.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3E.tmp */

View File

@ -76,6 +76,7 @@ object dmRecepciones: TdmRecepciones
Name = 'ALBARAN'
DataType = datString
Size = 7
LogChanges = False
ReadOnly = True
DictionaryEntry = 'Recepciones_ALBARAN'
end
@ -376,6 +377,7 @@ object dmRecepciones: TdmRecepciones
Name = 'ALBARAN'
DataType = datString
Size = 7
LogChanges = False
ReadOnly = True
DictionaryEntry = 'Recepciones_ALBARAN'
end
@ -676,6 +678,7 @@ object dmRecepciones: TdmRecepciones
Name = 'ALBARAN'
DataType = datString
Size = 7
LogChanges = False
ReadOnly = True
DictionaryEntry = 'Recepciones_ALBARAN'
end
@ -917,6 +920,7 @@ object dmRecepciones: TdmRecepciones
Name = 'ALBARAN'
DataType = datString
Size = 7
LogChanges = False
ReadOnly = True
DictionaryEntry = 'Recepciones_ALBARAN'
end

View File

@ -4,7 +4,6 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
Caption = 'Control de recepciones'
ClientHeight = 664
ClientWidth = 816
ExplicitTop = -106
ExplicitWidth = 824
ExplicitHeight = 691
PixelsPerInch = 96
@ -118,7 +117,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA
end
item
Format = ',0;-,0'
Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
Kind = skSum
Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA
end>
@ -1635,7 +1634,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
inherited dsDataTable: TDADataSource [10]
Top = 136
end
inherited GridPopupMenu: TPopupMenu [11]
inherited GridPopupMenu: TPopupMenu
Left = 112
Top = 128
object Cambiarelestado1: TMenuItem [3]

View File

@ -23,7 +23,7 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
Column = cxGridBandedViewDIFERENCIA
end
item
Format = ',0;-,0'
Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
Kind = skSum
Column = cxGridBandedViewDIFERENCIA
end>

View File

@ -1320,153 +1320,162 @@ 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 = ''
end
item
Name = 'RR36'
DataType = datInteger
Value = ''
ParamType = daptInput
end
item
Name = 'RR38'
DataType = datInteger
DataType = datFloat
Value = ''
ParamType = daptInput
end
item
Name = 'RR40'
DataType = datInteger
DataType = datFloat
Value = ''
ParamType = daptInput
end
item
Name = 'RR42'
DataType = datInteger
DataType = datFloat
Value = ''
ParamType = daptInput
end
item
Name = 'RR44'
DataType = datInteger
DataType = datFloat
Value = ''
ParamType = daptInput
end
item
Name = 'RR46'
DataType = datInteger
DataType = datFloat
Value = ''
ParamType = daptInput
end
item
Name = 'RR48'
DataType = datInteger
DataType = datFloat
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 @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
'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
StatementType = stSQL
ColumnMappings = <>
end>
@ -1569,7 +1578,9 @@ object srvRecepciones: TsrvRecepciones
Name = 'Recepciones_ALBARAN'
DataType = datString
Size = 7
LogChanges = False
DisplayLabel = 'ALBARAN'
ReadOnly = True
end
item
Name = 'Recepciones_ESTADO_ALBARAN'

View File

@ -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\dtf3A.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3C.tmp */

View File

@ -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\dtf42.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf44.tmp */

View File

@ -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\dtf40.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf42.tmp */

View File

@ -581,7 +581,7 @@ var
begin
inherited;
Val1 := AText + ' ' + Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
Val1 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index];
AText := 'Producto: ' + Val1 + ' - Color: ' + Val2;
end;

View File

@ -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\dtf38.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3A.tmp */

View File

@ -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\dtf36.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf38.tmp */

View File

@ -44,7 +44,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 16 de octubre de 2008 13:41</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 07 de mayo de 2008 18:40</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
<Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>

View File

@ -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\Services\EDI_Inventary\uDataModuleEDI_Inventary.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\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\dtf48.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4A.tmp */

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
FILEVERSION 2,1,4,0
PRODUCTVERSION 2,1,4,0
FILEVERSION 2,1,3,0
PRODUCTVERSION 2,1,3,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.4.0\0"
VALUE "FileVersion", "2.1.3.0\0"
VALUE "ProductName", "AdminPV_Server\0"
VALUE "ProductVersion", "2.1.4.0\0"
VALUE "CompileDate", "jueves, 16 de octubre de 2008 18:17\0"
VALUE "ProductVersion", "2.1.3.0\0"
VALUE "CompileDate", "viernes, 09 de mayo de 2008 11:23\0"
END
END
BLOCK "VarFileInfo"

Binary file not shown.

View File

@ -1,9 +1,7 @@
object EDI_Inventary: TEDI_Inventary
inherited EDI_Inventary: TEDI_Inventary
OldCreateOrder = True
OnAfterProcessTransactionAction = pptaNone
ExportedDataTables = <>
CacheElements = <>
Options = [rsoProcessDeltasWithoutUpdateRules]
Left = 200
Top = 200
Height = 300
Width = 300
end

View File

@ -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,7 +23,6 @@ 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;
@ -33,8 +32,7 @@ implementation
{$R *.dfm}
uses
{Generated:} VARELA_Invk, uDataModuleServer,
EDI_Log_Impl, JclFileUtils, DateUtils, uDataModuleEDI_Inventary;
{Generated:} VARELA_Invk;
procedure Create_EDI_Inventary(out anInstance : IUnknown);
begin
@ -43,116 +41,9 @@ 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);