Task #1267 价差计算相关

DataModules/ProjectGLDm.pas

@@ -240,7 +240,7 @@ begin
     CalculatePM_Quantity(TProjectGLRecord(AValue.Owner));
     CalculatePM_TotalPrice(TProjectGLRecord(AValue.Owner));
     CalculatePALRela(TProjectGLRecord(AValue.Owner));
-    //CalculateRelaBills(TProjectGLRecord(AValue.Owner));
+    CalculateRelaBills(TProjectGLRecord(AValue.Owner));
     TProjectData(FProjectData).PriceMarginBillsData.RefreshAllDetailBills;
     RefreshGatherData;
   end;
@@ -298,6 +298,8 @@ end;
 procedure TProjectGLData.CalculateAll;
 begin
   CalculatePrice;
+  TProjectData(FProjectData).PhaseData.StageData.CalculateAll; 
+  TProjectData(FProjectData).PriceMarginBillsData.RefreshAllDetailBills;
   CalculatePriceMargin;
   CalculatePALRelas;
   RefreshGatherData;
@@ -468,8 +470,8 @@ begin
     with TProjectData(FProjectData).PhaseData do
       StageData.CalculatePriceMargin(DetailGLRec.BillsID.AsInteger);
   end;
-  with TProjectData(FProjectData).PhaseData do
-    StageData.CalculatePriceMarginNode;
+  {with TProjectData(FProjectData).PhaseData do
+    StageData.CalculatePriceMarginNode;}
 end;
 
 procedure TProjectGLData.LoadDetailGLs(AGLID: Integer);

DataModules/StageDm.pas

@@ -876,8 +876,8 @@ var
   Rec: TStageRecord;
   fPM, fPMDiffer: Double;
 begin
-  if not HasPriceMarginBills then Exit;
-  
+  //if not HasPriceMarginBills then Exit;
+
   Rec := StageRecord(ABillsID);
   if not Assigned(Rec) then Exit;
 

Units/ProjectData.pas

@@ -1808,13 +1808,13 @@ procedure TProjectData.CalculatePriceMargin;
 begin
   // 计算工料价差数据
   FProjectGLData.CalculateAll;
-  if not FPhaseData.StageDataReadOnly then
+  {if not FPhaseData.StageDataReadOnly then
   begin
     // 计算清单价差节点
     PhaseData.StageData.CalculatePriceMarginNode;
     // 计算合同支付
     PhaseData.PhasePayData.CalculateAll;
-  end;
+  end;}
 end;
 
 procedure TProjectData.LockProjectGLData;