汇总表ID=35，新增设计数量、经济指标类。

DataModules/ReportMemoryDm/rmBillsGatherDm.dfm

@@ -5,165 +5,13 @@ object rmBillsGatherData: TrmBillsGatherData
   Height = 276
   Width = 288
   object cdsFxBills: TClientDataSet
-    Active = True
     Aggregates = <>
-    FieldDefs = <
-      item
-        Name = 'XiangCode'
-        DataType = ftString
-        Size = 10
-      end
-      item
-        Name = 'MuCode'
-        DataType = ftString
-        Size = 10
-      end
-      item
-        Name = 'JieCode'
-        DataType = ftString
-        Size = 10
-      end
-      item
-        Name = 'XiMuCode'
-        DataType = ftString
-        Size = 30
-      end
-      item
-        Name = 'Code'
-        DataType = ftString
-        Size = 50
-      end
-      item
-        Name = 'B_Code'
-        DataType = ftString
-        Size = 50
-      end
-      item
-        Name = 'Name'
-        DataType = ftWideString
-        Size = 200
-      end
-      item
-        Name = 'Units'
-        DataType = ftWideString
-        Size = 20
-      end
-      item
-        Name = 'Price'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddDealQuantity'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddDealTotalPrice'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddQcQuantity'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddQcTotalPrice'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddPcQuantity'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddPcTotalPrice'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddGatherQuantity'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddGatherTotalPrice'
-        DataType = ftFloat
-      end
-      item
-        Name = 'Percent'
-        DataType = ftFloat
-      end
-      item
-        Name = 'MemoStr'
-        DataType = ftWideString
-        Size = 100
-      end
-      item
-        Name = 'Quantity'
-        DataType = ftFloat
-      end
-      item
-        Name = 'TotalPrice'
-        DataType = ftFloat
-      end
-      item
-        Name = 'DgnQuantity1'
-        DataType = ftFloat
-      end
-      item
-        Name = 'DgnQuantity2'
-        DataType = ftFloat
-      end
-      item
-        Name = 'DgnQuantity'
-        DataType = ftString
-        Size = 50
-      end
-      item
-        Name = 'DgnPrice2'
-        DataType = ftFloat
-      end
-      item
-        Name = 'DgnPrice1'
-        DataType = ftFloat
-      end
-      item
-        Name = 'DgnPrice'
-        DataType = ftString
-        Size = 50
-      end
-      item
-        Name = 'RatioPercent'
-        DataType = ftFloat
-      end
-      item
-        Name = 'AddRatioPercent'
-        DataType = ftFloat
-      end>
+    FieldDefs = <>
     IndexDefs = <>
     Params = <>
     StoreDefs = True
     Left = 32
     Top = 24
-    Data = {
-      CD0200009619E0BD01000000180000001D000000000003000000CD0209586961
-      6E67436F64650100490000000100055749445448020002000A00064D75436F64
-      650100490000000100055749445448020002000A00074A6965436F6465010049
-      0000000100055749445448020002000A000858694D75436F6465010049000000
-      0100055749445448020002001E0004436F646501004900000001000557494454
-      4802000200320006425F436F6465010049000000010005574944544802000200
-      3200044E616D6502004A000000010005574944544802000200900105556E6974
-      7301004A00000001000557494454480200020028000550726963650800040000
-      0000000F4164644465616C5175616E7469747908000400000000001141646444
-      65616C546F74616C507269636508000400000000000D41646451635175616E74
-      69747908000400000000000F4164645163546F74616C50726963650800040000
-      0000000D41646450635175616E7469747908000400000000000F416464506354
-      6F74616C50726963650800040000000000114164644761746865725175616E74
-      697479080004000000000013416464476174686572546F74616C507269636508
-      000400000000000750657263656E740800040000000000074D656D6F53747201
-      004A000000010005574944544802000200C800085175616E7469747908000400
-      000000000A546F74616C507269636508000400000000000C44676E5175616E74
-      6974793108000400000000000C44676E5175616E746974793208000400000000
-      000B44676E5175616E7469747901004900000001000557494454480200020032
-      000944676E50726963653208000400000000000944676E507269636531080004
-      00000000000844676E5072696365010049000000010005574944544802000200
-      32000C526174696F50657263656E7408000400000000000F416464526174696F
-      50657263656E7408000400000000000000}
     object cdsFxBillsXiangCode: TStringField
       FieldName = 'XiangCode'
       Size = 10
