From 3478eea81254aa50262cab7bc2b81b39154e56ac Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Mon, 13 Oct 2025 14:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=94=B6=E6=AC=BE=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=20=E6=94=B6=E6=AC=BE=E8=BF=99=E8=BE=B9=20=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=80=BB=E9=87=91=E9=A2=9D=E4=B8=80=E6=A0=B7=E7=9A=84?=
 =?UTF-8?q?=E8=AF=9D=E4=B8=A4=E8=A1=8C=E5=B0=B1=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 应收应付/U_YSMXlist.dfm | 18 ++++++++++--------
 应收应付/YSYF.dof       |  2 +-
 应收应付/testDll.cfg    |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/应收应付/U_YSMXlist.dfm b/应收应付/U_YSMXlist.dfm
index d130385..d24ec8b 100644
--- a/应收应付/U_YSMXlist.dfm
+++ b/应收应付/U_YSMXlist.dfm
@@ -1,6 +1,6 @@
 object frmYSMXlist: TfrmYSMXlist
-  Left = 208
-  Top = 113
+  Left = 277
+  Top = 638
   Width = 1205
   Height = 614
   Caption = #24212#25910#23545#36134#20449#24687#34920
@@ -22,7 +22,7 @@ object frmYSMXlist: TfrmYSMXlist
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1189
+    Width = 1197
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 59
@@ -80,7 +80,7 @@ object frmYSMXlist: TfrmYSMXlist
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1189
+    Width = 1197
     Height = 38
     Align = alTop
     BevelInner = bvRaised
@@ -222,8 +222,8 @@ object frmYSMXlist: TfrmYSMXlist
   object cxGrid2: TcxGrid
     Left = 0
     Top = 91
-    Width = 1189
-    Height = 484
+    Width = 1197
+    Height = 492
     Align = alClient
     TabOrder = 3
     object TV1: TcxGridDBBandedTableView
@@ -396,9 +396,11 @@ object frmYSMXlist: TfrmYSMXlist
         Properties.DisplayFormat = '0.00'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
+        Options.CellMerging = True
         Styles.Content = cxStyle2
         Styles.Header = cxStyle2
         Width = 75
+        OnCompareRowValuesForCellMerging = V1Column9CompareRowValuesForCellMerging
         Position.BandIndex = 2
         Position.ColIndex = 1
         Position.RowIndex = 0
@@ -628,7 +630,7 @@ object frmYSMXlist: TfrmYSMXlist
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 69
-    Width = 1189
+    Width = 1197
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -640,7 +642,7 @@ object frmYSMXlist: TfrmYSMXlist
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1189
+    ClientRectRight = 1197
     ClientRectTop = 19
   end
   object ADOQueryTemp: TADOQuery
diff --git a/应收应付/YSYF.dof b/应收应付/YSYF.dof
index 9000117..577d7fc 100644
--- a/应收应付/YSYF.dof
+++ b/应收应付/YSYF.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\³Â·á\Ó¦ÊÕÓ¦¸¶\testDll.exe
+HostApplication=D:\ÏîÄ¿´úÂë\D7szChenfeng\Ó¦ÊÕÓ¦¸¶\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/应收应付/testDll.cfg b/应收应付/testDll.cfg
index 0ee74bb..e9c1cc1 100644
--- a/应收应付/testDll.cfg
+++ b/应收应付/testDll.cfg
@@ -31,8 +31,8 @@
 -M
 -$M16384,1048576
 -K$00400000
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST