LMS2.6
This commit is contained in:
parent
b0a0662564
commit
951649ad3d
@ -192,6 +192,8 @@ constructor TReportCommand.Create(ID: string; aProcesor: TNIDBDM;
|
|||||||
begin
|
begin
|
||||||
inherited Create(ID,aProcesor, aSubClass, aLogger,AUser,IDUser);
|
inherited Create(ID,aProcesor, aSubClass, aLogger,AUser,IDUser);
|
||||||
fReportProcessor:=TReportDM.Create(nil);
|
fReportProcessor:=TReportDM.Create(nil);
|
||||||
|
fReportProcessor.ID := ID;
|
||||||
|
fReportProcessor.RepName := ReportName;
|
||||||
fReportProcessor.Name := 'Report'+fProcessor.Name;
|
fReportProcessor.Name := 'Report'+fProcessor.Name;
|
||||||
fReportProcessor.NidbData := fProcessor;
|
fReportProcessor.NidbData := fProcessor;
|
||||||
end;
|
end;
|
||||||
|
@ -90,6 +90,7 @@ type
|
|||||||
public
|
public
|
||||||
RecordID: integer;
|
RecordID: integer;
|
||||||
NidbData: TNIDBDM;
|
NidbData: TNIDBDM;
|
||||||
|
ID,RepName: string;
|
||||||
procedure ExportReport( ExportType: TExportFileType; Data: TStream; OnStage: TLogger; OnVars: TVariableFillProc);
|
procedure ExportReport( ExportType: TExportFileType; Data: TStream; OnStage: TLogger; OnVars: TVariableFillProc);
|
||||||
procedure EditReport(OnVars: TVariableFillProc; OnHash: TCalcHashProc);
|
procedure EditReport(OnVars: TVariableFillProc; OnHash: TCalcHashProc);
|
||||||
end;
|
end;
|
||||||
@ -694,7 +695,7 @@ begin
|
|||||||
try
|
try
|
||||||
frxReport.PrepareReport(False);
|
frxReport.PrepareReport(False);
|
||||||
frxReport.OnPreview := @frxReportPreview;
|
frxReport.OnPreview := @frxReportPreview;
|
||||||
{$IFDEF DEBUG} frxReport.SaveToFile(Extractfilepath(paramstr(0))+'out/report.fr3'); {$ENDIF}
|
{$IFDEF DEBUG} frxReport.SaveToFile(format('%sout/%s_%s.fr3',[Extractfilepath(paramstr(0)),RepName,ID])); {$ENDIF}
|
||||||
except on e: Exception do
|
except on e: Exception do
|
||||||
begin
|
begin
|
||||||
NidbData.logError(self,e,'frxReport.PrepareReport');
|
NidbData.logError(self,e,'frxReport.PrepareReport');
|
||||||
@ -724,7 +725,11 @@ begin
|
|||||||
begin
|
begin
|
||||||
NidbData.log(mtWarning,self,'ERROR EXPORT PDF');
|
NidbData.log(mtWarning,self,'ERROR EXPORT PDF');
|
||||||
OnStage(mtError,self,'Ошибка выгрузки в PDF');
|
OnStage(mtError,self,'Ошибка выгрузки в PDF');
|
||||||
end;
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
{$IFDEF DEBUG} (Data as TMemoryStream).SaveToFile(format('%sout/%s_%s.pdf',[Extractfilepath(paramstr(0)),RepName,ID])); {$ENDIF}
|
||||||
|
end;
|
||||||
except on e: Exception do
|
except on e: Exception do
|
||||||
begin
|
begin
|
||||||
NidbData.logError(self,e,'frxReport.Export');
|
NidbData.logError(self,e,'frxReport.Export');
|
||||||
|
Loading…
Reference in New Issue
Block a user