材料调差，合同支付不计算材料金额

DataModules/StageDm.pas

@@ -207,7 +207,7 @@ begin
     with TProjectData(TPhaseData(FPhaseData).ProjectData).BillsMeasureData do
       UpdateRecordDeal(ABillsID, fQtyDiffer, fTPDiffer);
 
-  //CalculatePriceMargin(ABillsID);
+  CalculatePriceMargin(ABillsID);
   if ABillsID = iPriceMarginID then
     CalculateGather(ABillsID);
 
@@ -265,6 +265,8 @@ begin
       UpdateRecordQc(ABillsID, fQtyDiffer, fTPDiffer);
 
   CalculatePriceMargin(ABillsID);
+  if ABillsID = iPriceMarginID then
+    CalculateGather(ABillsID);
 
   TPhaseData(FPhaseData).PhasePayData.CalculateAll;
 end;
@@ -886,8 +888,8 @@ begin
     Rec.PM_TotalPrice.AsFloat := fPM;
     UpdateParentPriceMargin(ABillsID, fPMDiffer);
     //UpdatePriceMarginNode(fPMDiffer);
-    //with TProjectData(TPhaseData(FPhaseData).ProjectData).BillsMeasureData do
-      //UpdateRecordPM(ABillsID, fPMDiffer);
+    with TProjectData(TPhaseData(FPhaseData).ProjectData).BillsMeasureData do
+      UpdateRecordPM(ABillsID, fPMDiffer);
   end;
 end;