|
@@ -193,13 +193,12 @@ var
|
|
|
// 金额列名, 公式列名
|
|
|
sTPField, sFField, sPreField: string;
|
|
|
iID: Integer;
|
|
|
- fTotalPrice, fStartedPrice, fBeforeCalcTotalPrice: Double;
|
|
|
+ fTotalPrice, fStartedPrice: Double;
|
|
|
begin
|
|
|
Rec := sddPhasePay.FindKey('idxID', AID);
|
|
|
sTPField := 'TotalPrice' + IntToStr(TPhaseData(FPhaseData).StageIndex);
|
|
|
sFField := 'Formula' + IntToStr(TPhaseData(FPhaseData).StageIndex);
|
|
|
sPreField := 'PreTotalPrice' + IntToStr(TPhaseData(FPhaseData).StageIndex);
|
|
|
- fBeforeCalcTotalPrice := Rec.ValueByName(sTPField).AsFloat;
|
|
|
|
|
|
if not Rec.ValueByName('StopCalc').AsBoolean then
|
|
|
begin
|
|
@@ -246,9 +245,7 @@ begin
|
|
|
else
|
|
|
Rec.ValueByName(sTPField).AsFloat := 0;
|
|
|
end;
|
|
|
- end;}
|
|
|
- with TProjectData(TPhaseData(FPhaseData).ProjectData).DealPaymentData do
|
|
|
- UpdateTotalPrice(AID, Rec.ValueByName(sTPField).AsFloat - fBeforeCalcTotalPrice);
|
|
|
+ end;}
|
|
|
// 计算截止数据
|
|
|
Rec.ValueByName('End' + sTPField).AsFloat := FDecimal.TotalPrice.RoundTo(Rec.ValueByName(sTPField).AsFloat
|
|
|
+ Rec.ValueByName('Pre' + sTPField).AsFloat);
|