Browse Source

苏化项目计算Bug(累计完成率)

MaiXinRong 6 years ago
parent
commit
723fc4429d
2 changed files with 9 additions and 2 deletions
  1. 3 1
      DataModules/BillsMeasureDm.pas
  2. 6 1
      Frames/BillsMeasureFme.pas

+ 3 - 1
DataModules/BillsMeasureDm.pas

@@ -928,7 +928,9 @@ begin
   with ANode.Rec do
   begin
     fDividend := ValueByName('AddGatherTotalPrice').AsFloat;
-    fDivisor := CommonCalcRoundTo(ValueByName('TotalPrice').AsFloat + ValueByName('AddQcTotalPrice').AsFloat
+    //fDivisor := CommonCalcRoundTo(ValueByName('TotalPrice').AsFloat + ValueByName('AddQcTotalPrice').AsFloat
+      //  + ValueByName('AddPcTotalPrice').AsFloat);
+    fDivisor := TotalPriceRoundTo(ValueByName('TotalPrice').AsFloat + ValueByName('AddQcTotalPrice').AsFloat
         + ValueByName('AddPcTotalPrice').AsFloat);
     if fDivisor <> 0 then
       ValueByName('AddCompleteRate').AsFloat := AdvRoundTo(fDividend/fDivisor*100)

+ 6 - 1
Frames/BillsMeasureFme.pas

@@ -213,7 +213,12 @@ end;
 
 procedure TBillsMeasureFrame.actnCalculateAllExecute(Sender: TObject);
 begin
-  TProjectData(FBillsMeasureData.ProjectData).CalculateAll;
+  Screen.Cursor := crHourGlass;
+  try
+    TProjectData(FBillsMeasureData.ProjectData).CalculateAll;
+  finally
+    Screen.Cursor := crDefault;
+  end;
 end;
 
 procedure TBillsMeasureFrame.zgBillsMeasureCellGetColor(Sender: TObject; ACoord: TPoint;