Task #2075 - 2076 中开定制报表内存表，支表2 - 支表3

DataModules/ReportMemoryDm/rmGridHeaderDm.dfm

@@ -41,6 +41,16 @@ object rmGridHeaderData: TrmGridHeaderData
       item
         Name = 'FlowIndex'
         DataType = ftInteger
+      end
+      item
+        Name = 'SName_2'
+        DataType = ftWideString
+        Size = 50
+      end
+      item
+        Name = 'Deadline'
+        DataType = ftWideString
+        Size = 255
       end>
     IndexDefs = <>
     Params = <>
@@ -48,13 +58,15 @@ object rmGridHeaderData: TrmGridHeaderData
     Left = 56
     Top = 40
     Data = {
-      D90000009619E0BD010000001800000007000000000003000000D9000B50726F
+      120100009619E0BD01000000180000000900000000000300000012010B50726F
       6A6563744E616D6501004A000000010005574944544802000200640008446561
       6C436F646501004A000000010005574944544802000200280005434E616D6501
       004A000000010005574944544802000200640005534E616D6501004A00000001
       000557494454480200020064000A5068617365496E64657801004A0000000100
       055749445448020002001400084465616C4E616D6501004A0000000100055749
-      44544802000200C80009466C6F77496E64657804000100000000000000}
+      44544802000200C80009466C6F77496E646578040001000000000007534E616D
+      655F3201004A000000010005574944544802000200640008446561646C696E65
+      02004A000000010005574944544802000200FE010000}
     object cdsGridHeaderProjectName: TWideStringField
       FieldName = 'ProjectName'
       Size = 50
@@ -81,5 +93,13 @@ object rmGridHeaderData: TrmGridHeaderData
     object cdsGridHeaderFlowIndex: TIntegerField
       FieldName = 'FlowIndex'
     end
+    object cdsGridHeaderSName_2: TWideStringField
+      FieldName = 'SName_2'
+      Size = 50
+    end
+    object cdsGridHeaderDeadline: TWideStringField
+      FieldName = 'Deadline'
+      Size = 255
+    end
   end
 end

DataModules/ReportMemoryDm/rmGridHeaderDm.pas

@@ -15,6 +15,8 @@ type
     cdsGridHeaderPhaseIndex: TWideStringField;
     cdsGridHeaderDealName: TWideStringField;
     cdsGridHeaderFlowIndex: TIntegerField;
+    cdsGridHeaderSName_2: TWideStringField;
+    cdsGridHeaderDeadline: TWideStringField;
   private
   public
     function AssginData(AProjectData: TProjectData): TDataSet;

DataModules/ReportMemoryDm/rmZhongKaiDm.dfm

