Browse Source

多审表,最后一期无数据

MaiXinRong 8 years ago
parent
commit
357c82defe

+ 7 - 12
DataModules/ReportMemoryDm/rmFxBillsAddDm.pas

@@ -185,18 +185,13 @@ begin
   PhaseData := TPhaseData.Create(AProjectData);
   try
     PhaseData.SimpleOpen(Format('%s\Phase%d.dat', [FProjectData.TempPath, APhaseIndex]));
-    if PhaseData.IsLastStage then
-      LoadStageData(PhaseData.StageData, APhaseIndex)
-    else
-    begin
-      try
-        StageData := TStageData.Create(PhaseData);
-        StageData.TableName := PhaseData.StageTableName[PhaseData.AuditCount];
-        StageData.Open(PhaseData.ADOConnection);
-        LoadStageData(StageData, APhaseIndex);
-      finally
-        StageData.Free;
-      end;
+    try
+      StageData := TStageData.Create(PhaseData);
+      StageData.TableName := PhaseData.StageTableName[PhaseData.AuditCount];
+      StageData.Open(PhaseData.ADOConnection);
+      LoadStageData(StageData, APhaseIndex);
+    finally
+      StageData.Free;
     end;
   finally
     PhaseData.Free;

+ 7 - 12
DataModules/ReportMemoryDm/rmGclBillsAddDm.pas

@@ -264,18 +264,13 @@ begin
   PhaseData := TPhaseData.Create(AProjectData);
   try
     PhaseData.SimpleOpen(Format('%s\Phase%d.dat', [FProjectData.TempPath, APhaseIndex]));
-    if PhaseData.IsLastStage then
-      LoadStageData(PhaseData.StageData, APhaseIndex)
-    else
-    begin
-      try
-        StageData := TStageData.Create(PhaseData);
-        StageData.TableName := PhaseData.StageTableName[PhaseData.AuditCount];
-        StageData.Open(PhaseData.ADOConnection);
-        LoadStageData(StageData, APhaseIndex);
-      finally
-        StageData.Free;
-      end;
+    try
+      StageData := TStageData.Create(PhaseData);
+      StageData.TableName := PhaseData.StageTableName[PhaseData.AuditCount];
+      StageData.Open(PhaseData.ADOConnection);
+      LoadStageData(StageData, APhaseIndex);
+    finally
+      StageData.Free;
     end;
   finally
     PhaseData.Free;