@@ -261,6 +109,62 @@ object rmBillsGatherData: TrmBillsGatherData
     object cdsFxBillsAddRatioPercent: TFloatField
       FieldName = 'AddRatioPercent'
     end
+    object cdsFxBillsDealDgnQuantity1: TFloatField
+      FieldName = 'DealDgnQuantity1'
+    end
+    object cdsFxBillsDealDgnQuantity2: TFloatField
+      FieldName = 'DealDgnQuantity2'
+    end
+    object cdsFxBillsDealDgnQuantity: TStringField
+      FieldName = 'DealDgnQuantity'
+      Size = 50
+    end
+    object cdsFxBillsDealDgnPrice1: TFloatField
+      FieldName = 'DealDgnPrice1'
+    end
+    object cdsFxBillsDealDgnPrice2: TFloatField
+      FieldName = 'DealDgnPrice2'
+    end
+    object cdsFxBillsDealDgnPrice: TStringField
+      FieldName = 'DealDgnPrice'
+    end
+    object cdsFxBillsCDgnQuantity1: TFloatField
+      FieldName = 'CDgnQuantity1'
+    end
+    object cdsFxBillsCDgnQuantity2: TFloatField
+      FieldName = 'CDgnQuantity2'
+    end
+    object cdsFxBillsCDgnQuantity: TStringField
+      FieldName = 'CDgnQuantity'
+      Size = 50
+    end
+    object cdsFxBillsCDgnPrice1: TFloatField
+      FieldName = 'CDgnPrice1'
+    end
+    object cdsFxBillsCDgnPrice2: TFloatField
+      FieldName = 'CDgnPrice2'
+    end
+    object cdsFxBillsCDgnPrice: TStringField
+      FieldName = 'CDgnPrice'
+    end
+    object cdsFxBillsFinalDgnQuantity1: TFloatField
+      FieldName = 'FinalDgnQuantity1'
+    end
+    object cdsFxBillsFinalDgnQuantity2: TFloatField
+      FieldName = 'FinalDgnQuantity2'
+    end
+    object cdsFxBillsFinalDgnQuantity: TFloatField
+      FieldName = 'FinalDgnQuantity'
+    end
+    object cdsFxBillsFinalDgnPrice1: TFloatField
+      FieldName = 'FinalDgnPrice1'
+    end
+    object cdsFxBillsFinalDgnPrice2: TFloatField
+      FieldName = 'FinalDgnPrice2'
+    end
+    object cdsFxBillsFinalDgnPrice: TFloatField
+      FieldName = 'FinalDgnPrice'
+    end
   end
   object cdsGclBills: TClientDataSet
     Active = True

DataModules/ReportMemoryDm/rmBillsGatherDm.pas

@@ -70,6 +70,24 @@ type
     cdsFxBillsDgnPrice: TStringField;
     cdsFxBillsRatioPercent: TFloatField;
     cdsFxBillsAddRatioPercent: TFloatField;
+    cdsFxBillsDealDgnQuantity1: TFloatField;
+    cdsFxBillsDealDgnQuantity2: TFloatField;
+    cdsFxBillsDealDgnQuantity: TStringField;
+    cdsFxBillsDealDgnPrice1: TFloatField;
+    cdsFxBillsDealDgnPrice2: TFloatField;
+    cdsFxBillsDealDgnPrice: TStringField;
+    cdsFxBillsCDgnQuantity1: TFloatField;
+    cdsFxBillsCDgnQuantity2: TFloatField;
+    cdsFxBillsCDgnQuantity: TStringField;
+    cdsFxBillsCDgnPrice1: TFloatField;
+    cdsFxBillsCDgnPrice2: TFloatField;
+    cdsFxBillsCDgnPrice: TStringField;
+    cdsFxBillsFinalDgnQuantity1: TFloatField;
+    cdsFxBillsFinalDgnQuantity2: TFloatField;
+    cdsFxBillsFinalDgnQuantity: TFloatField;
+    cdsFxBillsFinalDgnPrice1: TFloatField;
+    cdsFxBillsFinalDgnPrice2: TFloatField;
+    cdsFxBillsFinalDgnPrice: TFloatField;
     // ¾öËã05-2
     cdsGclBills: TClientDataSet;
     cdsGclBillsB_Code: TStringField;
@@ -646,6 +664,27 @@ begin
     cdsFxBillsDgnPrice2.AsFloat := PriceRoundTo(ANode.TotalPrice/ANode.DesignQuantity2);
   if cdsFxBillsDgnPrice1.AsFloat <> 0 then
     cdsFxBillsDgnPrice.AsString := GetDgnQuantity(cdsFxBillsDgnPrice1.AsFloat, cdsFxBillsDgnPrice2.AsFloat);
+
+  cdsFxBillsDealDgnQuantity1.AsFloat := ANode.DealDesignQuantity1;
+  cdsFxBillsDealDgnQuantity2.AsFloat := ANode.DealDesignQuantity2;
+  cdsFxBillsDealDgnQuantity.AsString := GetDgnQuantity(ANode.DealDesignQuantity1, ANode.DesignQuantity2);
+  cdsFxBillsDealDgnPrice1.AsFloat := GetDgnPrice(cdsFxBillsAddDealTotalPrice.AsFloat, cdsFxBillsDealDgnQuantity1.AsFloat);
+  cdsFxBillsDealDgnPrice2.AsFloat := GetDgnPrice(cdsFxBillsAddDealTotalPrice.AsFloat, cdsFxBillsDealDgnQuantity2.AsFloat);
+  cdsFxBillsDealDgnPrice.AsString := GetDgnQuantity(cdsFxBillsDealDgnPrice1.AsFloat, cdsFxBillsDealDgnPrice2.AsFloat);
+
+  cdsFxBillsCDgnQuantity1.AsFloat := ANode.CDesignQuantity1;
+  cdsFxBillsCDgnQuantity2.AsFloat := ANode.CDesignQuantity2;
+  cdsFxBillsCDgnQuantity.AsString := GetDgnQuantity(ANode.CDesignQuantity1, ANode.CDesignQuantity2);
+  cdsFxBillsCDgnPrice1.AsFloat := GetDgnPrice(cdsFxBillsAddQcTotalPrice.AsFloat, cdsFxBillsCDgnQuantity1.AsFloat);
+  cdsFxBillsCDgnPrice2.AsFloat := GetDgnPrice(cdsFxBillsAddQcTotalPrice.AsFloat, cdsFxBillsCDgnQuantity2.AsFloat);
+  cdsFxBillsCDgnPrice.AsString := GetDgnQuantity(cdsFxBillsCDgnPrice1.AsFloat, cdsFxBillsCDgnPrice2.AsFloat);
+
+  cdsFxBillsFinalDgnQuantity1.AsFloat := ANode.DealDesignQuantity1 + ANode.CDesignQuantity1;
+  cdsFxBillsFinalDgnQuantity2.AsFloat := ANode.DealDesignQuantity2 + ANode.CDesignQuantity2;
+  cdsFxBillsFinalDgnQuantity.AsString := GetDgnQuantity(cdsFxBillsFinalDgnQuantity1.AsFloat, cdsFxBillsFinalDgnQuantity2.AsFloat);
+  cdsFxBillsFinalDgnPrice1.AsFloat := GetDgnPrice(cdsFxBillsAddGatherTotalPrice.AsFloat, cdsFxBillsFinalDgnQuantity1.AsFloat);
+  cdsFxBillsFinalDgnPrice2.AsFloat := GetDgnPrice(cdsFxBillsAddGatherTotalPrice.AsFloat, cdsFxBillsFinalDgnQuantity2.AsFloat);
+  cdsFxBillsFinalDgnPrice.AsString := GetDgnQuantity(cdsFxBillsFinalDgnPrice1.AsFloat, cdsFxBillsFinalDgnPrice2.AsFloat);
   cdsFxBills.Post;
   WriteNode(TReportCacheNode(ANode.FirstChild));
   WriteNode(TReportCacheNode(ANode.NextSibling));