Index: PlanScan/Main.dfm =================================================================== diff -u -r357 -r362 --- PlanScan/Main.dfm (.../Main.dfm) (revision 357) +++ PlanScan/Main.dfm (.../Main.dfm) (revision 362) @@ -3,7 +3,7 @@ Top = 0 Caption = 'PlanScan' ClientHeight = 408 - ClientWidth = 698 + ClientWidth = 1111 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -25,9 +25,6 @@ Align = alLeft BevelOuter = bvNone TabOrder = 0 - ExplicitLeft = 8 - ExplicitTop = 73 - ExplicitHeight = 41 object pnlNaam: TPanel Left = 0 Top = 0 @@ -145,47 +142,42 @@ object pnlFrames: TPanel Left = 185 Top = 0 - Width = 513 + Width = 926 Height = 408 Align = alClient BevelOuter = bvNone TabOrder = 1 - ExplicitLeft = 208 - ExplicitTop = 169 - ExplicitWidth = 185 - ExplicitHeight = 41 + ExplicitWidth = 513 object pcFrames: TPageControl Left = 0 Top = 0 - Width = 513 + Width = 926 Height = 408 - ActivePage = tsGebruikers + ActivePage = tsDnaCodes Align = alClient TabOrder = 0 + ExplicitWidth = 513 object tsDnaCodes: TTabSheet Caption = 'DnaCodes' TabVisible = False - ExplicitTop = 24 - ExplicitWidth = 281 - ExplicitHeight = 165 + ExplicitWidth = 505 inline frmDnaCodes: TfrmDnaCodes Left = 0 Top = 0 - Width = 505 + Width = 918 Height = 398 Align = alClient TabOrder = 0 - ExplicitWidth = 281 - ExplicitHeight = 165 + ExplicitWidth = 505 + ExplicitHeight = 398 inherited dbgDnaCodes: TDBGrid - Width = 378 - Height = 357 + Width = 791 + Height = 325 end inherited pnlActies: TPanel - Left = 378 - Height = 357 - ExplicitLeft = 384 - ExplicitTop = 47 + Left = 791 + Height = 325 + ExplicitLeft = 378 ExplicitHeight = 357 inherited btnMaatwerketiket: TButton Top = 105 @@ -201,36 +193,37 @@ end end inherited pnlZoekKnoppen: TPanel - Width = 505 - ExplicitWidth = 281 + Width = 918 + ExplicitWidth = 505 + inherited btnZoeken: TButton + OnClick = frmDnaCodesbtnZoekenClick + end end end end object tsGebruikers: TTabSheet Caption = 'Gebruikers' ImageIndex = 1 TabVisible = False - ExplicitTop = 24 - ExplicitWidth = 281 - ExplicitHeight = 165 + ExplicitWidth = 505 inline frmGebruikers: TfrmGebruikers Left = 0 Top = 0 - Width = 505 + Width = 918 Height = 398 Align = alClient TabOrder = 0 - ExplicitWidth = 513 - ExplicitHeight = 408 + ExplicitWidth = 505 + ExplicitHeight = 398 inherited dbgGebruikers: TDBGrid - Width = 378 + Width = 791 Height = 398 end inherited Panel1: TPanel - Left = 378 + Left = 791 Height = 398 - ExplicitLeft = 386 - ExplicitHeight = 408 + ExplicitLeft = 378 + ExplicitHeight = 398 end end end Index: PlanScan/Main.pas =================================================================== diff -u -r357 -r362 --- PlanScan/Main.pas (.../Main.pas) (revision 357) +++ PlanScan/Main.pas (.../Main.pas) (revision 362) @@ -32,6 +32,7 @@ procedure lblDnaCodesClick(Sender: TObject); procedure lblGebruikersClick(Sender: TObject); procedure lblWegwerppalletClick(Sender: TObject); + procedure frmDnaCodesbtnZoekenClick(Sender: TObject); private fUiContext: TUiContext; procedure HuidigeGebruikerAfmelden(); @@ -69,6 +70,11 @@ Application.Terminate; end; +procedure TfmMain.frmDnaCodesbtnZoekenClick(Sender: TObject); +begin + frmDnaCodes.btnZoekenClick(Sender); +end; + procedure TfmMain.HuidigeGebruikerAfmelden; begin TAgent.Create(UiContext).GebruikerAfmelden(UiContext.Initialen, UiContext.LoginCode); Index: PlanScan/UI/frameDnaCodes.dfm =================================================================== diff -u -r361 -r362 --- PlanScan/UI/frameDnaCodes.dfm (.../frameDnaCodes.dfm) (revision 361) +++ PlanScan/UI/frameDnaCodes.dfm (.../frameDnaCodes.dfm) (revision 362) @@ -378,47 +378,47 @@ Width = 89 Height = 21 TabOrder = 1 - OnChange = edtDnaCodeChange + OnEnter = edtToeleveringEnter end object edtPallet: TEdit Left = 103 Top = 34 Width = 89 Height = 21 TabOrder = 2 - OnChange = edtDnaCodeChange + OnEnter = edtToeleveringEnter end object edtToelevering: TEdit Left = 198 Top = 34 Width = 89 Height = 21 TabOrder = 3 - OnChange = edtDnaCodeChange + OnEnter = edtToeleveringEnter end object edtKlantNummer: TEdit Left = 293 Top = 34 Width = 89 Height = 21 TabOrder = 4 - OnChange = edtDnaCodeChange + OnEnter = edtToeleveringEnter end object edtOrderNummer: TEdit Left = 388 Top = 34 Width = 89 Height = 21 TabOrder = 5 - OnChange = edtDnaCodeChange + OnEnter = edtToeleveringEnter end object edtLadeCode: TEdit Left = 483 Top = 34 Width = 89 Height = 21 TabOrder = 6 - OnChange = edtDnaCodeChange + OnEnter = edtToeleveringEnter end end object cdsDnaCodes: TClientDataSet Index: PlanScan/UI/frameDnaCodes.pas =================================================================== diff -u -r361 -r362 --- PlanScan/UI/frameDnaCodes.pas (.../frameDnaCodes.pas) (revision 361) +++ PlanScan/UI/frameDnaCodes.pas (.../frameDnaCodes.pas) (revision 362) @@ -32,18 +32,20 @@ edtOrderNummer: TEdit; edtLadeCode: TEdit; lblLadeCode: TLabel; - procedure btnZoekViaDnaCodeClick(Sender: TObject); - procedure btnZoekViaPalletClick(Sender: TObject); + procedure ZoekViaDnaCode(); + procedure ZoekViaPallet(); + procedure ZoekViaToelevering(); procedure btnZoekenClick(Sender: TObject); procedure btnMaatwerketiketClick(Sender: TObject); procedure btnKlantEtiketClick(Sender: TObject); procedure btnProboxetiketClick(Sender: TObject); - procedure edtDnaCodeChange(Sender: TObject); + procedure edtToeleveringEnter(Sender: TObject); private procedure VulDnaCodeGridMetData(DnaCodes: ArrayOfDnaCodeDnaCode); function BepaalGeselecteerdeDnaCodes: TStringList; function GeefAlleDnaCodesUitGrid: TStringList; procedure ZoekveldenLeegmaken(); + procedure DnaCodesZoeken(); public { Public declarations } end; @@ -81,12 +83,12 @@ end; end; -procedure TfrmDnaCodes.btnZoekViaDnaCodeClick(Sender: TObject); +procedure TfrmDnaCodes.ZoekViaDnaCode(); var fZoekViaDnaCodeResponse: ZoekViaDnaCodeResponse; DnaCodes: ArrayOfDnaCodeDnaCode; begin - {fZoekViaDnaCodeResponse := TAgent.Create(fmMain.UiContext).ZoekViaDnaCode(edtZoekInput.Text); + fZoekViaDnaCodeResponse := TAgent.Create(fmMain.UiContext).ZoekViaDnaCode(edtDnaCode.Text); try if fZoekViaDnaCodeResponse.Header.Status = '200' then begin SetLength(DnaCodes,1); @@ -97,8 +99,8 @@ ShowMessage(fZoekViaDnaCodeResponse.Header.Omschrijving); end; finally - fZoekVtiaDnaCodeResponse.Free; - end;} + fZoekViaDnaCodeResponse.Free; + end; end; procedure TfrmDnaCodes.btnKlantEtiketClick(Sender: TObject); @@ -109,37 +111,32 @@ //relevante webmethod oproepen end; -procedure TfrmDnaCodes.btnZoekViaPalletClick(Sender: TObject); +procedure TfrmDnaCodes.ZoekViaPallet(); var fZoekViaPalletResponse: ZoekViaPalletCodeResponse; DnaCodes: ArrayOfDnaCodeDnaCode; begin - {fZoekViaPalletResponse := TAgent.Create(fmMain.UiContext).ZoekViaPalletCode(edtZoekInput.Text); + fZoekViaPalletResponse := TAgent.Create(fmMain.UiContext).ZoekViaPalletCode(edtPallet.Text); try if fZoekViaPalletResponse.Header.Status = '200' then begin DnaCodes := fZoekViaPalletResponse.DnaCodes; VulDnaCodeGridMetData(DnaCodes); - if StartsText('TBP',edtZoekInput.Text) then + if StartsText('TBP',edtPallet.Text) then btnProboxetiket.Visible := true; end else begin ShowMessage(fZoekViaPalletResponse.Header.Omschrijving); end; finally fZoekViaPalletResponse.Free; - end;} + end; end; -procedure TfrmDnaCodes.edtDnaCodeChange(Sender: TObject); -begin - ZoekveldenLeegmaken(); -end; - -procedure TfrmDnaCodes.btnZoekenClick(Sender: TObject); +procedure TfrmDnaCodes.ZoekViaToelevering(); var fZoekViaToeleveringResponse: ZoekViaToeleveringResponse; DnaCodes: ArrayOfDnaCodeDnaCode; begin - {fZoekViaToeleveringResponse := TAgent.Create(fmMain.UiContext).ZoekViaToelevering(edtZoekInput.Text); + fZoekViaToeleveringResponse := TAgent.Create(fmMain.UiContext).ZoekViaToelevering(edtToelevering.Text); try if fZoekViaToeleveringResponse.Header.Status = '200' then begin DnaCodes := fZoekViaToeleveringResponse.DnaCodes; @@ -150,9 +147,37 @@ end; finally fZoekViaToeleveringResponse.Free; - end; } + end; end; +procedure TfrmDnaCodes.DnaCodesZoeken; +begin + { + edtToelevering.Text := ''; + edtPallet.Text := ''; + edtDNACode.Text := ''; + edtKlantNummer.Text := ''; + edtOrderNummer.Text := ''; + edtLadeCode.Text := '';} + if edtToelevering.Text <> '' then ZoekViaToelevering(); + if edtPallet.Text <> '' then ZoekViaPallet(); + if edtDNACode.Text <> '' then ZoekViaDNACode(); + //if edtKlantNummer.Text <> '' then ZoekViaKlantnummer(); + //if edtOrderNummer.Text <> '' then ZoekViaOrderNummer(); + //if edtLadeCode.Text <> '' then ZoekViaLadeCode(); + +end; + +procedure TfrmDnaCodes.edtToeleveringEnter(Sender: TObject); +begin + ZoekveldenLeegmaken(); +end; + +procedure TfrmDnaCodes.btnZoekenClick(Sender: TObject); +begin + DnaCodesZoeken(); +end; + procedure TfrmDnaCodes.VulDnaCodeGridMetData(DnaCodes: ArrayOfDnaCodeDnaCode); var ii: integer; Index: PlanScan/PlanScan.dproj.local =================================================================== diff -u -r360 -r362 --- PlanScan/PlanScan.dproj.local (.../PlanScan.dproj.local) (revision 360) +++ PlanScan/PlanScan.dproj.local (.../PlanScan.dproj.local) (revision 362) @@ -2,9 +2,9 @@ 2020/02/17 10:05:16.000.600,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2020/02/17 10:06:02.000.921,E:\svn\Delphi\PlanScan\Main.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2020/02/17 10:06:02.000.921,E:\svn\Delphi\PlanScan\Main.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm - 2020/02/17 10:06:12.000.996,E:\svn\Delphi\PlanScan\PlanScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj + 2020/02/17 10:06:02.000.921,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm=E:\svn\Delphi\PlanScan\Main.dfm + 2020/02/17 10:06:02.000.921,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\PlanScan\Main.pas + 2020/02/17 10:06:12.000.996,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\PlanScan\PlanScan.dproj 2020/02/17 11:09:31.000.810,=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas 2020/02/17 11:09:31.000.812,=E:\svn\Delphi\PlanScan\WS\GebruikerService.pas 2020/02/17 11:09:31.000.815,=E:\svn\Delphi\PlanScan\WS\__history @@ -15,31 +15,31 @@ 2020/02/17 11:16:33.000.742,=E:\svn\Delphi\PlanScan\UI\Images.pas 2020/02/18 08:16:12.000.093,=E:\svn\Delphi\PlanScan\WS.pas 2020/02/18 08:21:57.000.780,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas= - 2020/02/18 08:22:15.000.174,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas + 2020/02/18 08:22:15.000.174,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas 2020/02/18 08:32:28.000.107,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas= 2020/02/18 08:32:46.000.480,=E:\svn\Delphi\PlanScan\WS.pas - 2020/02/18 08:33:00.000.884,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas + 2020/02/18 08:33:00.000.884,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas 2020/02/18 11:21:59.000.209,=E:\svn\Delphi\PlanScan\WS.pas 2020/02/18 11:22:27.000.481,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas= - 2020/02/18 11:22:42.000.597,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas + 2020/02/18 11:22:42.000.597,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas 2020/03/02 09:30:33.000.825,=E:\svn\Delphi\PlanScan\WS.pas 2020/03/02 09:30:46.000.906,E:\svn\Delphi\PlanScan\WS\GebruikerService.pas= - 2020/03/02 09:31:23.000.040,E:\svn\Delphi\PlanScan\WS\GebruikerService.pas=E:\svn\Delphi\PlanScan\WS.pas + 2020/03/02 09:31:23.000.040,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\GebruikerService.pas 2020/03/04 11:43:31.000.229,=E:\svn\Delphi\PlanScan\Unit1.pas - 2020/03/04 11:49:17.000.078,E:\svn\Delphi\PlanScan\UI\LoginScherm.pas=E:\svn\Delphi\PlanScan\Unit1.pas - 2020/03/04 11:49:17.000.078,E:\svn\Delphi\PlanScan\UI\LoginScherm.dfm=E:\svn\Delphi\PlanScan\Unit1.dfm - 2020/04/20 08:48:05.552,=E:\svn\Delphi\PlanScan\Unit1.pas - 2020/04/20 08:48:21.787,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm=E:\svn\Delphi\PlanScan\Unit1.dfm - 2020/04/20 08:48:21.787,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas=E:\svn\Delphi\PlanScan\Unit1.pas - 2020/04/20 09:19:59.705,E:\svn\Delphi\PlanScan\UI\frameDnaCodes.pas=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas - 2020/04/20 09:19:59.705,E:\svn\Delphi\PlanScan\UI\frameDnaCodes.dfm=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm - 2020/04/20 09:21:17.241,=E:\svn\Delphi\PlanScan\Unit1.pas - 2020/04/20 10:46:18.858,=E:\svn\Delphi\PlanScan\Unit1.pas - 2020/04/20 10:49:21.229,E:\svn\Delphi\PlanScan\UI\frameGebruikers.pas=E:\svn\Delphi\PlanScan\Unit1.pas - 2020/04/20 10:49:21.229,E:\svn\Delphi\PlanScan\UI\frameGebruikers.dfm=E:\svn\Delphi\PlanScan\Unit1.dfm - 2020/04/21 13:47:35.169,=E:\svn\Delphi\PlanScan\WS.pas - 2020/04/21 13:47:43.211,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas= - 2020/04/21 13:47:54.335,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=E:\svn\Delphi\PlanScan\WS.pas + 2020/03/04 11:49:17.000.078,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\LoginScherm.dfm + 2020/03/04 11:49:17.000.078,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\LoginScherm.pas + 2020/04/20 08:48:05.000.552,=E:\svn\Delphi\PlanScan\Unit1.pas + 2020/04/20 08:48:21.000.787,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas + 2020/04/20 08:48:21.000.787,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm + 2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas=E:\svn\Delphi\PlanScan\UI\frameDnaCodes.pas + 2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm=E:\svn\Delphi\PlanScan\UI\frameDnaCodes.dfm + 2020/04/20 09:21:17.000.241,=E:\svn\Delphi\PlanScan\Unit1.pas + 2020/04/20 10:46:18.000.858,=E:\svn\Delphi\PlanScan\Unit1.pas + 2020/04/20 10:49:21.000.229,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\frameGebruikers.pas + 2020/04/20 10:49:21.000.229,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\frameGebruikers.dfm + 2020/04/21 13:47:35.000.169,=E:\svn\Delphi\PlanScan\WS.pas + 2020/04/21 13:47:43.000.211,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas= + 2020/04/21 13:47:54.000.335,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas Index: PlanScan/PlanScan.dproj =================================================================== diff -u -r360 -r362 --- PlanScan/PlanScan.dproj (.../PlanScan.dproj) (revision 360) +++ PlanScan/PlanScan.dproj (.../PlanScan.dproj) (revision 362) @@ -70,7 +70,7 @@ true - server=cacheaccept2010 + server=tve-w10 false