Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r30 -r35 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 30) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 35) @@ -2,12 +2,12 @@ 2019/03/01 14:25:16.000.954,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas + 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm 2019/03/01 14:26:05.000.981,E:\svn\Delphi\AAPClient\ProScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj 2019/03/01 14:28:35.000.977,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/01 15:26:22.000.761,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas @@ -20,19 +20,26 @@ 2019/03/05 10:53:16.000.806,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas 2019/03/05 11:54:27.053,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/06 07:41:24.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 08:39:12.150,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 11:22:02.536,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 15:18:54.922,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/07 15:19:13.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/08 10:21:18.208,=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/08 10:26:55.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2019/03/08 10:27:08.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas + 2019/03/08 10:27:08.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm + 2019/03/08 10:27:45.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm + 2019/03/08 10:27:45.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/08 10:28:02.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r34 -r35 Binary files differ Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r34 -r35 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 34) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 35) @@ -98,6 +98,18 @@ if fHuidigScherm.ModalResult = mrYes then begin fHuidigScherm := fHomeScherm; end; + if fHuidigScherm.ModalResult = mrRetry then begin + fHuidigScherm := fPalletScherm; + end; + if fHuidigScherm.ModalResult = mrNo then begin + ShowMessage('Bestaande pallet scherm'); + end; + if fHuidigScherm.ModalResult = mrOk then begin + ShowMessage('DnaCodeLeeg scherm'); + end; + if fHuidigScherm.ModalResult = mrAbort then begin + ShowMessage('DnaCodeGevuld scherm'); + end; continue; Index: AAPClient/UI/PalletScherm.pas =================================================================== diff -u -r32 -r35 --- AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 32) +++ AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 35) @@ -41,34 +41,66 @@ procedure TfmPalletScherm.actVolgendeExecute(Sender: TObject); var Service: DnaCodeServiceSoap; - Request: ValideerPalletCodeRequest; - Response: ValideerPalletCodeResponse; + fValideerPalletCodeRequest: ValideerPalletCodeRequest; + fValideerPalletCodeResponse: ValideerPalletCodeResponse; Header: RequestHeader; + fZoekViaPalletCodeRequest: ZoekViaPalletCodeRequest; + fZoekViaPalletCodeResponse: ZoekViaPalletCodeResponse; begin Service := DnaCodeService.GetDnaCodeServiceSoap(); - // request opbouwen - Request := ValideerPalletCodeRequest.Create; + + // pallet code valideren + fValideerPalletCodeRequest := ValideerPalletCodeRequest.Create; Header := RequestHeader.Create; try Header.Initialen := lblGebruiker.Caption; Header.ComputerNaam := ComputerName(); - Request.Header := Header; - Request.PalletCode := edtPallet.Text; + fValideerPalletCodeRequest.Header := Header; + fValideerPalletCodeRequest.PalletCode := edtPallet.Text; - Response := Service.ValideerPalletCode(Request); + fValideerPalletCodeResponse := Service.ValideerPalletCode(fValideerPalletCodeRequest); try - if Response.Header.Status <> '200' then begin + if fValideerPalletCodeResponse.Header.Status <> '200' then begin Self.ModalResult := mrRetry; - ToonPopupScherm(Response.Header.Omschrijving, 'Scan opnieuw') + ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Scan opnieuw') end else begin Self.ModalResult := mrOk; end; finally - Response.Free; + fValideerPalletCodeResponse.Free; end; finally - Request.Free; + fValideerPalletCodeRequest.Free; end; + + //checken of pallet in gebruik is indien het vorige geslaagd is + if Self.ModalResult = mrOk then begin + fZoekViaPalletCodeRequest := ZoekViaPalletCodeRequest.Create; + Header := RequestHeader.Create; + try + Header.Initialen := lblGebruiker.Caption; + Header.ComputerNaam := ComputerName(); + fZoekViaPalletCodeRequest.Header := Header; + fZoekViaPalletCodeRequest.PalletCode := edtPallet.Text; + + fZoekViaPalletCodeResponse := Service.ZoekViaPalletCode(fZoekViaPalletCodeRequest); + try + if fZoekViaPalletCodeResponse.Header.Status = '200' then begin + Self.ModalResult := mrNo; + ShowMessage('data gevonden'); + end else begin + Self.ModalResult := mrOk; + end; + finally + fZoekViaPalletCodeResponse.Free; + end; + finally + fZoekViaPalletCodeRequest.Free; + end; + + end; + + edtPallet.Text := ''; end; Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r34 -r35 Binary files differ