|
|
@@ -3380,6 +3380,7 @@ var
|
|
|
strAdjust: string;
|
|
|
strRCode: string;
|
|
|
pRecord: TResiveInfo;
|
|
|
+ bFZTJ: Boolean;
|
|
|
begin
|
|
|
Result := '';
|
|
|
FCacheCoe := -1;
|
|
|
@@ -3387,6 +3388,7 @@ begin
|
|
|
iBID := TScRationRecord(ARation).BillsItemID.AsInteger;
|
|
|
dRQty := TScRationRecord(ARation).Quantity.AsFloat;
|
|
|
strRCode := TScRationRecord(ARation).Code.AsString;
|
|
|
+ bFZTJ := False;
|
|
|
for I := 0 to aList.Count - 1 do
|
|
|
begin
|
|
|
FGLJList := TList.Create;
|
|
|
@@ -3401,7 +3403,12 @@ begin
|
|
|
raCementReplace : strAdjust := ResiveCemmentReplace(pRecord, iRID, iBID, aLibID, dRQty, ARation); // ok
|
|
|
raCementPB : strAdjust := ResiveCemmentPB(pRecord, iRID); // ok
|
|
|
raSimplePB : strAdjust := ResiveSimplePB(pRecord, iRID); // ok
|
|
|
- raFZCondition : strAdjust := ResiveFZCondition(pRecord, iRID, aLibID, strRCode, IsDrawingData); // ok
|
|
|
+ raFZCondition :
|
|
|
+ begin
|
|
|
+ strAdjust := ResiveFZCondition(pRecord, iRID, aLibID, strRCode, IsDrawingData); // ok
|
|
|
+ bFZTJ := True;
|
|
|
+ end;
|
|
|
+
|
|
|
raYS : strAdjust := ResiveYS(pRecord, iRID);
|
|
|
raNone : strAdjust := '';
|
|
|
end;
|
|
|
@@ -3417,6 +3424,9 @@ begin
|
|
|
FreeAndNil(FGLJList);
|
|
|
end;
|
|
|
ReCalculateBasePrice(iRID);
|
|
|
+
|
|
|
+ if bFZTJ then
|
|
|
+ Execute(TScRationRecord(ARation));
|
|
|
end;
|
|
|
|
|
|
function TScRAdjustData.ResiveCemmentPB(const aRecord: TResiveInfo;
|
