This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-08-30 17:01:42 +08:00
parent f93521e038
commit 29b7a7a731

View File

@ -1356,10 +1356,11 @@ end;
procedure TfrmProductOrderNewList_JDCX.DBTv1Column41CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
begin
if ARow1.Values[DBTv1Column25.Index] = ARow2.Values[DBTv1Column25.Index] then
if (ARow1.Values[DBTv1Column25.Index] = ARow2.Values[DBTv1Column25.Index]) and (ARow1.Values[DBTv1Column41.Index] = ARow2.Values[DBTv1Column41.Index]) then
AAreEqual := True
else
AAreEqual := False;
end;
end.