From 06e3c20cb0a74c07010aad82fa1a2c7e7366942e Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Mon, 4 Aug 2025 11:39:16 +0800 Subject: [PATCH] 1 --- A00通用方法/U_ProgressUpdate.pas | 3 +- A09财务通用管理/U_GetDllForm.pas | 1 + A09财务通用管理/U_ReceivableList.dfm | 1 - T02贸易汇总仓库/U_GetDllForm.pas | 2 +- T02贸易汇总仓库/U_TradeXinYuOutList.dfm | 20 ++++-- T02贸易汇总仓库/U_TradeXinYuOutList.pas | 86 ++++++++++++++++--------- T05贸易门市管理/U_TradeMarketList.dfm | 12 ++-- T05贸易门市管理/U_TradeMarketList.pas | 6 +- 8 files changed, 83 insertions(+), 48 deletions(-) diff --git a/A00通用方法/U_ProgressUpdate.pas b/A00通用方法/U_ProgressUpdate.pas index 88290aa..e0d3d6c 100644 --- a/A00通用方法/U_ProgressUpdate.pas +++ b/A00通用方法/U_ProgressUpdate.pas @@ -33,7 +33,7 @@ begin close; sql.Clear; sql.Add('select distinct TMSId from Trade_Market_sub A '); - sql.Add('where EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(Trim(MTMMID)) + ','','') X where X.RTValue=A.TMSId ) '); + sql.Add('where EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(Trim(MTMMID)) + ','','') X where X.RTValue=A.TMMID ) '); Open; while not Eof do begin @@ -41,6 +41,7 @@ begin MTMSIdS := FieldByName('TMSId').AsString else MTMSIdS := MTMSIdS + ',' + FieldByName('TMSId').AsString; + next; end; end; diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas index 5f2495c..6a492e1 100644 --- a/A09财务通用管理/U_GetDllForm.pas +++ b/A09财务通用管理/U_GetDllForm.pas @@ -83,6 +83,7 @@ begin // Parameters1 := ''; // Parameters1 := '¼'; DCode := '005'; + Parameters4 := ''; DName := 'ADMIN'; end else diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm index a4ad0dd..7056aef 100644 --- a/A09财务通用管理/U_ReceivableList.dfm +++ b/A09财务通用管理/U_ReceivableList.dfm @@ -301,7 +301,6 @@ inherited frmReceivableList: TfrmReceivableList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 185 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/T02贸易汇总仓库/U_GetDllForm.pas b/T02贸易汇总仓库/U_GetDllForm.pas index b128f1e..8fd89f1 100644 --- a/T02贸易汇总仓库/U_GetDllForm.pas +++ b/T02贸易汇总仓库/U_GetDllForm.pas @@ -229,7 +229,7 @@ begin 925: // begin - with TfrmTradeMarketList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeXinYuOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin fFormID := FormID; WindowState := mstate; diff --git a/T02贸易汇总仓库/U_TradeXinYuOutList.dfm b/T02贸易汇总仓库/U_TradeXinYuOutList.dfm index 5f20c3f..9d7dfcf 100644 --- a/T02贸易汇总仓库/U_TradeXinYuOutList.dfm +++ b/T02贸易汇总仓库/U_TradeXinYuOutList.dfm @@ -1,4 +1,4 @@ -inherited frmTradeMarketList: TfrmTradeMarketList +inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList Left = 165 Top = 13 Caption = #22823#36135#21333 @@ -43,16 +43,24 @@ inherited frmTradeMarketList: TfrmTradeMarketList ImageIndex = 0 OnClick = TBFindClick end - object TWC: TToolButton + object ToolButton3: TToolButton Left = 142 Top = 0 AutoSize = True + Caption = #25171#21360 + ImageIndex = 21 + OnClick = ToolButton3Click + end + object TWC: TToolButton + Left = 213 + Top = 0 + AutoSize = True Caption = #23436#25104 ImageIndex = 12 OnClick = TWCClick end object TNowc: TToolButton - Left = 213 + Left = 284 Top = 0 AutoSize = True Caption = #25764#38144#23436#25104 @@ -60,7 +68,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TNowcClick end object ToolButton2: TToolButton - Left = 316 + Left = 387 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -68,7 +76,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = ToolButton2Click end object ToolButton1: TToolButton - Left = 419 + Left = 490 Top = 0 AutoSize = True Caption = #23548#20986 @@ -76,7 +84,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 490 + Left = 561 Top = 0 AutoSize = True Caption = #20851#38381 diff --git a/T02贸易汇总仓库/U_TradeXinYuOutList.pas b/T02贸易汇总仓库/U_TradeXinYuOutList.pas index 81f17cc..bd0de01 100644 --- a/T02贸易汇总仓库/U_TradeXinYuOutList.pas +++ b/T02贸易汇总仓库/U_TradeXinYuOutList.pas @@ -19,7 +19,7 @@ uses dxSkinsDefaultPainters, Vcl.DBCtrls; type - TfrmTradeMarketList = class(TfrmBaseList) + TfrmTradeXinYuOutList = class(TfrmBaseList) ToolBar1: TToolBar; TBRafresh: TToolButton; TBClose: TToolButton; @@ -85,6 +85,7 @@ type xxx1: TMenuItem; Tv1Column14: TcxGridDBColumn; Tv1Column15: TcxGridDBColumn; + ToolButton3: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -112,6 +113,7 @@ type procedure N1Click(Sender: TObject); procedure ToolButton1Click(Sender: TObject); procedure TBFindClick(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); private DQdate: TDateTime; procedure InitGrid(); @@ -130,11 +132,11 @@ type implementation uses - U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint; + U_DataLink, U_RTFun, U_RPFun, U_ZDYHelp, U_LabelPrint; {$R *.dfm} -procedure TfrmTradeMarketList.SetStatus(); +procedure TfrmTradeXinYuOutList.SetStatus(); begin case cxTabControl1.TabIndex of @@ -147,24 +149,24 @@ begin end; -procedure TfrmTradeMarketList.JGTypeChange(Sender: TObject); +procedure TfrmTradeXinYuOutList.JGTypeChange(Sender: TObject); begin InitGrid(); end; -procedure TfrmTradeMarketList.FormDestroy(Sender: TObject); +procedure TfrmTradeXinYuOutList.FormDestroy(Sender: TObject); begin inherited; // frmProductOrderList:=nil; end; -procedure TfrmTradeMarketList.FormClose(Sender: TObject; var Action: TCloseAction); +procedure TfrmTradeXinYuOutList.FormClose(Sender: TObject; var Action: TCloseAction); begin inherited; Action := caFree; end; -procedure TfrmTradeMarketList.FormCreate(Sender: TObject); +procedure TfrmTradeXinYuOutList.FormCreate(Sender: TObject); begin inherited; cxgrid1.Align := alClient; @@ -172,14 +174,14 @@ begin end; -procedure TfrmTradeMarketList.TBCloseClick(Sender: TObject); +procedure TfrmTradeXinYuOutList.TBCloseClick(Sender: TObject); begin Close; end; -procedure TfrmTradeMarketList.InitGrid(); +procedure TfrmTradeXinYuOutList.InitGrid(); var SqlStr, FilterStr: string; begin @@ -204,7 +206,7 @@ begin InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'TMMId'); end; -procedure TfrmTradeMarketList.InitForm(); +procedure TfrmTradeXinYuOutList.InitForm(); begin ReadCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó׻ֿܲ'); frmFrameDateSel1.BegDate.Date := SGetServerDate(ADOQueryTemp) - 180; @@ -214,12 +216,12 @@ begin InitGrid(); end; -procedure TfrmTradeMarketList.TBRafreshClick(Sender: TObject); +procedure TfrmTradeXinYuOutList.TBRafreshClick(Sender: TObject); begin InitGrid(); end; -procedure TfrmTradeMarketList.OrderNoMChange(Sender: TObject); +procedure TfrmTradeXinYuOutList.OrderNoMChange(Sender: TObject); begin if ADOQueryMain.Active = False then Exit; @@ -228,7 +230,7 @@ begin SInitCDSData(ADOQueryMain, Order_Main); end; -procedure TfrmTradeMarketList.FormShow(Sender: TObject); +procedure TfrmTradeXinYuOutList.FormShow(Sender: TObject); begin inherited; canshu1 := trim(self.fParameters1); @@ -239,23 +241,23 @@ begin InitForm(); end; -procedure TfrmTradeMarketList.TBTPClick(Sender: TObject); +procedure TfrmTradeXinYuOutList.TBTPClick(Sender: TObject); var FQty, FQty1, FMxQty, FPQty, FMxQtyS, FPQtyS: string; begin end; -procedure TfrmTradeMarketList.CheckBox1Click(Sender: TObject); +procedure TfrmTradeXinYuOutList.CheckBox1Click(Sender: TObject); begin InitGrid(); end; -procedure TfrmTradeMarketList.CheckBox2Click(Sender: TObject); +procedure TfrmTradeXinYuOutList.CheckBox2Click(Sender: TObject); begin TBRafresh.Click; end; -procedure TfrmTradeMarketList.Tv1StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); +procedure TfrmTradeXinYuOutList.Tv1StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); var id, id10: Integer; begin @@ -283,7 +285,7 @@ begin end; } end; -procedure TfrmTradeMarketList.v1DeliveryDateCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +procedure TfrmTradeXinYuOutList.v1DeliveryDateCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); begin { Id:=TV1.GetColumnByFieldName('DeliveryDate').Index;//;-TV1.GroupedItemCount; Id10:=TV1.GetColumnByFieldName('SubStatus').Index; @@ -318,7 +320,7 @@ begin end; } end; -procedure TfrmTradeMarketList.TMMNoKeyPress(Sender: TObject; var Key: Char); +procedure TfrmTradeXinYuOutList.TMMNoKeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then @@ -327,18 +329,18 @@ begin end; end; -procedure TfrmTradeMarketList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +procedure TfrmTradeXinYuOutList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); begin Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); end; -procedure TfrmTradeMarketList.cxTabControl1Change(Sender: TObject); +procedure TfrmTradeXinYuOutList.cxTabControl1Change(Sender: TObject); begin SetStatus(); InitGrid(); end; -procedure TfrmTradeMarketList.TWCClick(Sender: TObject); +procedure TfrmTradeXinYuOutList.TWCClick(Sender: TObject); begin if Order_Main.IsEmpty then exit; @@ -380,7 +382,7 @@ begin end; end; -procedure TfrmTradeMarketList.TNowcClick(Sender: TObject); +procedure TfrmTradeXinYuOutList.TNowcClick(Sender: TObject); begin if Order_Main.IsEmpty then exit; @@ -421,27 +423,27 @@ begin end; end; -procedure TfrmTradeMarketList.N1Click(Sender: TObject); +procedure TfrmTradeXinYuOutList.N1Click(Sender: TObject); begin Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); end; -procedure TfrmTradeMarketList.N3Click(Sender: TObject); +procedure TfrmTradeXinYuOutList.N3Click(Sender: TObject); begin SelOKNoFiler(Tv1, True); //ȫѡ end; -procedure TfrmTradeMarketList.N4Click(Sender: TObject); +procedure TfrmTradeXinYuOutList.N4Click(Sender: TObject); begin SelOKNoFiler(Tv1, False); //ȫ end; -procedure TfrmTradeMarketList.ComboBox1Change(Sender: TObject); +procedure TfrmTradeXinYuOutList.ComboBox1Change(Sender: TObject); begin InitGrid(); end; -procedure TfrmTradeMarketList.CustomerNoNameKeyPress(Sender: TObject; var Key: Char); +procedure TfrmTradeXinYuOutList.CustomerNoNameKeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then begin @@ -449,23 +451,43 @@ begin end; end; -procedure TfrmTradeMarketList.ToolButton10Click(Sender: TObject); +procedure TfrmTradeXinYuOutList.ToolButton10Click(Sender: TObject); begin application.MessageBox('ɹ', 'ʾϢ', 0); end; -procedure TfrmTradeMarketList.ToolButton1Click(Sender: TObject); +procedure TfrmTradeXinYuOutList.ToolButton1Click(Sender: TObject); begin TcxGridToExcel(Trim(Self.Caption), cxGrid1); end; -procedure TfrmTradeMarketList.ToolButton2Click(Sender: TObject); +procedure TfrmTradeXinYuOutList.ToolButton2Click(Sender: TObject); begin WriteCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó׻ֿܲ'); end; -procedure TfrmTradeMarketList.TBFindClick(Sender: TObject); +procedure TfrmTradeXinYuOutList.ToolButton3Click(Sender: TObject); +var + MFiltration: string; + MPrintJson: string; +begin + + if Order_Main.IsEmpty then + Exit; + + MFiltration := Trim(Order_Main.FieldByName('TMMNo').AsString); + MPrintJson := ' {"LMType": "TradeXinYuOut1" '; + MPrintJson := MPrintJson + ' ,"PreviewPrint": true '; + MPrintJson := MPrintJson + ' ,"PrtArgs": [ { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; + MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; + MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; + MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, '; + MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" } ] } '; + FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson)); +end; + +procedure TfrmTradeXinYuOutList.TBFindClick(Sender: TObject); begin CDSDataFilter(ADOQueryMain, Order_Main, Tv1, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, ' {"EquTag": 1,"LikeTag": 2,"Fields": ""}') + '" }'); diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm index 7bfbfde..708e9d9 100644 --- a/T05贸易门市管理/U_TradeMarketList.dfm +++ b/T05贸易门市管理/U_TradeMarketList.dfm @@ -504,15 +504,15 @@ inherited frmTradeMarketList: TfrmTradeMarketList ClientRectTop = 28 end inherited loadProcess: TPanel - Left = 616 - Top = 346 - ExplicitLeft = 616 - ExplicitTop = 346 + Left = 720 + Top = 354 + ExplicitLeft = 720 + ExplicitTop = 354 end inherited cxProgressBar2: TcxProgressBar - Left = 616 + Left = 720 Top = 296 - ExplicitLeft = 616 + ExplicitLeft = 720 ExplicitTop = 296 ExplicitHeight = 29 end diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas index 2aae07f..4c9dee7 100644 --- a/T05贸易门市管理/U_TradeMarketList.pas +++ b/T05贸易门市管理/U_TradeMarketList.pas @@ -445,11 +445,15 @@ procedure TfrmTradeMarketList.TBPrintClick(Sender: TObject); begin if Order_Main.IsEmpty then Exit; + try frmLabelPrint := TfrmLabelPrint.Create(Application); with frmLabelPrint do begin - FLMType := 'TradePlanPrint'; + if canshu4 = '' then + FLMType := 'TradePlanPrintxy' + else + FLMType := 'TradePlanPrint'; FFiltration1 := Trim(Order_Main.fieldbyname('TMMId').AsString); if ShowModal = 1 then begin