Index: PlanScan/Main.pas =================================================================== diff -u -r260 -r261 --- PlanScan/Main.pas (.../Main.pas) (revision 260) +++ PlanScan/Main.pas (.../Main.pas) (revision 261) @@ -6,14 +6,15 @@ Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Data.DB, Bde.DBTables, Vcl.Grids, Vcl.DBGrids, Vcl.OleCtrls, CACHEQUERYLib_TLB, TLLib_TLB, Vcl.OleServer, - CacheActiveX_TLB, Vcl.StdCtrls, Datasnap.DBClient, UiContext; + CacheActiveX_TLB, Vcl.StdCtrls, Datasnap.DBClient, UiContext, Vcl.ComCtrls; type - TForm2 = class(TForm) + TfmMain = class(TForm) DataSource1: TDataSource; CacheQuery1: TCacheQuery; - DBGrid1: TDBGrid; ClientDataSet1: TClientDataSet; + tcMain: TTabControl; + DBGrid1: TDBGrid; Button1: TButton; procedure Button1Click(Sender: TObject); private @@ -23,16 +24,16 @@ end; var - Form2: TForm2; + fmMain: TfmMain; implementation uses - DnaCodeService, Agent; + DnaCodeService, Agent, typinfo; {$R *.dfm} -procedure TForm2.Button1Click(Sender: TObject); +procedure TfmMain.Button1Click(Sender: TObject); var fZoekViaToeleveringResponse: ZoekViaToeleveringResponse; DnaCodesStringList: TStringList; @@ -52,11 +53,21 @@ ClientDataSet1.FieldDefs.Add('DnaCode',ftString,10); ClientDataSet1.FieldDefs.Add('Pallet',ftString,10); ClientDataSet1.FieldDefs.Add('Toelevering',ftString,10); + ClientDataSet1.FieldDefs.Add('Status',ftString,10); + ClientDataSet1.FieldDefs.Add('Batch',ftString,10); + ClientDataSet1.FieldDefs.Add('Tijdstip',ftString,10); + ClientDataSet1.FieldDefs.Add('Initialen',ftString,3); ClientDataSet1.CreateDataSet; ii := 0; while ii <= length(DnaCodes)-1 do begin - ClientDataSet1.InsertRecord([DnaCodes[ii].DnaCode, DnaCodes[ii].PalletCode, DnaCodes[ii].Toelevering]); + ClientDataSet1.InsertRecord([ DnaCodes[ii].DnaCode, + DnaCodes[ii].PalletCode, + DnaCodes[ii].Toelevering, + GetEnumName(typeInfo(DnaCodeStatus),Ord(DnaCodes[ii].Status)), + '',//DnaCodes[ii].BatchId, + DnaCodes[ii].ScanTijdstip, + DnaCodes[ii].InitialenScanner]); ii := ii + 1; end; end else begin Index: PlanScan/Main.dfm =================================================================== diff -u -r260 -r261 --- PlanScan/Main.dfm (.../Main.dfm) (revision 260) +++ PlanScan/Main.dfm (.../Main.dfm) (revision 261) @@ -1,7 +1,7 @@ -object Form2: TForm2 +object fmMain: TfmMain Left = 0 Top = 0 - Caption = 'Form2' + Caption = 'PlanScan' ClientHeight = 336 ClientWidth = 635 Color = clBtnFace @@ -22,29 +22,44 @@ 000001004F0300004F0300000000000001010C5175657279204C6F6F6B757000 00000000FFFFFFFF} end - object DBGrid1: TDBGrid - Left = 168 - Top = 128 - Width = 465 - Height = 120 - DataSource = DataSource1 - Options = [dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgRowSelect, dgConfirmDelete, dgCancelOnExit, dgMultiSelect, dgTitleClick, dgTitleHotTrack] + object tcMain: TTabControl + Left = 0 + Top = 0 + Width = 635 + Height = 336 + Align = alClient TabOrder = 1 - TitleFont.Charset = DEFAULT_CHARSET - TitleFont.Color = clWindowText - TitleFont.Height = -11 - TitleFont.Name = 'Tahoma' - TitleFont.Style = [] + Tabs.Strings = ( + 'DnaCodes') + TabIndex = 0 + ExplicitTop = 8 + ExplicitWidth = 609 + ExplicitHeight = 193 + object DBGrid1: TDBGrid + Left = 4 + Top = 24 + Width = 627 + Height = 308 + Align = alClient + DataSource = DataSource1 + Options = [dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgRowSelect, dgConfirmDelete, dgCancelOnExit, dgMultiSelect, dgTitleClick, dgTitleHotTrack] + TabOrder = 0 + TitleFont.Charset = DEFAULT_CHARSET + TitleFont.Color = clWindowText + TitleFont.Height = -11 + TitleFont.Name = 'Tahoma' + TitleFont.Style = [] + end + object Button1: TButton + Left = 3 + Top = 308 + Width = 75 + Height = 25 + Caption = 'Button1' + TabOrder = 1 + OnClick = Button1Click + end end - object Button1: TButton - Left = 56 - Top = 272 - Width = 75 - Height = 25 - Caption = 'Button1' - TabOrder = 2 - OnClick = Button1Click - end object DataSource1: TDataSource DataSet = ClientDataSet1 Left = 248