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