@@ -0,0 +1,170 @@
+object rmZhongKaiData: TrmZhongKaiData
+  OldCreateOrder = False
+  Left = 576
+  Top = 493
+  Height = 156
+  Width = 322
+  object cdsCustom2: TClientDataSet
+    Active = True
+    Aggregates = <>
+    Params = <>
+    Left = 40
+    Top = 40
+    Data = {
+      290100009619E0BD01000000180000000C000000000003000000290109436861
+      7074657249440400010000000000074368617074657201004A00000001000557
+      49445448020002006400044E616D6502004A0000000100055749445448020002
+      00FE010A546F74616C507269636508000400000000000B43546F74616C507269
+      636508000400000000000B47546F74616C507269636508000400000000001345
+      6E64476174686572546F74616C507269636508000400000000000A456E645065
+      7263656E74080004000000000013507265476174686572546F74616C50726963
+      6508000400000000000A50726550657263656E74080004000000000013437572
+      476174686572546F74616C507269636508000400000000000A43757250657263
+      656E7408000400000000000000}
+    object cdsCustom2ChapterID: TIntegerField
+      FieldName = 'ChapterID'
+    end
+    object cdsCustom2Chapter: TWideStringField
+      FieldName = 'Chapter'
+      Size = 50
+    end
+    object cdsCustom2Name: TWideStringField
+      FieldName = 'Name'
+      Size = 255
+    end
+    object cdsCustom2TotalPrice: TFloatField
+      FieldName = 'TotalPrice'
+    end
+    object cdsCustom2CTotalPrice: TFloatField
+      FieldName = 'CTotalPrice'
+    end
+    object cdsCustom2GTotalPrice: TFloatField
+      FieldName = 'GTotalPrice'
+    end
+    object cdsCustom2EndGatherTotalPrice: TFloatField
+      FieldName = 'EndGatherTotalPrice'
+    end
+    object cdsCustom2EndPercent: TFloatField
+      FieldName = 'EndPercent'
+    end
+    object cdsCustom2PreGatherTotalPrice: TFloatField
+      FieldName = 'PreGatherTotalPrice'
+    end
+    object cdsCustom2PrePercent: TFloatField
+      FieldName = 'PrePercent'
+    end
+    object cdsCustom2CurGatherTotalPrice: TFloatField
+      FieldName = 'CurGatherTotalPrice'
+    end
+    object cdsCustom2CurPercent: TFloatField
+      FieldName = 'CurPercent'
+    end
+  end
+  object cdsCustom3: TClientDataSet
+    Active = True
+    Aggregates = <>
+    IndexFieldNames = 'ChapterID;IndexCode'
+    Params = <>
+    Left = 120
+    Top = 40
+    Data = {
+      750200009619E0BD010000001800000019000000000003000000750209436861
+      707465724944040001000000000009496E646578436F646501004A0000000100
+      05574944544802000200640006425F436F646501004A00000001000557494454
+      48020002006400044E616D6502004A000000010005574944544802000200FE01
+      05556E69747301004A0000000100055749445448020002002800055072696365
+      08000400000000000C4465616C5175616E7469747908000400000000000E4465
+      616C546F74616C507269636508000400000000000E456E644D71635175616E74
+      697479080004000000000010456E644D7163546F74616C507269636508000400
+      0000000011456E644D716361546F74616C507269636508000400000000000E45
+      6E645071635175616E74697479080004000000000010456E64507163546F7461
+      6C5072696365080004000000000011456E6450716361546F74616C5072696365
+      08000400000000000D456E6451635175616E7469747908000400000000000F45
+      6E645163546F74616C5072696365080004000000000010456E64516361546F74
+      616C5072696365080004000000000009475175616E7469747908000400000000
+      000B47546F74616C5072696365080004000000000011456E6447617468657251
+      75616E74697479080004000000000013456E64476174686572546F74616C5072
+      6963650800040000000000115072654761746865725175616E74697479080004
+      000000000013507265476174686572546F74616C507269636508000400000000
+      00114375724761746865725175616E7469747908000400000000001343757247
+      6174686572546F74616C507269636508000400000000000000}
+    object cdsCustom3ChapterID: TIntegerField
+      FieldName = 'ChapterID'
+    end
+    object cdsCustom3IndexCode: TWideStringField
+      FieldName = 'IndexCode'
+      Size = 50
+    end
+    object cdsCustom3B_Code: TWideStringField
+      FieldName = 'B_Code'
+      Size = 50
+    end
+    object cdsCustom3Name: TWideStringField
+      FieldName = 'Name'
+      Size = 255
+    end
+    object cdsCustom3Units: TWideStringField
+      FieldName = 'Units'
+    end
+    object cdsCustom3Price: TFloatField
+      FieldName = 'Price'
+    end
+    object cdsCustom3DealQuantity: TFloatField
+      FieldName = 'DealQuantity'
+    end
+    object cdsCustom3DealTotalPrice: TFloatField
+      FieldName = 'DealTotalPrice'
+    end
+    object cdsCustom3EndMqcQuantity: TFloatField
+      FieldName = 'EndMqcQuantity'
+    end
+    object cdsCustom3EndMqcTotalPrice: TFloatField
+      FieldName = 'EndMqcTotalPrice'
+    end
+    object cdsCustom3EndMqcaTotalPrice: TFloatField
+      FieldName = 'EndMqcaTotalPrice'
+    end
+    object cdsCustom3EndPqcQuantity: TFloatField
+      FieldName = 'EndPqcQuantity'
+    end
+    object cdsCustom3EndPqcTotalPrice: TFloatField
+      FieldName = 'EndPqcTotalPrice'
+    end
+    object cdsCustom3EndPqcaTotalPrice: TFloatField
+      FieldName = 'EndPqcaTotalPrice'
+    end
+    object cdsCustom3EndQcQuantity: TFloatField
+      FieldName = 'EndQcQuantity'
+    end
+    object cdsCustom3EndQcTotalPrice: TFloatField
+      FieldName = 'EndQcTotalPrice'
+    end
+    object cdsCustom3EndQcaTotalPrice: TFloatField
+      FieldName = 'EndQcaTotalPrice'
+    end
+    object cdsCustom3GQuantity: TFloatField
+      FieldName = 'GQuantity'
+    end
+    object cdsCustom3GTotalPrice: TFloatField
+      FieldName = 'GTotalPrice'
+    end
+    object cdsCustom3EndGatherQuantity: TFloatField
+      FieldName = 'EndGatherQuantity'
+    end
+    object cdsCustom3EndGatherTotalPrice: TFloatField
+      FieldName = 'EndGatherTotalPrice'
+    end
+    object cdsCustom3PreGatherQuantity: TFloatField
+      FieldName = 'PreGatherQuantity'
+    end
+    object cdsCustom3PreGatherTotalPrice: TFloatField
+      FieldName = 'PreGatherTotalPrice'
+    end
+    object cdsCustom3CurGatherQuantity: TFloatField
+      FieldName = 'CurGatherQuantity'
+    end
+    object cdsCustom3CurGatherTotalPrice: TFloatField
+      FieldName = 'CurGatherTotalPrice'
+    end
+  end
+end

