From f494e14a9c7a8cdfbae0049aeccdd33c17559983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cddf=E2=80=9D?= <“ddf668490@163.com”>
Date: Mon, 24 Feb 2025 17:13:21 +0800
Subject: [PATCH] 1

---
 T02贸易汇总仓库/U_ItemizedListList.pas      | 1 -
 T02贸易汇总仓库/U_TradeClothTotalInList.pas | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/T02贸易汇总仓库/U_ItemizedListList.pas b/T02贸易汇总仓库/U_ItemizedListList.pas
index 964de80..e38e13e 100644
--- a/T02贸易汇总仓库/U_ItemizedListList.pas
+++ b/T02贸易汇总仓库/U_ItemizedListList.pas
@@ -221,7 +221,6 @@ var
 begin
 
   SqlStr := ' select   *,JSAmmount=Price*TISQty    from Trade_ItemizedList_Main A inner join  Trade_ItemizedList_Sub B on A.TIMId=B.TIMId ';
-
   SqlStr := SqlStr + ' where A.TIMDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)));
   SqlStr := SqlStr + ' and  A.TIMDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)));
 
diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.pas b/T02贸易汇总仓库/U_TradeClothTotalInList.pas
index 4dab3ec..16a5ff1 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.pas
@@ -338,12 +338,8 @@ end;
 
 procedure TfrmTradeClothTotalInList.TBFindClick(Sender: TObject);
 begin
-  if ADOQueryMain.Active then
-  begin
-    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
-    SCreateCDS(ADOQueryMain, CDS_1);
-    SInitCDSData(ADOQueryMain, CDS_1);
-  end;
+
+  CDSDataFilter(ADOQueryMain, CDS_1, Tv1, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, '  {"EquTag": 1,"LikeTag": 2,"Fields": ""}') + '"  }');
 end;
 
 procedure TfrmTradeClothTotalInList.N1Click(Sender: TObject);