DataSetID = 54，新增两个字段

DataModules/ReportMemoryDm/rmHaBaiCustomizedDm.dfm

@@ -261,6 +261,14 @@ object rmHaBaiCustomizedData: TrmHaBaiCustomizedData
       item
         Name = 'SerialNo'
         DataType = ftInteger
+      end
+      item
+        Name = 'P_CurDealQuantity'
+        DataType = ftFloat
+      end
+      item
+        Name = 'CurDealQuantity'
+        DataType = ftFloat
       end>
     IndexDefs = <>
     IndexFieldNames = 'ProjectID;ChapterID;InnerPartID;IndexCode'
@@ -269,7 +277,7 @@ object rmHaBaiCustomizedData: TrmHaBaiCustomizedData
     Left = 264
     Top = 48
     Data = {
-      270200009619E0BD01000000180000001600000000000300000027020950726F
+      590200009619E0BD01000000180000001800000000000300000059020950726F
       6A656374494404000100000000000B50726F6A6563744E616D6502004A000000
       0100055749445448020002009001094368617074657249440400010000000000
       0B496E6E6572506172744944040001000000000009496E646578436F64650100
@@ -286,7 +294,8 @@ object rmHaBaiCustomizedData: TrmHaBaiCustomizedData
       746865725175616E74697479080004000000000015505F456E64476174686572
       546F74616C507269636508000400000000000A43757250657263656E74080004
       00000000000A456E6450657263656E7408000400000000000853657269616C4E
-      6F04000100000000000000}
+      6F040001000000000011505F4375724465616C5175616E746974790800040000
+      0000000F4375724465616C5175616E7469747908000400000000000000}
     object cdsCustomProjProjectID: TIntegerField
       FieldName = 'ProjectID'
     end
@@ -357,6 +366,12 @@ object rmHaBaiCustomizedData: TrmHaBaiCustomizedData
     object cdsCustomProjSerialNo: TIntegerField
       FieldName = 'SerialNo'
     end
+    object cdsCustomProjP_CurDealQuantity: TFloatField
+      FieldName = 'P_CurDealQuantity'
+    end
+    object cdsCustomProjCurDealQuantity: TFloatField
+      FieldName = 'CurDealQuantity'
+    end
   end
   object cdsCustomCS_1: TClientDataSet
     Active = True

DataModules/ReportMemoryDm/rmHaBaiCustomizedDm.pas

@@ -43,6 +43,9 @@ type
     FP_EndGatherQuantity: TDoubleArray;
     FP_EndGatherTotalPrice: TDoubleArray;
 
+    FCurDealQuantity: Double;
+    FP_CurDealQuantity: TDoubleArray;
+
     procedure SetB_Code(const Value: string);
     function GetCurPercent: Double;
     function GetEndPercent: Double;
@@ -77,6 +80,9 @@ type
     property P_EndGatherQuantity: TDoubleArray read FP_EndGatherQuantity write FP_EndGatherQuantity;
     property P_EndGatherTotalPrice: TDoubleArray read FP_EndGatherTotalPrice write FP_EndGatherTotalPrice;
 
+    property P_CurDealQuantity: TDoubleArray read FP_CurDealQuantity write FP_CurDealQuantity;
+    property CurDealQuantity: Double read FCurDealQuantity write FCurDealQuantity;
+
     property CurPercent: Double read GetCurPercent;
     property EndPercent: Double read GetEndPercent;
   end;
@@ -315,6 +321,8 @@ type
     cdsCustomCS_2EndCompleteTotalPrice: TFloatField;
     cdsCustomCS_2PreCompleteTotalPrice: TFloatField;
     cdsCustomCS_2CurPayTotalPrice: TFloatField;
+    cdsCustomProjP_CurDealQuantity: TFloatField;
+    cdsCustomProjCurDealQuantity: TFloatField;
   private
     FhbGatherType: THaBaiGatherType;
     FProjectData: TProjectData;
@@ -840,6 +848,8 @@ var
     cdsCustomProjP_EndGatherTotalPrice.AsFloat := AGclNode.P_EndGatherTotalPrice[iProject];
     cdsCustomProjCurPercent.AsFloat := AGclNode.CurPercent;
     cdsCustomProjEndPercent.AsFloat := AGclNode.EndPercent;
+    cdsCustomProjP_CurDealQuantity.AsFloat := AGclNode.P_CurDealQuantity[iProject];
+    cdsCustomProjCurDealQuantity.AsFloat := AGclNode.CurDealQuantity;
     cdsCustomProj.Post;
   end;
 
@@ -1111,6 +1121,7 @@ begin
   SetLength(FP_CurGatherTotalPrice, FProjectCount);
   SetLength(FP_EndGatherQuantity, FProjectCount);
   SetLength(FP_EndGatherTotalPrice, FProjectCount);
+  SetLength(FP_CurDealQuantity, FProjectCount);
 end;
 
 function TGclNode.GetCurPercent: Double;
@@ -1164,6 +1175,9 @@ begin
       Result.P_EndGatherQuantity[AProjectIndex] := Result.P_EndGatherQuantity[AProjectIndex] + EndGatherQuantity.AsFloat;
       Result.P_EndGatherTotalPrice[AProjectIndex] := Result.P_EndGatherTotalPrice[AProjectIndex] + EndGatherTotalPrice.AsFloat;
 
+      Result.CurDealQuantity := Result.CurDealQuantity + DealQuantity.AsFloat;
+      Result.P_CurDealQuantity[AProjectIndex] := Result.P_CurDealQuantity[AProjectIndex] + DealQuantity.AsFloat;
+
       Result.PreGatherQuantity := Result.PreGatherQuantity + PreGatherQuantity.AsFloat;
       Result.PreGatherTotalPrice := Result.PreGatherTotalPrice + PreGatherTotalPrice.AsFloat;
     end;
@@ -1387,6 +1401,9 @@ begin
       Result.P_EndGatherQuantity[AProjectIndex] := Result.P_EndGatherQuantity[AProjectIndex] + EndGatherQuantity.AsFloat;
       Result.P_EndGatherTotalPrice[AProjectIndex] := Result.P_EndGatherTotalPrice[AProjectIndex] + EndGatherTotalPrice.AsFloat;
 
+      Result.CurDealQuantity := Result.CurDealQuantity + DealQuantity.AsFloat;
+      Result.P_CurDealQuantity[AProjectIndex] := Result.P_CurDealQuantity[AProjectIndex] + DealQuantity.AsFloat;
+
       Result.PreGatherQuantity := Result.PreGatherQuantity + PreGatherQuantity.AsFloat;
       Result.PreGatherTotalPrice := Result.PreGatherTotalPrice + PreGatherTotalPrice.AsFloat;
     end;