Se habilita la impresión de albaranes de cliente

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@178 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2008-03-25 17:17:27 +00:00
parent f35331e504
commit 22bdf07947
12 changed files with 675 additions and 908 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -41,68 +41,27 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject xmlns=""> <Delphi.Personality> <Parameters> <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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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.0.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><Source><Source Name="MainSource">AlbaranesCliente_data.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
<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>
<VersionInfo>
<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfo Name="Release">0</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.0.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>
<Source>
<Source Name="MainSource">AlbaranesCliente_data.dpk</Source>
</Source>
</Delphi.Personality> </BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup> <ItemGroup>
<DelphiCompile Include="AlbaranesCliente_data.dpk"> <DelphiCompile Include="AlbaranesCliente_data.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="adortl.dcp" /> <DCCReference Include="..\adortl.dcp" />
<DCCReference Include="AlbaranesCliente_model.dcp" /> <DCCReference Include="..\AlbaranesCliente_model.dcp" />
<DCCReference Include="cxLibraryD10.dcp" /> <DCCReference Include="..\cxLibraryD11.dcp" />
<DCCReference Include="dbrtl.dcp" /> <DCCReference Include="..\dbrtl.dcp" />
<DCCReference Include="dsnap.dcp" /> <DCCReference Include="..\dsnap.dcp" />
<DCCReference Include="dxThemeD10.dcp" /> <DCCReference Include="..\dxThemeD11.dcp" />
<DCCReference Include="rtl.dcp" /> <DCCReference Include="..\rtl.dcp" />
<DCCReference Include="..\vcl.dcp" />
<DCCReference Include="..\vcldb.dcp" />
<DCCReference Include="uDataModuleAlbaranesCliente.pas"> <DCCReference Include="uDataModuleAlbaranesCliente.pas">
<Form>DataModuleAlbaranesCliente</Form> <Form>DataModuleAlbaranesCliente</Form>
</DCCReference> </DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vcldb.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line
[Exception Log] [Exception Log]
EurekaLog Version=6006 EurekaLog Version=6006

View File

@ -61,7 +61,7 @@ end;
function TDataModuleAlbaranesCliente.GetReport(const AID: String): Binary; function TDataModuleAlbaranesCliente.GetReport(const AID: String): Binary;
begin begin
// Result := (RORemoteService as IsrvAlbaranesCliente).GenerateReport(AID) Result := (RORemoteService as IsrvAlbaranesCliente).GenerateReport(AID)
end; end;
function TDataModuleAlbaranesCliente.NewItem: IBizAlbaranCliente; function TDataModuleAlbaranesCliente.NewItem: IBizAlbaranCliente;
@ -89,7 +89,7 @@ end;
function TDataModuleAlbaranesCliente.GetEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary; function TDataModuleAlbaranesCliente.GetEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary;
begin begin
// Result := (RORemoteService as IsrvAlbaranesCliente).GenerateEtiquetas(AID, withRefCliente) Result := (RORemoteService as IsrvAlbaranesCliente).GenerateEtiquetas(AID, withRefCliente)
end; end;
function TDataModuleAlbaranesCliente.GetItem(const ID: Integer): IBizAlbaranCliente; function TDataModuleAlbaranesCliente.GetItem(const ID: Integer): IBizAlbaranCliente;

View File

