Group_01/D7DJqianjing
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~

Browse Source
This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-08-30 17:01:42 +08:00
parent f93521e038
commit 29b7a7a731
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
检验管理/U_ProductOrderNewList_JDCX.pas
View File

@ -57,7 +57,7 @@ type
v1DeliveryDate: TcxGridDBColumn;
v1OrdPerson1: TcxGridDBColumn;
v1ConNo: TcxGridDBColumn;
Order_Main: TClientDataSet;
Order_Main: TClientDataSet;
RM1: TRMGridReport;
RMDB_Main: TRMDBDataSet;
RMXLSExport1: TRMXLSExport;
@ -1346,7 +1346,7 @@ begin
AAreEqual := True
else
AAreEqual := False;
end;
end;
procedure TfrmProductOrderNewList_JDCX.DBTv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
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);
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
else
AAreEqual := False;
end;
end.