ソースを参照

Merge branch '3.1.5' of http://192.168.1.12:3000/maixinrong/measure into 3.1.5

Conflicts:
	Units/BillsTree.pas
MaiXinRong 9 年 前
コミット
3c212a8ac1
1 ファイル変更6 行追加8 行削除
  1. 6 8
      Units/BillsTree.pas

+ 6 - 8
Units/BillsTree.pas

@@ -7,7 +7,9 @@ uses
 
 type
   TBillsIDTreeNode = class(TsdIDTreeNode)
-  private
+  private     
+    FStageRec: TStageRecord;
+
     FDealQuantity: Double;
     FDealTotalPrice: Double;
     FQcQuantity: Double;
@@ -46,6 +48,9 @@ type
     property PcTotalPrice: Double read FPcTotalPrice write FPcTotalPrice;
     property GatherQuantity: Double read FGatherQuantity write FGatherQuantity;
     property GatherTotalPrice: Double read FGatherTotalPrice write FGatherTotalPrice;
+
+    // Cache Data
+    property StageRec: TStageRecord read FStageRec write FStageRec;
   end;
 
   TReCalculateNode = procedure(AID: Integer) of object;
@@ -84,8 +89,6 @@ type
   TMeasureBillsIDTree = class(TBillsIDTree)
   private
     FCompileTree: TCompileBillsIDTree;
-  protected
-    function CreateItem: TsdIDTreeNode; override;
   public
     procedure DoOnReCalcNode(AID: Integer); overload; override;
     procedure DoOnReCalcNode(ANode: TsdIDTreeNode); overload; override;
@@ -343,11 +346,6 @@ begin
     FCompileTree.DoOnReCalcNode(AID);
 end;
 
-function TMeasureBillsIDTree.CreateItem: TsdIDTreeNode;
-begin
-  Result := TMeasureBillsIDTreeNode.Create(Self);
-end;
-
 procedure TMeasureBillsIDTree.DoOnReCalcNode(ANode: TsdIDTreeNode);
 begin
   if Assigned(FCompileTree) then