@ -7,15 +7,14 @@ uses
Dialogs, frxClass, frxDBSet, uDAScriptingProvider, Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient, uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes, frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
uDAInterfaces; uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable;
type type
TRptAlbaranesCliente = class(TDataModule) TRptAlbaranesCliente = class(TDataModule)
DADataCabecera: TDADataSource; DADataCabecera: TDADataSource;
DADataDetalles: TDADataSource; DADataDetalles: TDADataSource;
tbl_Cabecera: TDACDSDataTable; tbl_Cabecera: TDAMemDataTable;
tbl_Detalles: TDACDSDataTable; tbl_Detalles: TDAMemDataTable;
DABINAdapter: TDABINAdapter;
frxRichObject1: TfrxRichObject; frxRichObject1: TfrxRichObject;
frxBarCodeObject1: TfrxBarCodeObject; frxBarCodeObject1: TfrxBarCodeObject;
frxOLEObject1: TfrxOLEObject; frxOLEObject1: TfrxOLEObject;
@ -28,6 +27,10 @@ type
schReport: TDASchema; schReport: TDASchema;
DataDictionary: TDADataDictionary; DataDictionary: TDADataDictionary;
frxReport: TfrxReport; frxReport: TfrxReport;
Bin2DataStreamer: TDABin2DataStreamer;
tbl_Etiquetas: TDAMemDataTable;
DADataEtiquetas: TDADataSource;
frxDBEtiquetas: TfrxDBDataset;
procedure DataModuleCreate(Sender: TObject); procedure DataModuleCreate(Sender: TObject);
private private
FConnection: IDAConnection; FConnection: IDAConnection;
@ -89,33 +92,14 @@ begin
end; end;
procedure TRptAlbaranesCliente.GenerarAlbaran(const ID: integer); procedure TRptAlbaranesCliente.GenerarAlbaran(const ID: integer);
var
AStream: TMemoryStream;
dsMaster: IDADataset;
dsDetail: IDADataset;
begin begin
AStream := TMemoryStream.Create; tbl_Cabecera.ParamByName('ID').AsInteger := ID;
tbl_Detalles.ParamByName('ID_ALBARAN').AsInteger := ID;
try tbl_Cabecera.Active := True;
dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [ID]); tbl_Detalles.Active := True;
dsDetail := schReport.NewDataset(FConnection, ds_InformeDetalles, ['ID_ALBARAN'], [ID], False);
AStream.Clear;
DABINAdapter.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
DABINAdapter.ReadDataset(AStream, tbl_Cabecera, TRUE, '', TRUE, TRUE);
AStream.Clear;
DABINAdapter.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1);
DABINAdapter.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE);
frxReport.LoadFromFile(DarRutaInformes + rptInfAlbaran, True); frxReport.LoadFromFile(DarRutaInformes + rptInfAlbaran, True);
frxReport.PrepareReport(False); frxReport.PrepareReport(False);
finally
AStream.Free;
dsMaster := Nil;
dsDetail := Nil;
end;
end; end;
function TRptAlbaranesCliente.GenerarEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary; function TRptAlbaranesCliente.GenerarEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary;
@ -124,6 +108,7 @@ var
dsDetail: IDADataset; dsDetail: IDADataset;
AStream: TMemoryStream; AStream: TMemoryStream;
begin begin
{
AStream := TMemoryStream.Create; AStream := TMemoryStream.Create;
Result := Binary.Create; Result := Binary.Create;
FConnection.BeginTransaction; FConnection.BeginTransaction;
@ -150,6 +135,7 @@ begin
AStream.Free; AStream.Free;
FConnection.RollbackTransaction; FConnection.RollbackTransaction;
end; end;
}
end; end;
end. end.

View File

