From 29b7a7a7318b1e6b61c5b68468a6cd9878c251d1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Sat, 30 Aug 2025 17:01:42 +0800
Subject: [PATCH] ~

---
 检验管理/U_ProductOrderNewList_JDCX.pas | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/检验管理/U_ProductOrderNewList_JDCX.pas b/检验管理/U_ProductOrderNewList_JDCX.pas
index 0499265..5ed7921 100644
--- a/检验管理/U_ProductOrderNewList_JDCX.pas
+++ b/检验管理/U_ProductOrderNewList_JDCX.pas
@@ -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.