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

DataModules/ReportMemoryDm/rmBillsPhaseGatherDm.dfm

@@ -87,11 +87,7 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
         DataType = ftFloat
       end
       item
-        Name = 'htDgnQty1'
-        DataType = ftFloat
-      end
-      item
-        Name = 'htDgnQty2'
+        Name = 'TotalPrice'
         DataType = ftFloat
       end
       item
@@ -100,7 +96,11 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
         Size = 50
       end
       item
-        Name = 'TotalPrice'
+        Name = 'htDgnQty2'
+        DataType = ftFloat
+      end
+      item
+        Name = 'htDgnQty1'
         DataType = ftFloat
       end
       item
@@ -125,11 +125,6 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
         DataType = ftFloat
       end
       item
-        Name = 'MemoStr'
-        DataType = ftWideString
-        Size = 255
-      end
-      item
         Name = 'sumDgnQty1'
         DataType = ftFloat
       end
@@ -141,6 +136,11 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
         Name = 'sumDgnQty'
         DataType = ftString
         Size = 50
+      end
+      item
+        Name = 'MemoStr'
+        DataType = ftWideString
+        Size = 255
       end>
     IndexDefs = <>
     Params = <>
@@ -161,16 +161,16 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
       636508000400000000000A73687444676E5174793108000400000000000A7368
       7444676E5174793208000400000000000973687444676E517479010049000000
       01000557494454480200020032000D736874546F74616C507269636508000400
-      0000000009687444676E51747931080004000000000009687444676E51747932
-      080004000000000008687444676E517479010049000000010005574944544802
-      00020032000A546F74616C5072696365080004000000000009626744676E5174
+      000000000A546F74616C5072696365080004000000000008687444676E517479
+      010049000000010005574944544802000200320009687444676E517479320800
+      04000000000009687444676E51747931080004000000000009626744676E5174
       7931080004000000000009626744676E51747932080004000000000008626744
       676E51747901004900000001000557494454480200020032000F456E64516354
       6F74616C5072696365080004000000000011456E644465616C546F74616C5072
-      6963650800040000000000074D656D6F53747202004A00000001000557494454
-      4802000200FE010A73756D44676E5174793108000400000000000A73756D4467
-      6E5174793208000400000000000973756D44676E517479010049000000010005
-      57494454480200020032000000}
+      69636508000400000000000A73756D44676E5174793108000400000000000A73
+      756D44676E5174793208000400000000000973756D44676E5174790100490000
+      000100055749445448020002003200074D656D6F53747202004A000000010005
+      574944544802000200FE010000}
     object cdsZjtzBillsID: TIntegerField
       FieldName = 'ID'
     end
@@ -230,19 +230,35 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
     object cdsZjtzBillsshtTotalPrice: TFloatField
       FieldName = 'shtTotalPrice'
     end
-    object cdsZjtzBillshtDgnQty1: TFloatField
-      FieldName = 'htDgnQty1'
+    object cdsZjtzBillsDgnQty1: TFloatField
+      FieldKind = fkCalculated
+      FieldName = 'DgnQty1'
+      Calculated = True
     end
-    object cdsZjtzBillshtDgnQty2: TFloatField
-      FieldName = 'htDgnQty2'
+    object cdsZjtzBillsDgnQty2: TFloatField
+      FieldKind = fkCalculated
+      FieldName = 'DgnQty2'
+      Calculated = True
     end
-    object cdsZjtzBillshtDgnQty: TStringField
-      FieldName = 'htDgnQty'
+    object cdsZjtzBillsDgnQty: TStringField
+      FieldKind = fkCalculated
+      FieldName = 'DgnQty'
       Size = 50
+      Calculated = True
     end
     object cdsZjtzBillsTotalPrice: TFloatField
       FieldName = 'TotalPrice'
     end
+    object cdsZjtzBillshtDgnQty: TStringField
+      FieldName = 'htDgnQty'
+      Size = 50
+    end
+    object cdsZjtzBillshtDgnQty2: TFloatField
+      FieldName = 'htDgnQty2'
+    end
+    object cdsZjtzBillshtDgnQty1: TFloatField
+      FieldName = 'htDgnQty1'
+    end
     object cdsZjtzBillsbgDgnQty1: TFloatField
       FieldName = 'bgDgnQty1'
     end
@@ -269,6 +285,22 @@ object rmBillsPhaseGatherData: TrmBillsPhaseGatherData
       FieldName = 'sumDgnQty'
       Size = 50
     end
+    object cdsZjtzBillsDgnQtyA1: TFloatField
+      FieldKind = fkCalculated
+      FieldName = 'DgnQtyA1'
+      Calculated = True
+    end
+    object cdsZjtzBillsDgnQtyA2: TFloatField
+      FieldKind = fkCalculated
+      FieldName = 'DgnQtyA2'
+      Calculated = True
+    end
+    object cdsZjtzBillsDgnQtyA: TStringField
+      FieldKind = fkCalculated
+      FieldName = 'DgnQtyA'
+      Size = 50
+      Calculated = True
+    end
     object cdsZjtzBillsMemoStr: TWideStringField
       FieldName = 'MemoStr'
       Size = 255