@ -42,8 +42,7 @@ implementation
uses uses
{Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils, {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils,
schAlbaranesClienteClient_Intf, uRestriccionesUsuarioUtils, schAlbaranesClienteClient_Intf, uRestriccionesUsuarioUtils,
// uRptAlbaranesCliente_Server, uRptAlbaranesCliente_Server, uBizAlbaranClienteServer;
uBizAlbaranClienteServer;
const const
REF_ALBARANES_CLIENTE = 'REF_ALBARANES_CLIENTE'; REF_ALBARANES_CLIENTE = 'REF_ALBARANES_CLIENTE';
@ -83,31 +82,27 @@ begin
end; end;
function TsrvAlbaranesCliente.GenerateEtiquetas(const ID: Integer; const withRefCliente: Boolean): Binary; function TsrvAlbaranesCliente.GenerateEtiquetas(const ID: Integer; const withRefCliente: Boolean): Binary;
//var var
// AReportGenerator : TRptAlbaranesCliente; AReportGenerator : TRptAlbaranesCliente;
begin begin
{
AReportGenerator := TRptAlbaranesCliente.Create(nil); AReportGenerator := TRptAlbaranesCliente.Create(nil);
try try
Result := AReportGenerator.GenerarEtiquetas(ID, withRefCliente); Result := AReportGenerator.GenerarEtiquetas(ID, withRefCliente);
finally finally
FreeAndNIL(AReportGenerator); FreeAndNIL(AReportGenerator);
end; end;
}
end; end;
function TsrvAlbaranesCliente.GenerateReport(const ID: String): Binary; function TsrvAlbaranesCliente.GenerateReport(const ID: String): Binary;
//var var
// AReportGenerator : TRptAlbaranesCliente; AReportGenerator : TRptAlbaranesCliente;
begin begin
{
AReportGenerator := TRptAlbaranesCliente.Create(nil); AReportGenerator := TRptAlbaranesCliente.Create(nil);
try try
Result := AReportGenerator.GenerarAlbaran(ID); Result := AReportGenerator.GenerarAlbaran(ID);
finally finally
FreeAndNIL(AReportGenerator); FreeAndNIL(AReportGenerator);
end; end;
}
end; end;
initialization initialization

View File

@ -403,8 +403,6 @@ var
AllItems: Boolean; AllItems: Boolean;
begin begin
AppFactuGES.ShowCapado;
{
AAlbaranes := Nil; AAlbaranes := Nil;
AllItems := False; AllItems := False;
@ -438,7 +436,6 @@ AppFactuGES.ShowCapado;
end; end;
end; end;
end; end;
}
end; end;
procedure TfEditorAlbaranesCliente.ModificarInterno; procedure TfEditorAlbaranesCliente.ModificarInterno;
@ -496,8 +493,6 @@ var
AAlbaranes: IBizAlbaranCliente; AAlbaranes: IBizAlbaranCliente;
AllItems: Boolean; AllItems: Boolean;
begin begin
AppFactuGES.ShowCapado;
{
AAlbaranes := Nil; AAlbaranes := Nil;
AllItems := False; AllItems := False;
@ -531,7 +526,6 @@ AppFactuGES.ShowCapado;
end; end;
end; end;
end; end;
}
end; end;
procedure TfEditorAlbaranesCliente.SetController(const Value: IAlbaranesClienteController); procedure TfEditorAlbaranesCliente.SetController(const Value: IAlbaranesClienteController);

View File

@ -90,31 +90,7 @@ begin
end; end;
procedure TRptFacturasCliente.GenerarFactura(const ID: integer); procedure TRptFacturasCliente.GenerarFactura(const ID: integer);
var
AStream: TMemoryStream;
dsMaster: IDADataset;
dsDetail: IDADataset;
dsVencimientos : IDADataset;
begin begin
// AStream := TMemoryStream.Create;
try
// dsMaster := schReport.NewDataset(FConnection, ds_InformeFacturasCliente, ['ID'], [ID]);
// dsDetail := schReport.NewDataset(FConnection, ds_InformeFacturasCliente_Detalles, ['ID_FACTURA'], [ID], False);
// dsVencimientos := schReport.NewDataset(FConnection, ds_InformeFacturasCliente_Vencimientos, ['ID_FACTURA'], [ID], False);
// AStream.Clear;
// DABINAdapter.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
// DABINAdapter.ReadDataset(AStream, tbl_FacturaCliente, TRUE, '', TRUE, TRUE);
// AStream.Clear;
// DABINAdapter.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1);
// DABINAdapter.ReadDataset(AStream, tbl_DetallesFacturaCliente, TRUE, '', TRUE, TRUE);
// AStream.Clear;
// DABINAdapter.WriteDataset(AStream, dsVencimientos, [woRows, woSchema], -1);
// DABINAdapter.ReadDataset(AStream, tbl_Vencimientos, TRUE, '', TRUE, TRUE);
tbl_FacturaCliente.ParamByName('ID').AsInteger := ID; tbl_FacturaCliente.ParamByName('ID').AsInteger := ID;
tbl_DetallesFacturaCliente.ParamByName('ID_FACTURA').AsInteger := ID; tbl_DetallesFacturaCliente.ParamByName('ID_FACTURA').AsInteger := ID;
tbl_Vencimientos.ParamByName('ID_FACTURA').AsInteger := ID; tbl_Vencimientos.ParamByName('ID_FACTURA').AsInteger := ID;
@ -124,12 +100,6 @@ begin
frxReport.LoadFromFile(DarRutaInformes + rptFacturaCliente, True); frxReport.LoadFromFile(DarRutaInformes + rptFacturaCliente, True);
frxReport.PrepareReport(False); frxReport.PrepareReport(False);
finally
AStream.Free;
dsMaster := Nil;
dsDetail := Nil;
end;
end; end;
end. end.

View File

@ -118,7 +118,8 @@ uses
schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas', schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas',
schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
uBizRecibosProveedorServer in '..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas'; uBizRecibosProveedorServer in '..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas',
uRptAlbaranesCliente_Server in '..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas';
{$R *.res} {$R *.res}
{$R ..\Servicios\RODLFile.res} {$R ..\Servicios\RODLFile.res}

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?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> <PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid> <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@ -57,6 +57,7 @@
<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" /> <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" /> <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" /> <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas" />
<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas"> <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
<Form>srvAlbaranesCliente</Form> <Form>srvAlbaranesCliente</Form>
<DesignClass>TDataAbstractService</DesignClass> <DesignClass>TDataAbstractService</DesignClass>