From 0907fc83e0a7400c491f012f60e0a86a37612fb1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 17 Jun 2025 12:17:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- T02贸易汇总仓库/U_TradeClothTotalStkList.dfm | 31 ++++++++++++++++--- T02贸易汇总仓库/U_TradeClothTotalStkList.pas | 7 +++-- T05贸易门市管理/U_TradeMarketList.dfm | 32 ++++++++++---------- T05贸易门市管理/U_TradeMarketList.pas | 10 +++--- 4 files changed, 53 insertions(+), 27 deletions(-) diff --git a/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm b/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm index cdf9dd3..f97ec34 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm @@ -9,8 +9,8 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList FormStyle = fsMDIChild Position = poDefault Visible = True - ExplicitWidth = 1412 - ExplicitHeight = 546 + ExplicitWidth = 1420 + ExplicitHeight = 554 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -116,6 +116,13 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList Height = 21 Caption = #33394#21495 end + object Label1: TLabel + Left = 820 + Top = 18 + Width = 32 + Height = 21 + Caption = #24211#20301 + end object C_name: TcxTextEdit Tag = 2 Left = 64 @@ -152,6 +159,15 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList OnKeyPress = FromCoNameKeyPress Width = 150 end + object StkPosition: TcxTextEdit + Tag = 2 + Left = 856 + Top = 14 + Properties.OnChange = FromCoNamePropertiesChange + TabOrder = 4 + OnKeyPress = FromCoNameKeyPress + Width = 150 + end end inherited cxProgressBar2: TcxProgressBar Left = 461 @@ -167,7 +183,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList Height = 426 Align = alClient TabOrder = 4 - Properties.ActivePage = cxTabSheet1 + Properties.ActivePage = cxTabSheet2 Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change @@ -320,6 +336,13 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList Options.Editing = False Width = 55 end + object TV2Column1: TcxGridDBColumn + Caption = #24211#20301 + DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 157 + end end object cxGridLevel1: TcxGridLevel GridView = TV2 @@ -754,7 +777,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList end object Tv1Column39: TcxGridDBColumn Caption = #24211#20301 - DataBinding.FieldName = 'stkPistion' + DataBinding.FieldName = 'StkPosition' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 55 diff --git a/T02贸易汇总仓库/U_TradeClothTotalStkList.pas b/T02贸易汇总仓库/U_TradeClothTotalStkList.pas index fcdff7a..a5dff72 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalStkList.pas +++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.pas @@ -107,6 +107,9 @@ type CDS_2: TClientDataSet; DS_2: TDataSource; ADO_1: TADOQuery; + Label1: TLabel; + StkPosition: TcxTextEdit; + TV2Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); @@ -198,7 +201,7 @@ var SqlStr: string; begin - SqlStr := ' select A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.StkPiece)),StkQty=sum(StkQty),QtyUnit '; + SqlStr := ' select A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.StkPiece)),StkQty=sum(StkQty),QtyUnit,StkPosition '; SqlStr := SqlStr + ' from BS_Cloth_IO A '; SqlStr := SqlStr + ' where A.IOFlag='''' and (isnull(StkQty,0)>0 or isnull(StkPiece,0)>0) '; SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''; @@ -206,7 +209,7 @@ begin if Trim(canshu4) <> '' then SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + ''''; - SqlStr := SqlStr + ' group by C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit'; + SqlStr := SqlStr + ' group by C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPosition'; // ShowMessage(SqlStr); InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code'); diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm index 4bafec6..3f85a5e 100644 --- a/T05贸易门市管理/U_TradeMarketList.dfm +++ b/T05贸易门市管理/U_TradeMarketList.dfm @@ -21,7 +21,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 83 + ButtonWidth = 99 Caption = 'ToolBar1' Images = DataLink_TradeMarket.cxImageList_bar List = True @@ -36,7 +36,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBRafreshClick end object TBAdd: TToolButton - Left = 63 + Left = 71 Top = 0 AutoSize = True Caption = #26032#22686 @@ -44,7 +44,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBAddClick end object btnCopy: TToolButton - Left = 126 + Left = 142 Top = 0 AutoSize = True Caption = #22797#21046 @@ -52,7 +52,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = btnCopyClick end object TBEdit: TToolButton - Left = 189 + Left = 213 Top = 0 AutoSize = True Caption = #20462#25913 @@ -60,7 +60,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBEditClick end object TBDel: TToolButton - Left = 252 + Left = 284 Top = 0 AutoSize = True Caption = #21024#38500 @@ -68,7 +68,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBDelClick end object TBPrint: TToolButton - Left = 315 + Left = 355 Top = 0 AutoSize = True Caption = #25171#21360 @@ -76,7 +76,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBPrintClick end object TBCK: TToolButton - Left = 378 + Left = 426 Top = 0 AutoSize = True Caption = #26597#30475 @@ -84,7 +84,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBCKClick end object ToolButton4: TToolButton - Left = 441 + Left = 497 Top = 0 AutoSize = True Caption = #38468#20214 @@ -92,7 +92,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = ToolButton4Click end object TBTJ: TToolButton - Left = 504 + Left = 568 Top = 0 AutoSize = True Caption = #25552#20132 @@ -100,7 +100,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBTJClick end object TBTJCX: TToolButton - Left = 567 + Left = 639 Top = 0 AutoSize = True Caption = #25552#20132#25764#38144 @@ -108,7 +108,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBTJCXClick end object Tchk: TToolButton - Left = 654 + Left = 742 Top = 0 AutoSize = True Caption = #23457#26680 @@ -116,7 +116,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TchkClick end object Tnochk: TToolButton - Left = 717 + Left = 813 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680 @@ -124,7 +124,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TnochkClick end object TWC: TToolButton - Left = 804 + Left = 916 Top = 0 AutoSize = True Caption = #23436#25104 @@ -132,7 +132,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TWCClick end object TNowc: TToolButton - Left = 867 + Left = 987 Top = 0 AutoSize = True Caption = #25764#38144#23436#25104 @@ -140,7 +140,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TNowcClick end object ToolButton2: TToolButton - Left = 954 + Left = 1090 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -148,7 +148,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = ToolButton2Click end object TBClose: TToolButton - Left = 1041 + Left = 1193 Top = 0 AutoSize = True Caption = #20851#38381 diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas index cd7bb5e..7074180 100644 --- a/T05贸易门市管理/U_TradeMarketList.pas +++ b/T05贸易门市管理/U_TradeMarketList.pas @@ -270,26 +270,26 @@ begin case cxTabControl1.TabIndex of 0: begin - SqlStr := SqlStr + ' and isnull(status,''0'')=''0'' '; + SqlStr := SqlStr + ' and isnull(A.status,''0'')=''0'' '; end; 1: begin - SqlStr := SqlStr + ' and isnull(status,''0'')=''1'' '; + SqlStr := SqlStr + ' and isnull(A.status,''0'')=''1'' '; end; 2: begin - SqlStr := SqlStr + ' and isnull(status,''0'')=''9'' '; + SqlStr := SqlStr + ' and isnull(A.status,''0'')=''9'' '; end; 3: begin - SqlStr := SqlStr + ' and isnull(status,''0'')=''10'' '; + SqlStr := SqlStr + ' and isnull(A.status,''0'')=''10'' '; end; end; SqlStr := SqlStr + ' and ordtype=''' + FOrdType + ''' '; SqlStr := SqlStr + ' order by filltime desc'; - InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'CoCode'); + InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'TMMId'); end; procedure TfrmTradeMarketList.SendMessageQR(MDateId, KeyWord1, KeyWord2, KeyWord3: string);