Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r321 -r322 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 321) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 322) @@ -2,8 +2,8 @@ 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 @@ -29,8 +29,8 @@ 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas @@ -41,8 +41,8 @@ 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 11:14:25.000.860,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/08 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm @@ -64,8 +64,8 @@ 2019/03/20 14:52:34.000.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/22 12:38:06.000.040,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/04/10 07:45:17.000.841,=E:\svn\Delphi\AAPClient\WS.pas 2019/04/10 07:45:55.000.611,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas @@ -76,8 +76,8 @@ 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas 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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DimmerForm.pas 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm + 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DimmerForm.pas 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= @@ -125,6 +125,9 @@ 2020/03/20 17:13:18.846,=E:\svn\Delphi\AAPClient\WS.pas 2020/03/20 17:13:25.428,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2020/03/20 17:13:40.466,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/23 12:12:38.123,=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/23 12:12:48.665,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2020/03/23 12:13:04.234,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r318 -r322 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 318) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 322) @@ -43,6 +43,7 @@ procedure PalletBijwerken(Status: DnaCodeStatus; IsDirecteLevering: boolean); procedure ZetIcoontjesBovenaan; procedure DrukProboxEtiketAfIndienNodig; + procedure RondKaderdeurDagAf(); public end; @@ -52,7 +53,7 @@ implementation uses - UiContext, Agent, CommonFunctions, ProScanMain; + UiContext, Agent, CommonFunctions, ProScanMain, Datasnap.DBClient, Data.DB; {$R *.dfm} @@ -141,7 +142,10 @@ ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); imgDirecteLevering.Visible := true; end; - ZetToeleveringStatus(DnaCodeStatus.InBuffer, BepaalDirecteLevering); + if UiContext.Modus = modusKAD then + RondKaderdeurDagAf() + else + ZetToeleveringStatus(DnaCodeStatus.InBuffer, BepaalDirecteLevering); if Self.ModalResult = mrPallet then begin ToonPopupScherm('Toelevering succesvol afgerond','OK','',19,-1,-1,clGreen); UiContext.Toelevering := ''; @@ -357,7 +361,35 @@ lblLaatstGescandData.Caption := TCommonFunctions.VerkorteDnaCode(UiContext.LaatsteDnaCode); imgLaatstGescand.Visible := true; end; +end; +procedure TfmDnaCodeScherm.RondKaderdeurDagAf; +var + Response: RondKaderdeurDagAfResponse; + cdsRondKaderdeurDagAf: TClientDataset; + antwoordlijnTeller: integer; +begin + Response := TAgent.Create(UiContext).RondKaderdeurDagAf(UiContext.LaatsteDnaCode); + cdsRondKaderdeurDagAf := TClientDataset.Create(self); + cdsRondKaderdeurDagAf.FieldDefs.Add('Toelevering',ftString); + cdsRondKaderdeurDagAf.FieldDefs.Add('Aantal deuren',ftInteger); + cdsRondKaderdeurDagAf.FieldDefs.Add('Aantal gescand',ftInteger); + try + if Response.Header.Status = '200' then begin + for antwoordlijnTeller := 0 to System.Length(Response.ToeleveringMetAantallen) -1 do begin + cdsRondKaderdeurDagAf.InsertRecord([Response.ToeleveringMetAantallen[antwoordlijnTeller].ToeleveringID, + Response.ToeleveringMetAantallen[antwoordlijnTeller].AantalKaderdeuren, + Response.ToeleveringMetAantallen[antwoordlijnTeller].AantalKaderdeurenGescand]); + + end; + + end else begin + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw'); + end; + Self.ModalResult := mrPallet; + finally + Response.Free; + end; end; procedure TfmDnaCodeScherm.ZetToeleveringStatus(Status: DnaCodeStatus; isDirecteLevering: boolean = false); @@ -375,8 +407,6 @@ finally Response.Free; end; - //PostMessage(Self.Handle,WM_Close,0,0); - //(Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmDnaCodeScherm.DrukProboxEtiketAfIndienNodig;