Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r386 -r392 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 386) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 392) @@ -2,15 +2,15 @@ 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,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\AAPClient\ProScanMain.pas 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm=E:\svn\Delphi\AAPClient\ProScanMain.dfm + 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\AAPClient\ProScanMain.pas 2019/03/01 14:26:05.000.981,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\AAPClient\ProScan.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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm + 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.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\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= @@ -20,23 +20,23 @@ 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\GebruikerService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/05 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PopupScherm.pas + 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm 2019/03/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\Images.pas 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\Images.dfm + 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\Images.pas 2019/03/07 08:39:12.000.150,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm + 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas 2019/03/07 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm 2019/03/07 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 10:26:55.000.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm + 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas @@ -76,13 +76,13 @@ 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 13:14:25.000.076,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 14:42:49.000.071,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/06 07:39:37.000.990,=E:\svn\Delphi\AAPClient\WS.pas 2019/09/06 07:39:48.000.040,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas + 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm 2019/09/06 07:44:11.000.442,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/09/06 07:45:06.000.602,=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas @@ -140,6 +140,9 @@ 2020/06/02 10:32:11.124,=E:\svn\Delphi\AAPClient\WS.pas 2020/06/02 10:34:06.051,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2020/06/02 10:34:24.522,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/06/03 17:24:09.708,=E:\svn\Delphi\AAPClient\WS.pas + 2020/06/03 17:24:20.352,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2020/06/03 17:25:05.147,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r391 -r392 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 391) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 392) @@ -234,11 +234,16 @@ procedure TfmDnaCodeScherm.btnInfoClick(Sender: TObject); begin inherited; - if UiContext.Toelevering = '' then - Self.ModalResult := mrDnaCode - else begin + if UiContext.Modus = modusVHOSS then begin UiContext.InfoLogSchermToonGescand := true; Self.ModalResult := mrInfoLog; + end else begin + if UiContext.Toelevering = '' then + Self.ModalResult := mrDnaCode + else begin + UiContext.InfoLogSchermToonGescand := true; + Self.ModalResult := mrInfoLog; + end; end; PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); @@ -350,12 +355,37 @@ procedure TfmDnaCodeScherm.VhossDataOphalen; var fZoekAlleVhossLadesBijDnaCodeResponse: ZoekAlleVhossLadesBijDnaCodeResponse; + fZoekAlleDnaCodesDieOpVhossMoetenResponse: ZoekAlleDnaCodesDieOpVhossMoetenResponse; fDnaCodeTeller: integer; fAantalGescand: integer; begin if UiContext.LaatsteDnaCode = '' then begin - // + fZoekAlleDnaCodesDieOpVhossMoetenResponse := TAgent.Create(UiContext).ZoekAlleDnaCodesDieOpVhossMoeten(UiContext.Pallet); + try + if fZoekAlleDnaCodesDieOpVhossMoetenResponse.Header.Status <> '200' then begin + ToonPopupScherm(fZoekAlleDnaCodesDieOpVhossMoetenResponse.Header.Omschrijving, 'Probeer opnieuw') + end else begin + fDnaCodeTeller := 0; + fAantalGescand := 0; + while fDnaCodeTeller < length(fZoekAlleDnaCodesDieOpVhossMoetenResponse.DnaCodes) do begin + if not (fZoekAlleDnaCodesDieOpVhossMoetenResponse.DnaCodes[fDnaCodeTeller].ScanTijdstip = nil) then + fAantalGescand := fAantalGescand + 1; + if fZoekAlleDnaCodesDieOpVhossMoetenResponse.DnaCodes[fDnaCodeTeller].DnaCode = UiContext.LaatsteDnaCode then + UiContext.Toelevering := fZoekAlleDnaCodesDieOpVhossMoetenResponse.DnaCodes[fDnaCodeTeller].Toelevering; + + fDnaCodeTeller := fDnaCodeTeller + 1; + end; + + lblAantalGescand.Caption := IntToStr(fAantalGescand); + lblTotaalAantal.Caption := IntToStr(length(fZoekAlleDnaCodesDieOpVhossMoetenResponse.DnaCodes)); + btnInfo.Visible := true; + ZetIcoontjesBovenaan; + Self.ModalResult := mrDnaCode; + end; + finally + fZoekAlleDnaCodesDieOpVhossMoetenResponse.Free; + end; end else begin fZoekAlleVhossLadesBijDnaCodeResponse := TAgent.Create(UiContext).ZoekAlleVhossLadesBijDnaCode(UiContext.LaatsteDnaCode); try