DataModules/ReportMemoryDm/rmBillsPhaseGatherDm.pas

@@ -41,6 +41,12 @@ type
     cdsZjtzBillssumDgnQty1: TFloatField;
     cdsZjtzBillssumDgnQty2: TFloatField;
     cdsZjtzBillssumDgnQty: TStringField;
+    cdsZjtzBillsDgnQty1: TFloatField;
+    cdsZjtzBillsDgnQty2: TFloatField;
+    cdsZjtzBillsDgnQty: TStringField;
+    cdsZjtzBillsDgnQtyA1: TFloatField;
+    cdsZjtzBillsDgnQtyA2: TFloatField;
+    cdsZjtzBillsDgnQtyA: TStringField;
   private
     FCacheTree: TSpecPhaseCacheTree;
     FProjectData: TProjectData;
@@ -153,6 +159,8 @@ begin
   vNode :=  TMeasureBillsIDTreeNode(ANode);
   Result := AddBillsNode(vNode, AParent);
   Rec := vNode.Rec;
+  Result.DgnQty1 := Result.DgnQty1 + Rec.DgnQuantity1.AsFloat;
+  Result.DgnQty2 := Result.DgnQty2 + Rec.DgnQuantity2.AsFloat;
   Result.TotalPrice := Result.TotalPrice + Rec.TotalPrice.AsFloat;
 
   Result.htDgnQty1 := Result.htDgnQty1 + Rec.DealDgnQuantity1.AsFloat;
@@ -334,11 +342,14 @@ begin
   cdsZjtzBillsshtDgnQty.AsString := GetDgnQuantity(ANode.shtDgnQty1, ANode.shtDgnQty2);
   cdsZjtzBillsshtTotalPrice.AsFloat := ANode.shtTotalPrice;
 
+  cdsZjtzBillsDgnQty1.AsFloat := ANode.DgnQty1;
+  cdsZjtzBillsDgnQty2.AsFloat := ANode.DgnQty2;
+  cdsZjtzBillsDgnQty.AsString := GetDgnQuantity(ANode.DgnQty1, ANode.DgnQty2);
+  cdsZjtzBillsTotalPrice.AsFloat := ANode.TotalPrice;
+
   cdsZjtzBillshtDgnQty1.AsFloat := ANode.htDgnQty1;
   cdsZjtzBillshtDgnQty2.AsFloat := ANode.htDgnQty2;
   cdsZjtzBillshtDgnQty.AsString := GetDgnQuantity(ANode.htDgnQty1, ANode.htDgnQty2);
-  cdsZjtzBillsTotalPrice.AsFloat := ANode.TotalPrice;
-
   cdsZjtzBillsbgDgnQty1.AsFloat := ANode.bgDgnQty1;
   cdsZjtzBillsbgDgnQty2.AsFloat := ANode.bgDgnQty2;
   cdsZjtzBillsbgDgnQty.AsString := GetDgnQuantity(ANode.bgDgnQty1, ANode.bgDgnQty2);
@@ -348,6 +359,10 @@ begin
   cdsZjtzBillssumDgnQty1.AsFloat := ANode.htDgnQty1 + ANode.bgDgnQty1;
   cdsZjtzBillssumDgnQty2.AsFloat := ANode.htDgnQty2 + ANode.bgDgnQty2;
   cdsZjtzBillssumDgnQty.AsString := GetDgnQuantity(cdsZjtzBillssumDgnQty1.AsFloat, cdsZjtzBillssumDgnQty2.AsFloat);
+
+  cdsZjtzBillsDgnQtyA1.AsFloat := ANode.DgnQty1 + ANode.bgDgnQty1;
+  cdsZjtzBillsDgnQtyA2.AsFloat := ANode.DgnQty2 + ANode.bgDgnQty2;
+  cdsZjtzBillsDgnQtyA.AsString := GetDgnQuantity(cdsZjtzBillsDgnQtyA1.AsFloat, cdsZjtzBillsDgnQtyA2.AsFloat);
   cdsZjtzBills.Post;
 
   WriteNode(TSpecPhaseCacheNode(ANode.FirstChild));

Units/MCacheTree.pas

@@ -333,6 +333,8 @@ type
     FName: string;
     FUnits: string;
 
+    FDgnQty1: Double;
+    FDgnQty2: Double;
     FTotalPrice: Double;
 
     FEndDealTotalPrice: Double;
@@ -360,6 +362,8 @@ type
     property Name: string read FName write FName;
     property Units: string read FUnits write FUnits;
 
+    property DgnQty1: Double read FDgnQty1 write FDgnQty1;
+    property DgnQty2: Double read FDgnQty2 write FDgnQty2;
     property TotalPrice: Double read FTotalPrice write FTotalPrice; 
 
     property EndDealTotalPrice: Double read FEndDealTotalPrice write FEndDealTotalPrice;