Merge branch 'master' of http://192.168.1.41:3000/MaiXinRong/Measure

DataModules/ReportMemoryDm/rmBillsPhaseGatherDm.dfm

@@ -7,11 +7,148 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
   object cdsZjtzBills: TClientDataSet
     Active = True
     Aggregates = <>
+    FieldDefs = <
+      item
+        Name = 'ID'
+        DataType = ftInteger
+      end
+      item
+        Name = 'ParentID'
+        DataType = ftInteger
+      end
+      item
+        Name = 'NextSiblingID'
+        DataType = ftInteger
+      end
+      item
+        Name = 'Code'
+        DataType = ftWideString
+        Size = 50
+      end
+      item
+        Name = 'Name'
+        DataType = ftWideString
+        Size = 255
+      end
+      item
+        Name = 'Units'
+        DataType = ftWideString
+        Size = 20
+      end
+      item
+        Name = 'cbDgnQty1'
+        DataType = ftFloat
+      end
+      item
+        Name = 'cbDgnQty2'
+        DataType = ftFloat
+      end
+      item
+        Name = 'cbDgnQty'
+        DataType = ftString
+        Size = 50
+      end
+      item
+        Name = 'cbTotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'sscDgnQty1'
+        DataType = ftFloat
+      end
+      item
+        Name = 'sscDgnQty2'
+        DataType = ftFloat
+      end
+      item
+        Name = 'sscDgnQty'
+        DataType = ftString
+        Size = 50
+      end
+      item
+        Name = 'sscTotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'shtDgnQty1'
+        DataType = ftFloat
+      end
+      item
+        Name = 'shtDgnQty2'
+        DataType = ftFloat
+      end
+      item
+        Name = 'shtDgnQty'
+        DataType = ftString
+        Size = 50
+      end
+      item
+        Name = 'shtTotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'htDgnQty1'
+        DataType = ftFloat
+      end
+      item
+        Name = 'htDgnQty2'
+        DataType = ftFloat
+      end
+      item
+        Name = 'htDgnQty'
+        DataType = ftString
+        Size = 50
+      end
+      item
+        Name = 'TotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'bgDgnQty1'
+        DataType = ftFloat
+      end
+      item
+        Name = 'bgDgnQty2'
+        DataType = ftFloat
+      end
+      item
+        Name = 'bgDgnQty'
+        DataType = ftString
+        Size = 50
+      end
+      item
+        Name = 'EndQcTotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'EndDealTotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'MemoStr'
+        DataType = ftWideString
+        Size = 255
+      end
+      item
+        Name = 'sumDgnQty1'
+        DataType = ftFloat
+      end
+      item
+        Name = 'sumDgnQty2'
+        DataType = ftFloat
+      end
+      item
+        Name = 'sumDgnQty'
+        DataType = ftString
+        Size = 50
+      end>
+    IndexDefs = <>
     Params = <>
+    StoreDefs = True
     Left = 40
     Top = 32
     Data = {
-      850200009619E0BD01000000180000001C000000000003000000850202494404
+      C90200009619E0BD01000000180000001F000000000003000000C90202494404
       0001000000000008506172656E74494404000100000000000D4E657874536962
       6C696E674944040001000000000004436F646501004A00000001000557494454
       48020002006400044E616D6502004A000000010005574944544802000200FE01
@@ -31,7 +168,9 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
       676E51747901004900000001000557494454480200020032000F456E64516354
       6F74616C5072696365080004000000000011456E644465616C546F74616C5072
       6963650800040000000000074D656D6F53747202004A00000001000557494454
-      4802000200FE010000}
+      4802000200FE010A73756D44676E5174793108000400000000000A73756D4467
+      6E5174793208000400000000000973756D44676E517479010049000000010005
+      57494454480200020032000000}
     object cdsZjtzBillsID: TIntegerField
       FieldName = 'ID'
     end
@@ -120,6 +259,16 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
     object cdsZjtzBillsEndDealTotalPrice: TFloatField
       FieldName = 'EndDealTotalPrice'
     end
+    object cdsZjtzBillssumDgnQty1: TFloatField
+      FieldName = 'sumDgnQty1'
+    end
+    object cdsZjtzBillssumDgnQty2: TFloatField
+      FieldName = 'sumDgnQty2'
+    end
+    object cdsZjtzBillssumDgnQty: TStringField
+      FieldName = 'sumDgnQty'
+      Size = 50
+    end
     object cdsZjtzBillsMemoStr: TWideStringField
       FieldName = 'MemoStr'
       Size = 255

DataModules/ReportMemoryDm/rmBillsPhaseGatherDm.pas

@@ -38,6 +38,9 @@ type
     cdsZjtzBillsEndQcTotalPrice: TFloatField;
     cdsZjtzBillsEndDealTotalPrice: TFloatField;
     cdsZjtzBillsMemoStr: TWideStringField;
+    cdsZjtzBillssumDgnQty1: TFloatField;
+    cdsZjtzBillssumDgnQty2: TFloatField;
+    cdsZjtzBillssumDgnQty: TStringField;
   private
     FCacheTree: TSpecPhaseCacheTree;
     FProjectData: TProjectData;
@@ -341,6 +344,10 @@ begin
   cdsZjtzBillsbgDgnQty.AsString := GetDgnQuantity(ANode.bgDgnQty1, ANode.bgDgnQty2);
   cdsZjtzBillsEndQcTotalPrice.AsFloat := ANode.EndQcTotalPrice;
   cdsZjtzBillsEndDealTotalPrice.AsFloat := ANode.EndDealTotalPrice;
+
+  cdsZjtzBillssumDgnQty1.AsFloat := ANode.htDgnQty1 + ANode.bgDgnQty1;
+  cdsZjtzBillssumDgnQty2.AsFloat := ANode.htDgnQty2 + ANode.bgDgnQty2;
+  cdsZjtzBillssumDgnQty.AsString := GetDgnQuantity(cdsZjtzBillssumDgnQty1.AsFloat, cdsZjtzBillssumDgnQty2.AsFloat);
   cdsZjtzBills.Post;
 
   WriteNode(TSpecPhaseCacheNode(ANode.FirstChild));