diff --git a/A00通用窗体/U_CompanySel.dfm b/A00通用窗体/U_CompanySel.dfm index 4a8cd57..2866590 100644 --- a/A00通用窗体/U_CompanySel.dfm +++ b/A00通用窗体/U_CompanySel.dfm @@ -9,8 +9,8 @@ inherited frmCompanySel: TfrmCompanySel Font.Name = #24494#36719#38597#40657 Position = poScreenCenter OnClose = FormClose - ExplicitWidth = 1085 - ExplicitHeight = 589 + ExplicitWidth = 1093 + ExplicitHeight = 597 PixelsPerInch = 96 TextHeight = 21 object cxGrid1: TcxGrid [0] @@ -20,7 +20,6 @@ inherited frmCompanySel: TfrmCompanySel Height = 484 Align = alClient TabOrder = 0 - ExplicitTop = 70 object TV1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index 0d394cf..7a2e005 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -526,7 +526,7 @@ object frmClothInfoInput: TfrmClothInfoInput object CostPrice: TcxCurrencyEdit Tag = 2 Left = 119 - Top = 210 + Top = 207 EditValue = 0.000000000000000000 Properties.AssignedValues.DisplayFormat = True Properties.OnEditValueChanged = CostPricePropertiesEditValueChanged @@ -996,6 +996,7 @@ object frmClothInfoInput: TfrmClothInfoInput TabOrder = 1 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + FindPanel.DisplayMode = fpdmAlways ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index 47a3543..14ef42a 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -274,7 +274,7 @@ begin end; if StrToFloatDef(ADOQueryTemp.fieldbyname('AA').asstring, 1) > 1 then raise Exception.Create('ɫɫظ!'); - + ADOQueryCmd.Connection.CommitTrans; //////////////////////// ӱ ////////////////////////// Result := True; except @@ -883,6 +883,19 @@ begin RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', panel2, 2); Post; end; + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select count(*) as AA from BS_Cloth_Info where C_Code=''' + Trim(C_Code.Text) + ''''); + Open; + if FieldByName('AA').AsInteger > 1 then + raise Exception.Create('ظ!'); + + end; +//////////////// ////////////////////// +/// +//////////////// Ӳ ////////////////////// with ADOQueryCmd do begin Close; @@ -890,15 +903,15 @@ begin sql.Add('delete BS_Cloth_Info_Link where ToID=''' + Trim(MaxBCIID) + ''''); ExecSQL; end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from BS_Cloth_Info_Link where 1=2'); + Open; + end; if Trim(C_FromName.Properties.LookupItems.Text) <> '' then begin - with ADOQueryCmd do - begin - Close; - SQL.Clear; - sql.Add('select * from BS_Cloth_Info_Link where 1=2'); - Open; - end; with ADOQueryCmd do begin Append; @@ -912,13 +925,6 @@ begin if Trim(C_FromName2.Properties.LookupItems.Text) <> '' then begin - with ADOQueryCmd do - begin - Close; - SQL.Clear; - sql.Add('select * from BS_Cloth_Info_Link where 1=2'); - Open; - end; with ADOQueryCmd do begin Append; @@ -932,13 +938,6 @@ begin if Trim(C_FromName3.Properties.LookupItems.Text) <> '' then begin - with ADOQueryCmd do - begin - Close; - SQL.Clear; - sql.Add('select * from BS_Cloth_Info_Link where 1=2'); - Open; - end; with ADOQueryCmd do begin Append; @@ -952,13 +951,6 @@ begin if Trim(C_FromName4.Properties.LookupItems.Text) <> '' then begin - with ADOQueryCmd do - begin - Close; - SQL.Clear; - sql.Add('select * from BS_Cloth_Info_Link where 1=2'); - Open; - end; with ADOQueryCmd do begin Append; @@ -972,13 +964,6 @@ begin if Trim(C_FromName5.Properties.LookupItems.Text) <> '' then begin - with ADOQueryCmd do - begin - Close; - SQL.Clear; - sql.Add('select * from BS_Cloth_Info_Link where 1=2'); - Open; - end; with ADOQueryCmd do begin Append; @@ -989,18 +974,9 @@ begin Post; end; end; - - with ADOQueryTemp do - begin - Close; - sql.Clear; - sql.Add('select count(*) as AA from BS_Cloth_Info where C_Code=''' + Trim(C_Code.Text) + ''''); - Open; - if FieldByName('AA').AsInteger > 1 then - raise Exception.Create('ظ!'); - - end; - +//////////////// Ӳ ////////////////////// +/// +//////////////// 湩Ӧ ////////////////////// with CDS_2 do begin First; @@ -1048,7 +1024,21 @@ begin end; end; - ////////////////////////// 浥λϵӱ ////////////////////////// + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add(' update BS_Cloth_Info_Sub set referencePrice= ISNULL(floatPrice, 0) + ISNULL(CostPrice, 0) '); + sql.Add(' from BS_Cloth_Info X '); + sql.Add(' where X.BCIID=BS_Cloth_Info_Sub.BCIID AND BS_Cloth_Info_Sub.BCIID =' + quotedstr(MaxBCIID)); + ExecSQL; + end; + + + +//////////////// 湩Ӧ ////////////////////// +/// +////////////////////////// 浥λϵӱ ////////////////////////// with CDS_3 do begin First; @@ -1095,7 +1085,7 @@ begin Next; end; end; - +////////////////////////// 浥λϵӱ ////////////////////////// ADOQueryCmd.Connection.CommitTrans; // with ADOQueryCmd do @@ -1312,11 +1302,7 @@ begin Application.MessageBox('Ʒ!', 'ʾ', 0); Exit; end; - if Trim(C_FromName2.Text) = '' then - begin - Application.MessageBox('Ʒ!', 'ʾ', 0); - Exit; - end; + setName(); end diff --git a/A02基础产品管理/U_Edit.dfm b/A02基础产品管理/U_Edit.dfm index 9d334e3..c2bc208 100644 --- a/A02基础产品管理/U_Edit.dfm +++ b/A02基础产品管理/U_Edit.dfm @@ -3,7 +3,7 @@ object frmEdit: TfrmEdit Top = 315 Caption = #33394#21495#32500#25252 ClientHeight = 404 - ClientWidth = 625 + ClientWidth = 558 Color = clWhite Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -18,21 +18,24 @@ object frmEdit: TfrmEdit object Panel6: TPanel Left = 0 Top = 30 - Width = 625 + Width = 558 Height = 374 Align = alClient Caption = 'Panel6' TabOrder = 0 + ExplicitWidth = 625 object cxGrid4: TcxGrid Left = 1 Top = 1 - Width = 623 + Width = 556 Height = 372 Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 + ExplicitWidth = 623 object TV4: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + FindPanel.DisplayMode = fpdmAlways ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_4 DataController.Filter.AutoDataSetFilter = True @@ -104,17 +107,18 @@ object frmEdit: TfrmEdit object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 625 + Width = 558 Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 59 + ButtonWidth = 83 Caption = 'ToolBar1' DisabledImages = DataLink_ClothInfo.cxImageList_bar Images = DataLink_ClothInfo.cxImageList_bar List = True ShowCaptions = True TabOrder = 1 + ExplicitWidth = 625 object ToolButton1: TToolButton Tag = 1 Left = 0 @@ -140,63 +144,71 @@ object frmEdit: TfrmEdit ImageIndex = 6 OnClick = ToolButton3Click end - object TBClose: TToolButton - Left = 189 - Top = 0 - AutoSize = True - Caption = #20851#38381 - ImageIndex = 7 - OnClick = TBCloseClick - end object ToolButton4: TToolButton - Left = 252 + Left = 189 Top = 0 AutoSize = True Caption = #23548#20837 ImageIndex = 28 OnClick = ToolButton4Click end + object ToolButton5: TToolButton + Left = 252 + Top = 0 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = ToolButton5Click + end + object TBClose: TToolButton + Left = 339 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end end object ADOQueryMain: TADOQuery Connection = DataLink_ClothInfo.ADOLink LockType = ltReadOnly Parameters = <> - Left = 301 - Top = 165 + Left = 183 + Top = 157 end object ADOQueryTemp: TADOQuery Connection = DataLink_ClothInfo.ADOLink LockType = ltReadOnly Parameters = <> - Left = 205 - Top = 165 + Left = 265 + Top = 157 end object ADOQueryCmd: TADOQuery Connection = DataLink_ClothInfo.ADOLink Parameters = <> - Left = 109 - Top = 165 + Left = 101 + Top = 157 end object DS_4: TDataSource DataSet = CDS_4 - Left = 166 - Top = 251 + Left = 183 + Top = 219 end object CDS_4: TClientDataSet Aggregates = <> Params = <> - Left = 214 - Top = 253 + Left = 429 + Top = 157 end object ADO_4: TADOQuery Connection = DataLink_ClothInfo.ADOLink Parameters = <> - Left = 109 - Top = 261 + Left = 347 + Top = 157 end object PopupMenu1: TPopupMenu - Left = 336 - Top = 254 + Left = 347 + Top = 219 object N1: TMenuItem Caption = #28155#21152 OnClick = N1Click @@ -209,11 +221,11 @@ object frmEdit: TfrmEdit object CDS_LM: TClientDataSet Aggregates = <> Params = <> - Left = 262 - Top = 309 + Left = 101 + Top = 219 end object OpenDialog1: TOpenDialog - Left = 416 - Top = 166 + Left = 265 + Top = 219 end end diff --git a/A02基础产品管理/U_Edit.pas b/A02基础产品管理/U_Edit.pas index 40cabe5..67ef433 100644 --- a/A02基础产品管理/U_Edit.pas +++ b/A02基础产品管理/U_Edit.pas @@ -10,7 +10,7 @@ uses dxDateRanges, dxScrollbarAnnotations, cxDBData, cxTextEdit, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Vcl.ToolWin, Vcl.ComCtrls, Datasnap.DBClient, - Vcl.Menus, ComObj; + Vcl.Menus, ComObj, cxContainer; type TfrmEdit = class(TForm) @@ -41,6 +41,7 @@ type ToolButton4: TToolButton; CDS_LM: TClientDataSet; OpenDialog1: TOpenDialog; + ToolButton5: TToolButton; procedure Button2Click(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -51,6 +52,7 @@ type procedure ToolButton2Click(Sender: TObject); procedure ToolButton3Click(Sender: TObject); procedure ToolButton4Click(Sender: TObject); + procedure ToolButton5Click(Sender: TObject); private { Private declarations } public @@ -78,7 +80,7 @@ procedure TfrmEdit.FormShow(Sender: TObject); var SqlStr: string; begin - + readCxGrid(self.Caption + 'TV4', Tv4, 'Ʒ'); SqlStr := 'select A.* from BS_Cloth_Info_Sub A '; if FBCISID = '' then begin @@ -272,15 +274,17 @@ begin end; +procedure TfrmEdit.ToolButton5Click(Sender: TObject); +begin + WriteCxGrid(self.Caption + 'TV4', Tv4, 'Ʒ'); +end; + function TfrmEdit.SaveData(): Boolean; var maxId4: string; begin try ADOQueryCmd.Connection.BeginTrans; - - - //////////////////////// ӱ ////////////////////////// with CDS_4 do begin @@ -290,11 +294,7 @@ begin if Trim(CDS_4.fieldbyname('BCISID').AsString) = '' then begin if GetLSNo(ADOQueryTemp, maxId4, 'YS', 'BS_Cloth_Info_Sub', 4, 1) = False then - begin - ADOQueryCmd.Connection.RollbackTrans; - Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); - Exit; - end; + raise Exception.Create('ȡˮʧ!'); end else begin @@ -333,26 +333,28 @@ begin Next; end; end; + with ADOQueryTemp do begin Close; sql.Clear; sql.Add('select count(BCISID) as AA from BS_Cloth_Info_Sub where BCIID=''' + Trim(FBCIID) + ''''); sql.Add(' group by C_Color,C_ColorNo having count(BCISID)>1'); -// ShowMessage(sql.Text); Open; - end; if StrToFloatDef(ADOQueryTemp.fieldbyname('AA').asstring, 1) > 1 then + raise Exception.Create('ɫɫظ!'); + + with ADOQueryCmd do begin - ADOQueryCmd.Connection.RollbackTrans; -// Result := False; - Application.MessageBox('ɫɫظ', 'ʾ', 0); - Exit; + Close; + SQL.Clear; + sql.Add(' exec P_BS_CloInfo_ZhuBuTongBu @BCIID=' + QuotedStr(trim(FBCIID))); + ExecSQL; end; + + //////////////////////// ӱ ////////////////////////// - - ADOQueryCmd.Connection.CommitTrans; Result := True; diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm index 029f1c2..65ce1cd 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.dfm +++ b/T05贸易门市管理/U_TradeMarketInPut.dfm @@ -68,7 +68,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut List = True ShowCaptions = True TabOrder = 1 - ExplicitTop = 391 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -94,8 +93,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alClient Caption = 'Panel2' TabOrder = 2 - ExplicitTop = 254 - ExplicitHeight = 398 object Panel3: TPanel Left = 1 Top = 1 @@ -104,7 +101,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alClient Caption = 'Panel2' TabOrder = 0 - ExplicitHeight = 396 object cxGrid1: TcxGrid Left = 1 Top = 1 @@ -112,7 +108,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Height = 399 Align = alClient TabOrder = 0 - ExplicitHeight = 394 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -346,7 +341,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alRight Caption = 'Panel4' TabOrder = 1 - ExplicitHeight = 396 object Panel5: TPanel Left = 1 Top = 1 @@ -384,7 +378,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alClient Caption = #21452#20987#21024#38500#26126#32454#20449#24687 TabOrder = 1 - ExplicitHeight = 353 object cxGrid2: TcxGrid Left = 2 Top = 23 @@ -392,7 +385,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Height = 333 Align = alClient TabOrder = 0 - ExplicitHeight = 328 object TvMX: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -488,15 +480,15 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Caption = #22791' '#27880 end object Label2: TLabel - Left = 721 + Left = 730 Top = 21 Width = 64 Height = 21 Caption = #21333#25454#32534#21495 end object Label14: TLabel - Left = 24 - Top = 65 + Left = 29 + Top = 70 Width = 72 Height = 21 Caption = #23458' '#25143 @@ -527,14 +519,14 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end object Label18: TLabel Left = 730 - Top = 121 + Top = 119 Width = 64 Height = 21 Caption = #21457#36135#22320#22336 end object Label4: TLabel Left = 352 - Top = 66 + Top = 70 Width = 48 Height = 21 Caption = #35746#21333#21495 @@ -618,26 +610,10 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut OnDblClick = OurCoNameDblClick Width = 200 end - object CustName: TcxButtonEdit - Tag = 2 - Left = 122 - Top = 64 - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = True - Properties.OnButtonClick = CustNamePropertiesButtonClick - Style.ButtonStyle = btsDefault - TabOrder = 6 - OnDblClick = OurCoNameDblClick - Width = 200 - end object ShippingAddress: TcxButtonEdit Tag = 2 Left = 814 - Top = 120 + Top = 115 Hint = 'ShippingAddress/'#21457#36135#22320#22336 Properties.Buttons = < item @@ -647,7 +623,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Properties.ReadOnly = True Properties.OnButtonClick = ShippingAddressPropertiesButtonClick Style.ButtonStyle = btsDefault - TabOrder = 7 + TabOrder = 6 OnDblClick = OurCoNameDblClick Width = 200 end @@ -664,7 +640,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Properties.ReadOnly = True Properties.OnButtonClick = ShippingAddressPropertiesButtonClick Style.ButtonStyle = btsDefault - TabOrder = 8 + TabOrder = 7 Visible = False OnDblClick = OurCoNameDblClick Width = 545 @@ -672,76 +648,85 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object BuyOrdNo: TcxTextEdit Tag = 2 Left = 436 - Top = 62 + Top = 66 + TabOrder = 8 + Width = 200 + end + object CustName: TcxMRUEdit + Left = 122 + Top = 66 + Properties.ImmediatePost = True + Properties.ReadOnly = False + Properties.OnButtonClick = StkPositionPropertiesButtonClick TabOrder = 9 Width = 200 end end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_TradeMarket.ADOLink - Left = 265 - Top = 504 + Left = 584 + Top = 188 end inherited ADOQueryBaseTemp: TADOQuery Connection = DataLink_TradeMarket.ADOLink - Left = 353 - Top = 505 + Left = 666 + Top = 188 end inherited ImageList_new32: TImageList - Left = 132 - Top = 426 + Left = 748 + Top = 436 end inherited cxImageList_bar: TcxImageList FormatVersion = 1 - Left = 1480 - Top = 32 - DesignInfo = 2098632 + Left = 830 + Top = 312 + DesignInfo = 20448062 end object ADOTemp: TADOQuery Connection = DataLink_TradeMarket.ADOLink LockType = ltReadOnly Parameters = <> - Left = 504 - Top = 396 + Left = 830 + Top = 188 end object ADOCmd: TADOQuery Connection = DataLink_TradeMarket.ADOLink Parameters = <> - Left = 632 - Top = 389 + Left = 502 + Top = 188 end object DS_1: TDataSource DataSet = CDS_1 - Left = 584 - Top = 512 + Left = 502 + Top = 374 end object CDS_1: TClientDataSet Aggregates = <> Params = <> - Left = 515 - Top = 508 + Left = 584 + Top = 312 end object GPM_1: TcxGridPopupMenu PopupMenus = <> - Left = 436 - Top = 509 + Left = 748 + Top = 312 end object ADOQueryLabel: TADOQuery Connection = DataLink_TradeMarket.ADOLink Parameters = <> - Left = 932 - Top = 421 + Left = 748 + Top = 188 end object ADO_I1: TADOQuery Connection = DataLink_TradeMarket.ADOLink Parameters = <> - Left = 1226 - Top = 189 + Left = 584 + Top = 250 end object DS_I1: TDataSource DataSet = ADO_I1 - Left = 1166 - Top = 157 + Left = 584 + Top = 374 end object IdFTP1: TIdFTP ConnectTimeout = 0 @@ -751,72 +736,72 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut ProxySettings.ProxyType = fpcmNone ProxySettings.Port = 0 ReadTimeout = 0 - Left = 1058 - Top = 238 + Left = 666 + Top = 436 end object ADO_I2: TADOQuery Connection = DataLink_TradeMarket.ADOLink Parameters = <> - Left = 1048 - Top = 75 + Left = 666 + Top = 250 end object DS_I2: TDataSource DataSet = ADO_I2 - Left = 1124 - Top = 71 + Left = 666 + Top = 374 end object DS_MX: TDataSource DataSet = CDS_MX - Left = 1056 - Top = 444 + Left = 748 + Top = 374 end object CDS_MX: TClientDataSet Aggregates = <> Params = <> - Left = 1008 - Top = 412 + Left = 666 + Top = 312 end object ADO_YS: TADOQuery Connection = DataLink_TradeMarket.ADOLink LockType = ltReadOnly Parameters = <> - Left = 775 - Top = 188 + Left = 502 + Top = 312 end object DS_YS: TDataSource DataSet = ADO_YS - Left = 803 - Top = 388 + Left = 584 + Top = 436 end object DS_RCPM: TDataSource DataSet = ADO_RCPM - Left = 760 - Top = 443 + Left = 502 + Top = 436 end object ADO_PM: TADOQuery Connection = DataLink_TradeMarket.ADOLink LockType = ltReadOnly Parameters = <> - Left = 739 - Top = 204 + Left = 748 + Top = 250 end object ADO_RCPM: TADOQuery Connection = DataLink_TradeMarket.ADOLink LockType = ltReadOnly Parameters = <> - Left = 730 - Top = 398 + Left = 830 + Top = 250 end object DS_PM: TDataSource DataSet = ADO_PM - Left = 267 - Top = 390 + Left = 830 + Top = 374 end object ADO_1: TADOQuery Connection = DataLink_TradeMarket.ADOLink LockType = ltReadOnly Parameters = <> - Left = 496 - Top = 452 + Left = 502 + Top = 250 end end diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index d30ee2a..ffe66ed 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -16,7 +16,7 @@ uses U_BaseInput, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI, dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinsDefaultPainters, - cxDBLookupComboBox; + cxDBLookupComboBox, cxMRUEdit; type TfrmTradeMarketInPut = class(TfrmBaseInput) @@ -88,7 +88,6 @@ type OrdNote: TMemo; OrdType: TComboBox; OurCoName: TcxButtonEdit; - CustName: TcxButtonEdit; ShippingAddress: TcxButtonEdit; CONTACT: TcxButtonEdit; ADO_YS: TADOQuery; @@ -101,6 +100,7 @@ type ADO_1: TADOQuery; Label4: TLabel; BuyOrdNo: TcxTextEdit; + CustName: TcxMRUEdit; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -128,11 +128,11 @@ type procedure OurCoNameDblClick(Sender: TObject); procedure OurCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure ShippingAddressPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); - procedure CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Tv1Column7PropertiesEditValueChanged(Sender: TObject); procedure Tv1Column12PropertiesEditValueChanged(Sender: TObject); procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure FormCreate(Sender: TObject); + procedure StkPositionPropertiesButtonClick(Sender: TObject); private FSCXDH: string; procedure InitData(); @@ -299,8 +299,8 @@ end; procedure TfrmTradeMarketInPut.FormCreate(Sender: TObject); begin inherited; - OurCoName.Properties.LookupItems.Text := 'W0001'; - OurCoName.Text := ''; + OurCoName.Properties.LookupItems.Text := 'W0001'; + OurCoName.Text := ''; end; procedure TfrmTradeMarketInPut.FormShow(Sender: TObject); @@ -309,6 +309,53 @@ var begin inherited; + with ADOTemp do + begin + close; + sql.Clear; + sql.Add('select * from KH_ZDY where type=''StkPosition'''); + +// with ADOQueryMain do +// begin +// Close; +// sql.Clear; +// sql.Add('select A.*,B.* '); +// sql.Add(',BankName=(select top 1 BankName from Bs_Company_Bank X where X.CoID=A.CoID ) '); +// sql.Add(',ContactsId=(select top 1 UserID from SY_User X where X.UserName=B.Contacts ) '); +// sql.Add('from BS_Company A '); +// sql.Add('left join BS_Company_contact B ON A.COID=B.COID and B.IsDefault=1 '); +// sql.Add('where 1=1 '); +// if Trim(FCoType) <> '' then +// begin +// sql.Add(' and A.CoType=''' + Trim(FCoType) + ''''); +// end; +// if Trim(FAuthority) = 'ҵ' then +// begin +// sql.Add(' and ( SalesId=' + quotedstr(trim(DCode)) + ' or exists (select * from [dbo].[F_Tool_SplitString](TallyId,'','') X where X.RTValue =' + quotedstr(trim(DCode)) + '))'); +// end; +// +// Open; +// end; + Open; + if isEmpty then + begin + exit; + end; + CustName.Properties.LookupItems.Clear; + while not Eof do + begin + CustName.Properties.LookupItems.Add(Trim(fieldByName('zdyName').AsString)); + Next; + end; + + CustName.ItemIndex := -1; + end; + + + + + + with ADOCmd do begin Close; @@ -555,7 +602,9 @@ begin Edit; FieldByName('SerialNo').Value := IntToStr(i); FieldByName('TMSId').Value := Trim(maxno); - FieldByName('TMSUnit').Value := 'M'; + FieldByName('TMSPiece').Value := 0; + FieldByName('TMSQty').Value := 0; +// FieldByName('TMSUnit').Value := 'M'; Post; end; end; @@ -778,27 +827,6 @@ begin end; -procedure TfrmTradeMarketInPut.CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); -begin - try - frmCompanySel := TfrmCompanySel.Create(Application); - with frmCompanySel do - begin - FCoType := 'ͻ'; - if ShowModal = 1 then - begin - self.CustName.Properties.LookupItems.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); - self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); - self.ShippingAddress.Text := Trim(frmCompanySel.CDS_1.fieldbyname('mxaddress').AsString); - self.CONTACT.Text := Trim(frmCompanySel.CDS_1.fieldbyname('PhoneNumber').AsString); - end; - end; - - finally - frmCompanySel.Free; - end; -end; - procedure TfrmTradeMarketInPut.cxDBImage1DblClick(Sender: TObject); begin if TcxDBImage(Sender).Picture.Height = 0 then @@ -1021,6 +1049,27 @@ begin end; end; +procedure TfrmTradeMarketInPut.StkPositionPropertiesButtonClick(Sender: TObject); +begin + try + frmCompanySel := TfrmCompanySel.Create(Application); + with frmCompanySel do + begin + FCoType := 'ͻ'; + if ShowModal = 1 then + begin + self.CustName.Properties.LookupItems.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); + self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); + self.ShippingAddress.Text := Trim(frmCompanySel.CDS_1.fieldbyname('mxaddress').AsString); + self.CONTACT.Text := Trim(frmCompanySel.CDS_1.fieldbyname('PhoneNumber').AsString); + end; + end; + + finally + frmCompanySel.Free; + end; +end; + procedure TfrmTradeMarketInPut.PackNoteDblClick(Sender: TObject); var fsj: string; diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm index 189b629..4bafec6 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 = 99 + ButtonWidth = 83 Caption = 'ToolBar1' Images = DataLink_TradeMarket.cxImageList_bar List = True @@ -36,7 +36,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBRafreshClick end object TBAdd: TToolButton - Left = 71 + Left = 63 Top = 0 AutoSize = True Caption = #26032#22686 @@ -44,7 +44,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBAddClick end object btnCopy: TToolButton - Left = 142 + Left = 126 Top = 0 AutoSize = True Caption = #22797#21046 @@ -52,7 +52,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = btnCopyClick end object TBEdit: TToolButton - Left = 213 + Left = 189 Top = 0 AutoSize = True Caption = #20462#25913 @@ -60,7 +60,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBEditClick end object TBDel: TToolButton - Left = 284 + Left = 252 Top = 0 AutoSize = True Caption = #21024#38500 @@ -68,7 +68,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBDelClick end object TBPrint: TToolButton - Left = 355 + Left = 315 Top = 0 AutoSize = True Caption = #25171#21360 @@ -76,7 +76,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBPrintClick end object TBCK: TToolButton - Left = 426 + Left = 378 Top = 0 AutoSize = True Caption = #26597#30475 @@ -84,7 +84,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBCKClick end object ToolButton4: TToolButton - Left = 497 + Left = 441 Top = 0 AutoSize = True Caption = #38468#20214 @@ -92,7 +92,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = ToolButton4Click end object TBTJ: TToolButton - Left = 568 + Left = 504 Top = 0 AutoSize = True Caption = #25552#20132 @@ -100,7 +100,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBTJClick end object TBTJCX: TToolButton - Left = 639 + Left = 567 Top = 0 AutoSize = True Caption = #25552#20132#25764#38144 @@ -108,7 +108,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TBTJCXClick end object Tchk: TToolButton - Left = 742 + Left = 654 Top = 0 AutoSize = True Caption = #23457#26680 @@ -116,7 +116,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TchkClick end object Tnochk: TToolButton - Left = 813 + Left = 717 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680 @@ -124,7 +124,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TnochkClick end object TWC: TToolButton - Left = 916 + Left = 804 Top = 0 AutoSize = True Caption = #23436#25104 @@ -132,7 +132,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TWCClick end object TNowc: TToolButton - Left = 987 + Left = 867 Top = 0 AutoSize = True Caption = #25764#38144#23436#25104 @@ -140,7 +140,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = TNowcClick end object ToolButton2: TToolButton - Left = 1090 + Left = 954 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -148,7 +148,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnClick = ToolButton2Click end object TBClose: TToolButton - Left = 1193 + Left = 1041 Top = 0 AutoSize = True Caption = #20851#38381 @@ -165,7 +165,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList BevelInner = bvRaised BevelOuter = bvLowered ParentBackground = False - TabOrder = 6 + TabOrder = 5 object Label3: TLabel Left = 24 Top = 51 @@ -196,8 +196,8 @@ inherited frmTradeMarketList: TfrmTradeMarketList end object TMMNo: TcxTextEdit Tag = 2 - Left = 90 - Top = 45 + Left = 92 + Top = 47 TabOrder = 0 OnKeyPress = TMMNoKeyPress Width = 120 @@ -252,7 +252,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList Left = 0 Top = 152 Width = 1540 - Height = 238 + Height = 442 Align = alClient PopupMenu = PM_1 TabOrder = 3 @@ -260,7 +260,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv1CellDblClick - OnFocusedRecordChanged = Tv1FocusedRecordChanged DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -268,11 +267,9 @@ inherited frmTradeMarketList: TfrmTradeMarketList DataController.Summary.FooterSummaryItems = < item Kind = skSum - Column = Tv1Column11 end item Kind = skSum - Column = Tv1Column10 end> DataController.Summary.SummaryGroups = <> OptionsBehavior.CellHints = True @@ -287,14 +284,14 @@ inherited frmTradeMarketList: TfrmTradeMarketList PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter - Width = 50 + Width = 77 end object Tv1Column7: TcxGridDBColumn Caption = #21333#25454#32534#21495 DataBinding.FieldName = 'TMMNo' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 116 + Width = 77 end object v1OrdDate: TcxGridDBColumn Caption = #21046#21333#26085#26399 @@ -304,7 +301,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList Properties.ShowTime = False HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 118 + Width = 77 end object Tv1Column2: TcxGridDBColumn Caption = #32463#33829#21333#20301 @@ -312,7 +309,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 103 + Width = 77 end object Tv1Column4: TcxGridDBColumn Caption = #23458#25143 @@ -320,7 +317,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 91 + Width = 77 end object v1DeliveryDate: TcxGridDBColumn Caption = #20132#36135#26085#26399 @@ -331,33 +328,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList OnCustomDrawCell = v1DeliveryDateCustomDrawCell HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 174 - end - object Tv1Column11: TcxGridDBColumn - Caption = #21305#25968 - DataBinding.FieldName = 'HZPiQty' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object Tv1Column10: TcxGridDBColumn - Caption = #25968#37327 - DataBinding.FieldName = 'OrdQty' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - HeaderGlyphAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column11: TcxGridDBColumn - Caption = #21333#20301 - DataBinding.FieldName = 'TMSUnit' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - HeaderGlyphAlignmentHorz = taCenter - Options.Editing = False - Width = 66 + Width = 77 end object Tv1Column6: TcxGridDBColumn Caption = #21046#21333#20154 @@ -365,7 +336,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 66 + Width = 77 end object Tv1Column1: TcxGridDBColumn Caption = #22791#27880 @@ -373,36 +344,93 @@ inherited frmTradeMarketList: TfrmTradeMarketList DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 66 + Width = 77 end object Tv1Column3: TcxGridDBColumn Caption = #21457#36135#22320#22336 DataBinding.FieldName = 'ShippingAddress' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 134 + Width = 77 end object Tv1Column5: TcxGridDBColumn Caption = #32852#31995#26041#24335 DataBinding.FieldName = 'CONTACT' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 80 + Options.Editing = False + Width = 77 + end + object Tv1Column8: TcxGridDBColumn + Caption = #20135#21697#32534#21495 + DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 77 + end + object Tv1Column9: TcxGridDBColumn + Caption = #33394#24067#21517#31216 + DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 77 + end + object Tv1Column12: TcxGridDBColumn + Caption = #20013#25991#39068#33394 + DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 77 + end + object Tv1Column13: TcxGridDBColumn + Caption = #21305#25968 + DataBinding.FieldName = 'TMSPiece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 77 + end + object Tv1Column14: TcxGridDBColumn + Caption = #25968#37327 + DataBinding.FieldName = 'TMSQty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 77 + end + object Tv1Column15: TcxGridDBColumn + Caption = #21333#20301 + DataBinding.FieldName = 'TMSUnit' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 77 + end + object Tv1Column16: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'OrdSNote' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 77 + end + object Tv1Column10: TcxGridDBColumn + Caption = #27004#23618 + DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 95 end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 end end - object cxSplitter1: TcxSplitter [3] - Left = 0 - Top = 390 - Width = 1540 - Height = 8 - HotZoneClassName = 'TcxMediaPlayer9Style' - AlignSplitter = salBottom - end - object cxTabControl1: TcxTabControl [4] + object cxTabControl1: TcxTabControl [3] Left = 0 Top = 121 Width = 1540 @@ -423,153 +451,6 @@ inherited frmTradeMarketList: TfrmTradeMarketList ClientRectRight = 1540 ClientRectTop = 28 end - object Panel2: TPanel [5] - Left = 0 - Top = 398 - Width = 1540 - Height = 196 - Align = alBottom - BevelOuter = bvNone - Caption = 'Panel2' - TabOrder = 5 - object cxGrid2: TcxGrid - Left = 0 - Top = 0 - Width = 1540 - Height = 196 - Align = alClient - PopupMenu = PopupMenu2 - TabOrder = 0 - object TV2: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> - DataController.DataSource = DataSource2 - DataController.Filter.AutoDataSetFilter = True - DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] - DataController.Summary.DefaultGroupSummaryItems = < - item - Format = '0' - Position = spFooter - end - item - Format = '0' - Position = spFooter - Column = v1PRTOrderQty - end - item - Format = '0' - Position = spFooter - end> - DataController.Summary.FooterSummaryItems = < - item - Kind = skSum - Column = v1PRTOrderQty - end - item - Kind = skSum - end - item - Kind = skSum - end - item - Kind = skSum - Column = VC_PRTPs - end> - DataController.Summary.SummaryGroups = <> - OptionsBehavior.FocusCellOnTab = True - OptionsBehavior.GoToNextCellOnEnter = True - OptionsBehavior.FocusCellOnCycle = True - OptionsCustomize.ColumnFiltering = False - OptionsData.Deleting = False - OptionsView.Footer = True - OptionsView.GroupByBox = False - object cxGridDBColumn1: TcxGridDBColumn - Tag = 99 - Caption = #36873#25321 - DataBinding.FieldName = 'SSel' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxCheckBoxProperties' - Properties.ImmediatePost = True - Properties.NullStyle = nssUnchecked - Visible = False - HeaderAlignmentHorz = taCenter - Options.Editing = False - Options.Sorting = False - Width = 66 - end - object TV2Column1: TcxGridDBColumn - Caption = #20135#21697#32534#21495 - DataBinding.FieldName = 'C_Code' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 92 - end - object TV2Column2: TcxGridDBColumn - Caption = #33394#24067#21517#31216 - DataBinding.FieldName = 'C_Name' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 106 - end - object v1PRTColor: TcxGridDBColumn - Caption = #20013#25991#39068#33394 - DataBinding.FieldName = 'C_Color' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 103 - end - object VC_PRTPs: TcxGridDBColumn - Caption = #21305#25968 - DataBinding.FieldName = 'TMSPiece' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1PRTOrderQty: TcxGridDBColumn - Caption = #25968#37327 - DataBinding.FieldName = 'TMSQty' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1OrderUnit: TcxGridDBColumn - Caption = #21333#20301 - DataBinding.FieldName = 'TMSUnit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxComboBoxProperties' - Properties.Items.Strings = ( - 'M' - 'Y' - 'Kg') - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object cxGridDBColumn7: TcxGridDBColumn - Caption = #22791#27880 - DataBinding.FieldName = 'OrdSNote' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - end - object cxGridLevel1: TcxGridLevel - GridView = TV2 - end - end - end inherited loadProcess: TPanel Left = 616 Top = 346 @@ -683,11 +564,9 @@ inherited frmTradeMarketList: TfrmTradeMarketList end object N2: TMenuItem Caption = #22797#21046 - OnClick = N2Click end end object cxgrdpmn2: TcxGridPopupMenu - Grid = cxGrid2 PopupMenus = <> Left = 660 Top = 636 diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas index 44a3dd7..cd7bb5e 100644 --- a/T05贸易门市管理/U_TradeMarketList.pas +++ b/T05贸易门市管理/U_TradeMarketList.pas @@ -16,7 +16,7 @@ uses cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math, dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd, dxScrollbarAnnotations, cxProgressBar, FrameDateSel, dxSkinsCore, - dxSkinsDefaultPainters; + dxSkinsDefaultPainters, Vcl.DBCtrls; type TfrmTradeMarketList = class(TfrmBaseList) @@ -43,7 +43,6 @@ type Order_Main: TClientDataSet; TBCK: TToolButton; btnCopy: TToolButton; - cxSplitter1: TcxSplitter; ADOQuerySub: TADOQuery; DataSource2: TDataSource; ToolButton4: TToolButton; @@ -52,11 +51,9 @@ type Tnochk: TToolButton; TWC: TToolButton; TNowc: TToolButton; - Panel2: TPanel; ADOQueryImage: TADOQuery; DSImage: TDataSource; IdFTP1: TIdFTP; - v1Column11: TcxGridDBColumn; TBTJ: TToolButton; TBTJCX: TToolButton; v1Column16: TcxGridDBColumn; @@ -68,18 +65,7 @@ type CustName: TcxTextEdit; Tv1Column6: TcxGridDBColumn; cxgrdpmn2: TcxGridPopupMenu; - cxGrid2: TcxGrid; - TV2: TcxGridDBTableView; - cxGridDBColumn1: TcxGridDBColumn; - v1PRTColor: TcxGridDBColumn; - VC_PRTPs: TcxGridDBColumn; - v1PRTOrderQty: TcxGridDBColumn; - v1OrderUnit: TcxGridDBColumn; - cxGridDBColumn7: TcxGridDBColumn; - cxGridLevel1: TcxGridLevel; Tv1Column2: TcxGridDBColumn; - Tv1Column10: TcxGridDBColumn; - Tv1Column11: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; Label2: TLabel; C_Name: TcxTextEdit; @@ -92,12 +78,18 @@ type N2: TMenuItem; GPM_3: TcxGridPopupMenu; Tv1Column4: TcxGridDBColumn; - TV2Column1: TcxGridDBColumn; - TV2Column2: TcxGridDBColumn; Tv1Column3: TcxGridDBColumn; Tv1Column5: TcxGridDBColumn; frmFrameDateSel1: TfrmFrameDateSel; Tv1Column7: TcxGridDBColumn; + Tv1Column8: TcxGridDBColumn; + Tv1Column9: TcxGridDBColumn; + Tv1Column12: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; + Tv1Column14: TcxGridDBColumn; + Tv1Column15: TcxGridDBColumn; + Tv1Column16: TcxGridDBColumn; + Tv1Column10: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -117,7 +109,6 @@ type procedure TBCKClick(Sender: TObject); procedure btnCopyClick(Sender: TObject); procedure TMMNoKeyPress(Sender: TObject; var Key: Char); - procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean); procedure ToolButton4Click(Sender: TObject); procedure cxTabControl1Change(Sender: TObject); procedure TchkClick(Sender: TObject); @@ -135,13 +126,11 @@ type procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); procedure ToolButton2Click(Sender: TObject); procedure N1Click(Sender: TObject); - procedure N2Click(Sender: TObject); private DQdate: TDateTime; procedure InitGrid(); procedure InitForm(); function DelData(): Boolean; - procedure InitSub(); procedure SetStatus(); procedure InitImage(fwbid: string); procedure SendMessageQR(MDateId, KeyWord1, KeyWord2, KeyWord3: string); @@ -225,19 +214,6 @@ begin end; -procedure TfrmTradeMarketList.InitSub(); -var - SqlStr: string; -begin - - if Order_Main.IsEmpty then - exit; - SqlStr := ' select * from Trade_Market_Sub A'; - SqlStr := SqlStr + ' where TMMId =' + quotedstr((Order_Main.fieldbyname('TMMId').AsString)); - - InitCDSData(ADOQuerySub, ORDER_SUB, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code'); -end; - procedure TfrmTradeMarketList.JGTypeChange(Sender: TObject); begin InitGrid(); @@ -272,72 +248,48 @@ end; procedure TfrmTradeMarketList.InitGrid(); var - STRwhere, Pwhere: string; + SqlStr, FilterStr: string; begin - STRwhere := ''; - Pwhere := SGetFilters(Panel1, 1, 2); + FilterStr := SGetFilters(Panel1, 1, 2); + SqlStr := ' select A.*,B.*,C.StkPosition '; + SqlStr := SqlStr + ' from Trade_Market_Main A '; + SqlStr := SqlStr + ' inner join Trade_Market_Sub B on B.TMMId=A.TMMId '; + SqlStr := SqlStr + ' inner join BS_Cloth_Info C on C.C_Code=B.C_Code '; + + SqlStr := SqlStr + ' where A.TMMDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date))); + SqlStr := SqlStr + ' and A.TMMDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1))); + if canshu2 <> '' then begin - if trim(Pwhere) <> '' then - STRwhere := STRwhere + ' and ' + trim(Pwhere); + SqlStr := SqlStr + ' and C.StkPosition= ' + QuotedStr(Trim(canshu2)); + end; + if canshu1 = '¼' then + begin + SqlStr := SqlStr + ' and A.Filler= ' + QuotedStr(Trim(DName)); end; - case cxTabControl1.TabIndex of 0: begin - STRwhere := STRwhere + ' and isnull(status,''0'')=''0'' '; + SqlStr := SqlStr + ' and isnull(status,''0'')=''0'' '; end; 1: begin - STRwhere := STRwhere + ' and isnull(status,''0'')=''1'' '; + SqlStr := SqlStr + ' and isnull(status,''0'')=''1'' '; end; 2: begin - STRwhere := STRwhere + ' and isnull(status,''0'')=''9'' '; + SqlStr := SqlStr + ' and isnull(status,''0'')=''9'' '; end; 3: begin - STRwhere := STRwhere + ' and isnull(status,''0'')=''10'' '; + SqlStr := SqlStr + ' and isnull(status,''0'')=''10'' '; end; end; + SqlStr := SqlStr + ' and ordtype=''' + FOrdType + ''' '; - try - ADOQueryMain.DisableControls; + SqlStr := SqlStr + ' order by filltime desc'; - with ADOQueryMain do - begin - Filtered := False; - Close; - sql.Clear; - sql.add(' select * '); - sql.Add(' ,HZPiQty=(select sum(TMSPiece) from Trade_Market_Sub X where X.TMMId=A.TMMId)'); - sql.Add(' ,OrdQty=(select sum(TMSQty) from Trade_Market_Sub X where X.TMMId=A.TMMId)'); - sql.Add(' ,OrdUnit=(select top 1 TMSUnit from Trade_Market_Sub X where X.TMMId=A.TMMId)'); - sql.add(' from Trade_Market_Main A '); -// Sql.add(' inner join Trade_Market_Sub B on B.TMMId=A.TMMId '); - - sql.add(' where A.TMMDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)))); - sql.add(' and A.TMMDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)))); - - if canshu1 = '¼' then - begin - sql.add(' and A.Filler= ' + QuotedStr(Trim(DName))); - end; - sql.add(' ' + STRwhere); - sql.Add(' and ordtype=''' + FOrdType + ''' '); - - sql.add(' order by filltime desc'); -// ShowMessage(SQL.Text); - Open; - end; - - SCreateCDS(ADOQueryMain, Order_Main); - SInitCDSData(ADOQueryMain, Order_Main); - finally - ADOQueryMain.EnableControls; - TV1.DataController.Filter.Clear; - - end; + InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'CoCode'); end; procedure TfrmTradeMarketList.SendMessageQR(MDateId, KeyWord1, KeyWord2, KeyWord3: string); @@ -394,7 +346,6 @@ end; procedure TfrmTradeMarketList.InitForm(); begin ReadCxGrid('ָʾбFF1', Tv1, 'ָʾ'); - ReadCxGrid('ָʾбFFTv21', Tv2, 'ָʾ'); frmFrameDateSel1.BegDate.Date := SGetServerDate(ADOQueryTemp) - 180; frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp); @@ -548,7 +499,8 @@ end; procedure TfrmTradeMarketList.FormShow(Sender: TObject); begin inherited; - canshu1 := self.fParameters1; + canshu1 := trim(self.fParameters1); + canshu2 := trim(self.fParameters2); fFlileFlag := UserDataFlag + 'HX'; cxTabControl1.TabIndex := 0; InitForm(); @@ -699,12 +651,6 @@ begin Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); end; -procedure TfrmTradeMarketList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean); -begin - InitSub(); - -end; - procedure TfrmTradeMarketList.ToolButton4Click(Sender: TObject); begin if Order_Main.IsEmpty then @@ -982,11 +928,6 @@ begin Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); end; -procedure TfrmTradeMarketList.N2Click(Sender: TObject); -begin - Clipboard.SetTextBuf(PChar(Trim(ORDER_SUB.fieldbyname(TV2.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); -end; - procedure TfrmTradeMarketList.N3Click(Sender: TObject); begin SelOKNoFiler(Tv1, True); //ȫѡ @@ -1013,14 +954,12 @@ end; procedure TfrmTradeMarketList.ToolButton10Click(Sender: TObject); begin WriteCxGrid('ָʾбFF1', Tv1, 'ָʾ'); - WriteCxGrid('ָʾбFFTv21', Tv2, 'ָʾ6'); application.MessageBox('ɹ', 'ʾϢ', 0); end; procedure TfrmTradeMarketList.ToolButton2Click(Sender: TObject); begin WriteCxGrid('ָʾбFF1', Tv1, 'ָʾ'); - WriteCxGrid('ָʾбFFTv21', Tv2, 'ָʾ'); end; end.