|
|
@@ -143,7 +143,7 @@ type
|
|
|
procedure FilterBills(ANode: TsdIDTreeNode);
|
|
|
|
|
|
procedure LoadStageData(StageData: TStageData; APhaseIndex: Integer);
|
|
|
- procedure LoadPhaseData(APhaseIndex: Integer);
|
|
|
+ procedure LoadPhaseData(APhaseIndex: Integer; AProjectData: TProjectData = nil);
|
|
|
|
|
|
procedure WriteBills;
|
|
|
public
|
|
|
@@ -171,7 +171,7 @@ begin
|
|
|
try
|
|
|
FilterBills(FProjectData.BillsCompileData.BillsCompileTree.FirstNode);
|
|
|
for iPhase := 1 to FProjectData.ProjProperties.PhaseCount do
|
|
|
- LoadPhaseData(iPhase);
|
|
|
+ LoadPhaseData(iPhase, FProjectData);
|
|
|
WriteBills;
|
|
|
finally
|
|
|
Result := cdsBills;
|
|
|
@@ -256,12 +256,12 @@ begin
|
|
|
end;
|
|
|
end;
|
|
|
|
|
|
-procedure TrmGclBillsAddData.LoadPhaseData(APhaseIndex: Integer);
|
|
|
+procedure TrmGclBillsAddData.LoadPhaseData(APhaseIndex: Integer; AProjectData: TProjectData);
|
|
|
var
|
|
|
PhaseData: TPhaseData;
|
|
|
StageData: TStageData;
|
|
|
begin
|
|
|
- PhaseData := TPhaseData.Create(nil);
|
|
|
+ PhaseData := TPhaseData.Create(AProjectData);
|
|
|
try
|
|
|
PhaseData.SimpleOpen(Format('%s\Phase%d.dat', [FProjectData.TempPath, APhaseIndex]));
|
|
|
if PhaseData.IsLastStage then
|