Units/ProjectData.pas

@@ -2319,6 +2319,7 @@ begin
   FProjProperties.Open(FConnection.Connection);
   UpdateOldData;
   FBillsData.Open(FConnection.Connection);
+  FDealBillsData.Open(FConnection.Connection);
   FDealPaymentData.Open(FConnection.Connection);
   FBGLData.Open(FConnection.Connection);
   if ProjProperties.PhaseCount > 0 then

Units/ReportManager.pas

@@ -8,7 +8,7 @@ uses
   rmGclBillsAuditCompareDm, rmDealInfosDm, rmXmjBGLDetailDm,
   rmOtherReport1Dm, rmGcl_XmjBillsDm, rmGclBillsPlaneDm,
   rmMentalCustomized1Dm, rmCustomized2Dm, rmHaBaiCustomizedDm,
-  rmWeiWuZjjlGatherDm,
+  rmWeiWuZjjlGatherDm, rmZhongKaiDm,
   rmTestFrm,
   ReportInteractInfo,
   Classes, ScFileArchiver, IniFiles, Graphics, DB, ProjectData,
@@ -225,6 +225,7 @@ type
     FrmCustomized2Data: TrmCustomized2Data;
     FrmHaBaiCustomizedData: TrmHaBaiCustomizedData;
     FrmWeiWuZjjlGatherData: TrmWeiWuZjjlGatherData;
+    FrmZhongKaiData: TrmZhongKaiData;
 
     FMemoryQuery: TADOQuery;
 
@@ -258,7 +259,7 @@ implementation
 
 uses
   SysUtils, ZhAPI, UtilMethods, Globals, ProjectManagerDm,
-  rmSelectProjectFrm, Controls;
+  rmSelectProjectFrm, Controls, ConditionalDefines;
 
 { TTemplateNode }
 
@@ -663,6 +664,7 @@ begin
   FrmCustomized2Data := TrmCustomized2Data.Create(nil);
   FrmHaBaiCustomizedData := TrmHaBaiCustomizedData.Create(nil);
   FrmWeiWuZjjlGatherData := TrmWeiWuZjjlGatherData.Create(nil);
+  FrmZhongKaiData := TrmZhongKaiData.Create(nil);
 
   FMemoryQuery := TADOQuery.Create(nil);
 
@@ -688,6 +690,7 @@ begin
 
   FMemoryQuery.Free;
 
+  FrmZhongKaiData.Free;
   FrmWeiWuZjjlGatherData.Free;
   FrmHaBaiCustomizedData.Free;
   FrmCustomized2Data.Free;
@@ -732,11 +735,7 @@ end;
 function TMemoryReportManager.GetMemoryDataSet(
   ADataSetID: Integer; AProjectData: TProjectData): TDataSet;
 begin
-  //ADataSetID := 56;
-  {if FrmHaBaiCustomizedData.hbGatherType = hbgt_CS then
-    ADataSetID := 51
-  else
-    ADataSetID := 50;}
+  //ADataSetID := 58;
   case ADataSetID of
     1: Result := FrmGridHeaderData.AssginData(AProjectData);   // 各表表头
     2: Result := FrmGclBillsBGData.AssignData(AProjectData, rmtPhaseGather, rmgtGather); // 工程量清单[本期完成]
@@ -755,8 +754,10 @@ begin
        // 粤竣9, 粤竣06-1, 粤竣04, 粤竣01, 工程量清单进度[甘肃高管局定制], [广东肇庆定制]计量汇总表
        45, 46, 47, 48, 49, 50,
        // 内蒙古哈白定制表(支表2, 支表3, 支表14, 支表3-1, 支表4-1, 会签)
-       52, 53, 54, 55:
+       52, 53, 54, 55,
        // 内蒙古306国道定制(支表2, 支表3, 支表3-1, 支表4-1)
+       57, 58:
+       // 中开高速定制表(支表2, 支表3)
         Result := SelectProjectsAndAssignData(ADataSetID);
     14: Result := FrmGclBillsBGData.AssignData(AProjectData, rmtPhaseDeal, rmgtGather); // 工程量清单[本期合同]
     15: Result := FrmGclBillsBGData.AssignData(AProjectData, rmtPhaseQc, rmgtGather); // 工程量清单[本期数量变更]
@@ -901,6 +902,8 @@ begin
       53: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3, False);
       54: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3_1, False);
       55: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt4_1, False);
+      57: Result := FrmZhongKaiData.AssignData(FTenders, zkgt2);                
+      58: Result := FrmZhongKaiData.AssignData(FTenders, zkgt3);
       else Result := FrmBillsGatherData.AssignData(FTenders);
     end;
   end;