Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r312 -r315 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 312) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 315) @@ -227,11 +227,18 @@ var Response: DnaCodeAfmeldenResponse; List: TStrings; + Locatie: string; begin UiContext.LaatsteDnaCode := edtDnaCode.Text; lblLaatstGescandData.Caption := edtDnaCode.Text; - Response := TAgent.Create(UiContext).DnaCodeAfmelden(edtDnaCode.Text,UiContext.Toelevering,UiContext.Pallet,1); + if UiContext.Modus = modusKAD then begin + Locatie := UiContext.Pallet; + end else begin + Locatie := '' + end; + + Response := TAgent.Create(UiContext).DnaCodeAfmelden(edtDnaCode.Text,UiContext.Toelevering,UiContext.Pallet,1,Locatie); try List := TStringList.Create; ExtractStrings([':'], [], PChar(Response.Header.Status), List); Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r282 -r315 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 282) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 315) @@ -2,123 +2,126 @@ 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:26:05.000.981,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\AAPClient\ProScan.dproj + 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: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\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\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 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\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 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= - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/05 10:51:12.000.820,=E:\svn\Delphi\AAPClient\WS.pas 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 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.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\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.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\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.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.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 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\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 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 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/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 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:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.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:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas + 2019/03/08 10:27:08.000.419,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\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm + 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas - 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas - 2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm + 2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/08 16:42:04.000.691,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 16:42:12.000.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/12 11:42:34.000.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/03/12 11:42:41.000.845,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/18 09:44:48.000.103,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm + 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas 2019/03/18 11:06:46.000.842,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/18 11:07:10.000.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/19 14:36:29.000.587,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\UiContext.pas + 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/20 14:52:28.000.434,=E:\svn\Delphi\AAPClient\WS.pas 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.pas=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\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm - 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.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/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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/05/02 15:08:14.000.961,=E:\svn\Delphi\AAPClient\WS.pas 2019/05/02 15:08:28.000.270,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/09/03 15:55:43.000.155,=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/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\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\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\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= - 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:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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 + 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/09/09 10:12:07.000.120,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= 2019/09/25 09:00:58.000.441,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/10/01 13:49:36.000.449,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/01 13:49:56.000.314,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/02 13:33:49.000.729,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 13:33:55.000.547,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/02 15:42:02.000.588,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/02 15:42:14.000.814,=E:\svn\Delphi\AAPClient\WS.pas - 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/03 11:18:12.000.484,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/03 15:21:13.000.953,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\WS\Agent.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\WS\Agent.pas 2019/10/07 09:39:36.000.456,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:39:44.000.760,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:43:00.000.939,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:43:11.000.201,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 10:02:08.000.507,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas + 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/10/15 10:29:07.000.266,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/15 10:29:23.000.010,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/21 13:21:40.000.148,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/21 13:21:55.000.323,=E:\svn\Delphi\AAPClient\WS.pas - 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/02/13 14:45:20.000.233,=E:\svn\Delphi\AAPClient\WS.pas 2020/02/13 14:45:36.000.322,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/16 11:37:39.897,=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/16 11:37:49.784,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= + 2020/03/16 11:38:05.598,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas =================================================================== diff -u -r249 -r315 --- AAPClient/UI/DnaCodeReedsGescandScherm.pas (.../DnaCodeReedsGescandScherm.pas) (revision 249) +++ AAPClient/UI/DnaCodeReedsGescandScherm.pas (.../DnaCodeReedsGescandScherm.pas) (revision 315) @@ -116,7 +116,7 @@ var Response: DnaCodeAfmeldenResponse; begin - Response := TAgent.Create(UiContext).DnaCodeAfmelden(UiContext.LaatsteDnaCode,UiContext.Toelevering,UiContext.Pallet,-1); + Response := TAgent.Create(UiContext).DnaCodeAfmelden(UiContext.LaatsteDnaCode,UiContext.Toelevering,UiContext.Pallet,-1,''); try if Response.Header.Status <> '200' then begin ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','') Index: AAPClient/UI/InfoLogScherm.pas =================================================================== diff -u -r256 -r315 --- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 256) +++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 315) @@ -76,7 +76,7 @@ fWaarschuwingModalResult := ToonPopupScherm('Scan ongedaan maken?'+#13#10+sgToeleveringData.Rows[sgToeleveringData.Row][0],'Ja','Nee',14,6,7); if fWaarschuwingModalResult = mrYes then begin - Response := TAgent.Create(UiContext).DnaCodeAfmelden(sgToeleveringData.Rows[sgToeleveringData.Row][2], UiContext.Toelevering, sgToeleveringData.Rows[sgToeleveringData.Row][1], -1); + Response := TAgent.Create(UiContext).DnaCodeAfmelden(sgToeleveringData.Rows[sgToeleveringData.Row][2], UiContext.Toelevering, sgToeleveringData.Rows[sgToeleveringData.Row][1], -1,''); try if Response.Header.Status <> '200' then begin ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','') Index: AAPClient/WS/DnaCodeService.pas =================================================================== diff -u -r257 -r315 --- AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 257) +++ AAPClient/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 315) @@ -5,7 +5,7 @@ // >Import : http://tve-w10:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.CLS?WSDL=1>0 // Encoding : UTF-8 // Version : 1.0 -// (13/02/2020 14:45:19 - - $Rev: 45757 $) +// (16/03/2020 11:37:39 - - $Rev: 45757 $) // ************************************************************************ // unit DnaCodeService; @@ -31,6 +31,7 @@ // indicate incorrect WSDL documents that failed to declare or import a schema type. // ************************************************************************ // // !:boolean - "http://www.w3.org/2001/XMLSchema"[Gbl] + // !:dateTime - "http://www.w3.org/2001/XMLSchema"[Gbl] // !:string - "http://www.w3.org/2001/XMLSchema"[Gbl] // !:long - "http://www.w3.org/2001/XMLSchema"[Gbl] @@ -80,7 +81,6 @@ end; ArrayOfDnaCodeDnaCode = array of DnaCode; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - Horolog = type string; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblSmpl] } // ************************************************************************ // @@ -107,7 +107,7 @@ FLijn_Specified: boolean; FInitialenScanner: string; FInitialenScanner_Specified: boolean; - FScanTijdstip: Horolog; + FScanTijdstip: TXSDateTime; FScanTijdstip_Specified: boolean; FLadeCode: string; FLadeCode_Specified: boolean; @@ -121,6 +121,8 @@ FSequentieNummer_Specified: boolean; FIsWegwerpPallet: Boolean; FIsWegwerpPallet_Specified: boolean; + FBatchId: string; + FBatchId_Specified: boolean; procedure SetAxProductieOrderNummer(Index: Integer; const Astring: string); function AxProductieOrderNummer_Specified(Index: Integer): boolean; procedure SetProductNummer(Index: Integer; const Astring: string); @@ -139,7 +141,7 @@ function Lijn_Specified(Index: Integer): boolean; procedure SetInitialenScanner(Index: Integer; const Astring: string); function InitialenScanner_Specified(Index: Integer): boolean; - procedure SetScanTijdstip(Index: Integer; const AHorolog: Horolog); + procedure SetScanTijdstip(Index: Integer; const ATXSDateTime: TXSDateTime); function ScanTijdstip_Specified(Index: Integer): boolean; procedure SetLadeCode(Index: Integer; const Astring: string); function LadeCode_Specified(Index: Integer): boolean; @@ -153,6 +155,10 @@ function SequentieNummer_Specified(Index: Integer): boolean; procedure SetIsWegwerpPallet(Index: Integer; const ABoolean: Boolean); function IsWegwerpPallet_Specified(Index: Integer): boolean; + procedure SetBatchId(Index: Integer; const Astring: string); + function BatchId_Specified(Index: Integer): boolean; + public + destructor Destroy; override; published property AxProductieOrderNummer: string Index (IS_OPTN) read FAxProductieOrderNummer write SetAxProductieOrderNummer stored AxProductieOrderNummer_Specified; property ProductNummer: string Index (IS_OPTN) read FProductNummer write SetProductNummer stored ProductNummer_Specified; @@ -163,13 +169,14 @@ property Locatie: string Index (IS_OPTN) read FLocatie write SetLocatie stored Locatie_Specified; property Lijn: string Index (IS_OPTN) read FLijn write SetLijn stored Lijn_Specified; property InitialenScanner: string Index (IS_OPTN) read FInitialenScanner write SetInitialenScanner stored InitialenScanner_Specified; - property ScanTijdstip: Horolog Index (IS_OPTN) read FScanTijdstip write SetScanTijdstip stored ScanTijdstip_Specified; + property ScanTijdstip: TXSDateTime Index (IS_OPTN) read FScanTijdstip write SetScanTijdstip stored ScanTijdstip_Specified; property LadeCode: string Index (IS_OPTN) read FLadeCode write SetLadeCode stored LadeCode_Specified; property Status: DnaCodeStatus Index (IS_OPTN) read FStatus write SetStatus stored Status_Specified; property IsDirecteLevering: Boolean Index (IS_OPTN) read FIsDirecteLevering write SetIsDirecteLevering stored IsDirecteLevering_Specified; property ParentDnaCode: string Index (IS_OPTN) read FParentDnaCode write SetParentDnaCode stored ParentDnaCode_Specified; property SequentieNummer: string Index (IS_OPTN) read FSequentieNummer write SetSequentieNummer stored SequentieNummer_Specified; property IsWegwerpPallet: Boolean Index (IS_OPTN) read FIsWegwerpPallet write SetIsWegwerpPallet stored IsWegwerpPallet_Specified; + property BatchId: string Index (IS_OPTN) read FBatchId write SetBatchId stored BatchId_Specified; end; @@ -238,10 +245,14 @@ FToelevering: string; FToelevering_Specified: boolean; FPalletCode: string; + FLocatie: string; + FLocatie_Specified: boolean; procedure SetAantal(Index: Integer; const AInt64: Int64); function Aantal_Specified(Index: Integer): boolean; procedure SetToelevering(Index: Integer; const Astring: string); function Toelevering_Specified(Index: Integer): boolean; + procedure SetLocatie(Index: Integer; const Astring: string); + function Locatie_Specified(Index: Integer): boolean; public destructor Destroy; override; published @@ -250,6 +261,7 @@ property Aantal: Int64 Index (IS_OPTN) read FAantal write SetAantal stored Aantal_Specified; property Toelevering: string Index (IS_OPTN) read FToelevering write SetToelevering stored Toelevering_Specified; property PalletCode: string read FPalletCode write FPalletCode; + property Locatie: string Index (IS_OPTN) read FLocatie write SetLocatie stored Locatie_Specified; end; @@ -681,6 +693,12 @@ end; +destructor DnaCode.Destroy; +begin + SysUtils.FreeAndNil(FScanTijdstip); + inherited Destroy; +end; + procedure DnaCode.SetAxProductieOrderNummer(Index: Integer; const Astring: string); begin FAxProductieOrderNummer := Astring; @@ -780,9 +798,9 @@ Result := FInitialenScanner_Specified; end; -procedure DnaCode.SetScanTijdstip(Index: Integer; const AHorolog: Horolog); +procedure DnaCode.SetScanTijdstip(Index: Integer; const ATXSDateTime: TXSDateTime); begin - FScanTijdstip := AHorolog; + FScanTijdstip := ATXSDateTime; FScanTijdstip_Specified := True; end; @@ -857,6 +875,17 @@ Result := FIsWegwerpPallet_Specified; end; +procedure DnaCode.SetBatchId(Index: Integer; const Astring: string); +begin + FBatchId := Astring; + FBatchId_Specified := True; +end; + +function DnaCode.BatchId_Specified(Index: Integer): boolean; +begin + Result := FBatchId_Specified; +end; + destructor ZoekViaToeleveringRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); @@ -903,6 +932,17 @@ Result := FToelevering_Specified; end; +procedure DnaCodeAfmeldenRequest.SetLocatie(Index: Integer; const Astring: string); +begin + FLocatie := Astring; + FLocatie_Specified := True; +end; + +function DnaCodeAfmeldenRequest.Locatie_Specified(Index: Integer): boolean; +begin + Result := FLocatie_Specified; +end; + destructor GeneriekeResponse.Destroy; begin SysUtils.FreeAndNil(FHeader); @@ -1148,7 +1188,6 @@ RemClassRegistry.RegisterXSClass(DataTransferObject, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DataTransferObject'); RemClassRegistry.RegisterXSInfo(TypeInfo(ArrayOfDnaCodeDnaCode), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ArrayOfDnaCodeDnaCode'); RemClassRegistry.RegisterXSInfo(TypeInfo(DnaCodeStatus), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeStatus'); - RemClassRegistry.RegisterXSInfo(TypeInfo(Horolog), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'Horolog'); RemClassRegistry.RegisterXSClass(DnaCode, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCode'); RemClassRegistry.RegisterXSClass(ZoekViaToeleveringRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaToeleveringRequest'); RemClassRegistry.RegisterXSClass(ZoekViaDnaCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaDnaCodeRequest'); Index: AAPClient/WS/Agent.pas =================================================================== diff -u -r301 -r315 --- AAPClient/WS/Agent.pas (.../Agent.pas) (revision 301) +++ AAPClient/WS/Agent.pas (.../Agent.pas) (revision 315) @@ -21,7 +21,7 @@ function GebruikerAfmelden(): boolean; function ValideerPalletCode(PalletCode: string): ValideerPalletCodeResponse; function ZoekViaPalletCode(PalletCode: string): ZoekViaPalletCodeResponse; - function DnaCodeAfmelden(DnaCode, Toelevering, PalletCode: string; Aantal: integer): DnaCodeAfmeldenResponse; + function DnaCodeAfmelden(DnaCode, Toelevering, PalletCode: string; Aantal: integer; Locatie: string): DnaCodeAfmeldenResponse; function ZoekViaToelevering(Toelevering: string): ZoekViaToeleveringResponse; function HernoemPallet(OudeCode, NieuweCode, EnkelDezeDnaCode: string): HernoemPalletResponse; function IsDirecteLevering(Toelevering: string): DirecteLeveringResponse; @@ -53,7 +53,7 @@ end; function TAgent.DnaCodeAfmelden(DnaCode, Toelevering, PalletCode: string; - Aantal: integer): DnaCodeAfmeldenResponse; + Aantal: integer; Locatie: string): DnaCodeAfmeldenResponse; var Request: DnaCodeAfmeldenRequest; Header: DnaCodeService.RequestHeader; @@ -68,6 +68,7 @@ Request.Toelevering := Toelevering; Request.PalletCode := PalletCode; Request.Aantal := Aantal; + Request.Locatie := Locatie; Result := fDnaCodeServiceSoap.DnaCodeAfmelden(Request);