~
This commit is contained in:
parent
f93521e038
commit
29b7a7a731
|
@ -57,7 +57,7 @@ type
|
||||||
v1DeliveryDate: TcxGridDBColumn;
|
v1DeliveryDate: TcxGridDBColumn;
|
||||||
v1OrdPerson1: TcxGridDBColumn;
|
v1OrdPerson1: TcxGridDBColumn;
|
||||||
v1ConNo: TcxGridDBColumn;
|
v1ConNo: TcxGridDBColumn;
|
||||||
Order_Main: TClientDataSet;
|
Order_Main: TClientDataSet;
|
||||||
RM1: TRMGridReport;
|
RM1: TRMGridReport;
|
||||||
RMDB_Main: TRMDBDataSet;
|
RMDB_Main: TRMDBDataSet;
|
||||||
RMXLSExport1: TRMXLSExport;
|
RMXLSExport1: TRMXLSExport;
|
||||||
|
@ -1346,7 +1346,7 @@ begin
|
||||||
AAreEqual := True
|
AAreEqual := True
|
||||||
else
|
else
|
||||||
AAreEqual := False;
|
AAreEqual := False;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TfrmProductOrderNewList_JDCX.DBTv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
|
procedure TfrmProductOrderNewList_JDCX.DBTv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
|
||||||
begin
|
begin
|
||||||
|
@ -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);
|
procedure TfrmProductOrderNewList_JDCX.DBTv1Column41CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
|
||||||
begin
|
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
|
AAreEqual := True
|
||||||
else
|
else
|
||||||
AAreEqual := False;
|
AAreEqual := False;
|
||||||
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
end.
|
end.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user