|
@@ -494,9 +494,12 @@ end;
|
|
|
function TBillsCompileData.IsSameNode(ANode,
|
|
|
ACompareNode: TsdIDTreeNode): Boolean;
|
|
|
begin
|
|
|
- Result := (ANode.Rec.ValueByName('Code').AsString = ACompareNode.Rec.ValueByName('Code').AsString)
|
|
|
- and (ANode.Rec.ValueByName('B_Code').AsString = ACompareNode.Rec.ValueByName('B_Code').AsString)
|
|
|
- and (ANode.Rec.ValueByName('Name').AsString = ACompareNode.Rec.ValueByName('Name').AsString);
|
|
|
+ if ANode.Rec.ValueByName('StaticID').AsInteger > 0 then
|
|
|
+ Result := (ANode.Rec.ValueByName('ID').AsInteger = ACompareNode.Rec.ValueByName('ID').AsInteger)
|
|
|
+ else
|
|
|
+ Result := (ANode.Rec.ValueByName('Code').AsString = ACompareNode.Rec.ValueByName('Code').AsString)
|
|
|
+ and (ANode.Rec.ValueByName('B_Code').AsString = ACompareNode.Rec.ValueByName('B_Code').AsString)
|
|
|
+ and (ANode.Rec.ValueByName('Name').AsString = ACompareNode.Rec.ValueByName('Name').AsString);
|
|
|
end;
|
|
|
|
|
|
function TBillsCompileData.FindChild(AParentNode,
|