内蒙，国道306定制

DataModules/ReportMemoryDm/rmHaBaiCustomizedDm.pas

@@ -340,7 +340,7 @@ type
 
     procedure WriteData;
   public
-    function AssignData(AProjects: TList; AhbGatherType: THaBaiGatherType): TDataSet;
+    function AssignData(AProjects: TList; AhbGatherType: THaBaiGatherType; AReCalc: Boolean): TDataSet;
     function AssignAssistantData(AhbGatherType: THaBaiGatherType): TDataSet;
 
     property hbGatherType: THaBaiGatherType read FhbGatherType;
@@ -357,7 +357,7 @@ uses
 { TrmHaBaiCustomizedData }
 
 function TrmHaBaiCustomizedData.AssignData(AProjects: TList;
-  AhbGatherType: THaBaiGatherType): TDataSet;
+  AhbGatherType: THaBaiGatherType; AReCalc: Boolean): TDataSet;
 var
   iProject: Integer;
 begin
@@ -366,7 +366,8 @@ begin
   try
     for iProject := 0 to AProjects.Count - 1 do
       GatherProject(TSelectProject(AProjects.Items[iProject]), iProject);
-    FGclControl.ReCalculateTotalPrice;
+    if AReCalc then
+      FGclControl.ReCalculateTotalPrice;
     FGclControl.Calculate;
     WriteData;
   finally

Units/ReportManager.pas

@@ -688,8 +688,10 @@ begin
        // 02/03部颁, 07部颁, 08部颁, 09部颁, 11部颁, 12部颁, 16部颁, 17部颁, 18部颁, 19部颁,
        32, 33, 35, 36, 39, 40, 44,
        // 粤竣9, 粤竣06-1, 粤竣04, 粤竣01, 工程量清单进度[甘肃高管局定制], [广东肇庆定制]计量汇总表
-       45, 46, 47, 48, 49, 50:
+       45, 46, 47, 48, 49, 50,
        // 内蒙古哈白定制表(支表2, 支表3, 支表14, 支表3-1, 支表4-1, 会签)
+       52, 53, 54, 55:
+       // 内蒙古306国道定制(支表2, 支表3, 支表3-1, 支表4-1)
         Result := SelectProjectsAndAssignData(ADataSetID);
     14: Result := FrmGclBillsBGData.AssignData(AProjectData, rmtPhaseDeal, rmgtGather); // 工程量清单[本期合同]
     15: Result := FrmGclBillsBGData.AssignData(AProjectData, rmtPhaseQc, rmgtGather); // 工程量清单[本期数量变更]
@@ -704,7 +706,7 @@ begin
     38: Result := FrmGclBillsPlaneData.AssignData(AProjectData); // 工程量清单平面表[福建0号台账]
     42: Result := FrmGcl_XmjBillsData.AssignData(AProjectData, gxtFlowGcl); // 云南标准表，台账明细表
     43: Result := FrmGcl_XmjBillsData.AssignData(AProjectData, gxtWithoutXmj); // 云南标准表，单标段清单汇总表
-    51: Result := FrmHaBaiCustomizedData.AssignAssistantData(hbgt_CS); //内蒙古哈白定制表--会签辅助表
+    51: Result := FrmHaBaiCustomizedData.AssignAssistantData(hbgt_CS); //内蒙古哈白、国道306定制表--会签辅助表
   end;
   // For Inner Test
   //ShowTestForm(Result);
@@ -822,12 +824,16 @@ begin
       36: Result := FrmOtherReport1Data.AssignData(FTenders);
       39, 40: Result := FrmMentalCustomized1Data.AssignData(FTenders);
       44: Result := FrmCustomized2Data.AssignData(FTenders);
-      45: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt2);
-      46: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3);
-      47: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt14);
-      48: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3_1);
-      49: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt4_1);
-      50: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt_CS);
+      45: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt2, True);
+      46: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3, True);
+      47: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt14, True);
+      48: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3_1, True);
+      49: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt4_1, True);
+      50: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt_CS, True);
+      52: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt2, True);
+      53: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3, True);
+      54: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3_1, True);
+      55: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt4_1, True);
       else Result := FrmBillsGatherData.AssignData(FTenders);
     end;
   end;