Index: ProScan/UI/PalletScherm.pas =================================================================== diff -u -r668 -r669 --- ProScan/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 668) +++ ProScan/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 669) @@ -24,8 +24,6 @@ procedure SetContext; procedure SetModus(GescandeInput: string); function ValideerPalletCode(GescandeInput: string): boolean; - function GeefLpnCode(): string; - function MoetNieuweLpnCodeAangemaaktWorden(): boolean; public { Public declarations } end; @@ -36,7 +34,7 @@ implementation uses - DnaCodeService, UiContext, Agent, ProScanMain, StrUtils, CommonFunctions; + DnaCodeService, QRcodeNaarKenmerkenService, UiContext, Agent, ProScanMain, StrUtils, CommonFunctions; {$R *.dfm} @@ -62,7 +60,6 @@ //checken of pallet in gebruik is indien het vorige geslaagd is if fPalletGevalideerd and not(UiContext.Modus = modusKAD) and not(UiContext.Modus = modusVHOSS ) then begin - UiContext.LpnCode := GeefLpnCode(); fAgent := TAgent.Create(UiContext); fZoekViaPalletCodeResponse := fAgent.ZoekViaPalletCode(edtPallet.Text); fAgent.Free; @@ -80,9 +77,9 @@ fZoekViaToeleveringResponse := fAgent.ZoekViaToelevering(UiContext.Toelevering); if fZoekViaToeleveringResponse.AantalInToelevering = fZoekViaToeleveringResponse.AantalReedsGescand then UiContext.Toelevering := ''; + fZoekViaToeleveringResponse.Free; finally fAgent.Free; - fZoekViaToeleveringResponse.Free; end; Self.ModalResult := mrDnaCode; end; @@ -114,97 +111,35 @@ begin // pallet code valideren result := false; - fAgent := TAgent.Create(UiContext); - fValideerPalletCodeResponse := fAgent.ValideerPalletCode(edtPallet.Text); - fAgent.Free; - try - if fValideerPalletCodeResponse.Header.Status <> '200' then begin - Self.ModalResult := mrPallet; - ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Probeer opnieuw'); - edtPallet.Text := ''; - SetContext; - end else begin - result := true; - end; - finally - fValideerPalletCodeResponse.Free; - end; -end; -function TfmPalletScherm.GeefLpnCode(): string; -var - fGeefVolgendeLpnCodeResponse: GeefVolgendeLpnCodeResponse; - fAgent: TAgent; -begin - try - if (Self.MoetNieuweLpnCodeAangemaaktWorden()) then begin - fAgent := TAgent.Create(UiContext); - fGeefVolgendeLpnCodeResponse := fAgent.GeefVolgendeLpnCode(); - fAgent.Free; - result := fGeefVolgendeLpnCodeResponse.VolgendeLpnCode; - fGeefVolgendeLpnCodeResponse.Free; - end else begin - result := UiContext.LpnCode; - end; - finally - end; -end; - - -function TfmPalletScherm.MoetNieuweLpnCodeAangemaaktWorden(): boolean; -var - fZoekViaLpnCodeResponse: ZoekViaLpnCodeResponse; - fUniekePalletCodes: THashedStringList; - fDnaCode: DnaCode; - fAgent: TAgent; -begin - fAgent := TAgent.Create(UiContext); - fZoekViaLpnCodeResponse := fAgent.ZoekViaLpnCode(UiContext.LpnCode); - result := false; - try - if (fZoekViaLpnCodeResponse.Header.Status <> '200') then begin - result := true; - end else begin - fUniekePalletCodes := THashedStringList.Create; - fUniekePalletCodes.Duplicates := dupIgnore; - - for fDnaCode in fZoekViaLpnCodeResponse.DnaCodes do - fUniekePalletCodes.Add(fDnaCode.PalletCode); - - if (fUniekePalletCodes.Count > 1) then + if (UiContext.MoetTbpCodeGenereren) then begin + result := true; + end else begin + fAgent := TAgent.Create(UiContext); + fValideerPalletCodeResponse := fAgent.ValideerPalletCode(edtPallet.Text); + fAgent.Free; + try + if fValideerPalletCodeResponse.Header.Status <> '200' then begin + Self.ModalResult := mrPallet; + ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Probeer opnieuw'); + edtPallet.Text := ''; + SetContext; + end else begin result := true; - - fUniekePalletCodes.Free; + end; + finally + fValideerPalletCodeResponse.Free; end; - finally - fZoekViaLpnCodeResponse.Free; end; - fAgent.Free; end; procedure TfmPalletScherm.btnGenereerTbpClick(Sender: TObject); -var - fGeefVolgendeTbpCodeResponse: GeefVolgendeTbpCodeResponse; - fAgent: TAgent; begin inherited; - fAgent := TAgent.Create(UiContext); - fGeefVolgendeTbpCodeResponse := fAgent.GeefVolgendeTbpCode(); - fAgent.Free; - try - if fGeefVolgendeTbpCodeResponse.Header.Status <> '200' then begin - Self.ModalResult := mrPallet; - ToonPopupScherm(fGeefVolgendeTbpCodeResponse.Header.Omschrijving, 'Probeer opnieuw'); - edtPallet.Text := ''; - end else begin - edtPallet.Text := fGeefVolgendeTbpCodeResponse.VolgendeTbpCode; - UiContext.Toelevering := ''; - end; - SetContext; - finally - fGeefVolgendeTbpCodeResponse.Free; - end; + edtPallet.Text := ''; + UiContext.Toelevering := ''; + UiContext.MoetTbpCodeGenereren := true; actVolgendeExecute(Self); end; Index: ProScan/ProScan.dproj.local =================================================================== diff -u -r650 -r669 --- ProScan/ProScan.dproj.local (.../ProScan.dproj.local) (revision 650) +++ ProScan/ProScan.dproj.local (.../ProScan.dproj.local) (revision 669) @@ -2,180 +2,195 @@ 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.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: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\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\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 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 + 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/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\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/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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas 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.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.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\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 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\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\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 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\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\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 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 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\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\DnaCodeService.pas=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\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 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.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 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\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm + 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas 2019/03/08 13:41:42.000.692,=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 - 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\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm + 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas - 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\UI\InfoLogScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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.pas=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/19 14:36:29.000.587,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=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/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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas + 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.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 + 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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.pas=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/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\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/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\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\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\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: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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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\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/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/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.pas=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/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.pas=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 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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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\Unit1.pas=E:\svn\Delphi\AAPClient\WS\Agent.pas + 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\WS\Agent.pas=E:\svn\Delphi\AAPClient\Unit1.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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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: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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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 10:02:08.000.507,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas=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/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.pas=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/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.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/03/16 11:37:39.000.897,=E:\svn\Delphi\AAPClient\WS.pas 2020/03/16 11:37:49.000.784,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/03/16 11:38:05.000.598,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/16 11:38:05.000.598,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/03/20 17:13:18.000.846,=E:\svn\Delphi\AAPClient\WS.pas 2020/03/20 17:13:25.000.428,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/03/20 17:13:40.000.466,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/20 17:13:40.000.466,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/03/23 12:12:38.000.123,=E:\svn\Delphi\AAPClient\WS.pas 2020/03/23 12:12:48.000.665,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/03/23 12:13:04.000.234,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/03/23 12:13:04.000.234,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/04/03 10:30:15.000.465,=E:\svn\Delphi\AAPClient\WS.pas 2020/04/03 10:30:37.000.131,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/04/03 10:31:50.000.819,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2020/04/03 10:31:50.000.819,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2020/04/21 13:48:23.000.846,=E:\svn\Delphi\AAPClient\WS.pas 2020/04/21 13:48:39.000.235,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/04/21 13:48:57.000.462,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/04/21 13:48:57.000.462,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/05/29 11:41:39.000.278,=E:\svn\Delphi\AAPClient\WS.pas 2020/05/29 11:42:20.000.248,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/05/29 11:42:47.000.154,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2020/05/29 11:42:47.000.154,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2020/06/02 10:32:11.000.124,=E:\svn\Delphi\AAPClient\WS.pas 2020/06/02 10:34:06.000.051,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/06/02 10:34:24.000.522,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2020/06/02 10:34:24.000.522,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2020/06/03 17:24:09.000.708,=E:\svn\Delphi\AAPClient\WS.pas 2020/06/03 17:24:20.000.352,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/06/03 17:25:05.000.147,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2020/06/03 17:25:05.000.147,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2020/06/11 13:42:02.000.458,=E:\svn\Delphi\ProScan\Unit1.pas - 2020/06/11 13:42:37.000.605,E:\svn\Delphi\ProScan\BL\BlPallet.pas=E:\svn\Delphi\ProScan\Unit1.pas + 2020/06/11 13:42:37.000.605,E:\svn\Delphi\ProScan\Unit1.pas=E:\svn\Delphi\ProScan\BL\BlPallet.pas 2020/06/30 08:56:11.000.401,=E:\svn\Delphi\ProScan\WS.pas 2020/06/30 08:57:06.000.002,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas= - 2020/06/30 08:57:20.000.899,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas=E:\svn\Delphi\ProScan\WS.pas + 2020/06/30 08:57:20.000.899,E:\svn\Delphi\ProScan\WS.pas=E:\svn\Delphi\ProScan\WS\DnaCodeService.pas 2020/07/03 13:18:22.000.586,=E:\svn\Delphi\ProScan\Unit1.pas - 2020/07/03 13:25:23.000.372,E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.pas=E:\svn\Delphi\ProScan\Unit1.pas - 2020/07/03 13:25:23.000.372,E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.dfm=E:\svn\Delphi\ProScan\Unit1.dfm + 2020/07/03 13:25:23.000.372,E:\svn\Delphi\ProScan\Unit1.dfm=E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.dfm + 2020/07/03 13:25:23.000.372,E:\svn\Delphi\ProScan\Unit1.pas=E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.pas 2020/07/03 13:28:16.000.574,E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.pas= 2020/07/03 13:28:35.000.965,=E:\svn\Delphi\ProScan\Unit1.pas - 2020/07/03 13:28:49.000.735,E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.dfm=E:\svn\Delphi\ProScan\Unit1.dfm - 2020/07/03 13:28:49.000.735,E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.pas=E:\svn\Delphi\ProScan\Unit1.pas + 2020/07/03 13:28:49.000.735,E:\svn\Delphi\ProScan\Unit1.dfm=E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.dfm + 2020/07/03 13:28:49.000.735,E:\svn\Delphi\ProScan\Unit1.pas=E:\svn\Delphi\ProScan\UI\OnvolledigeToeleveringScherm.pas 2020/07/10 14:00:01.000.992,=E:\svn\Delphi\ProScan\WS.pas 2020/07/10 14:00:10.000.387,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas= - 2020/07/10 14:00:36.000.160,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas=E:\svn\Delphi\ProScan\WS.pas + 2020/07/10 14:00:36.000.160,E:\svn\Delphi\ProScan\WS.pas=E:\svn\Delphi\ProScan\WS\DnaCodeService.pas 2020/07/29 10:26:50.000.339,=E:\svn\Delphi\ProScan\WS.pas - 2020/07/29 10:27:08.000.714,E:\svn\Delphi\ProScan\WS\AfdrukService.pas=E:\svn\Delphi\ProScan\WS.pas + 2020/07/29 10:27:08.000.714,E:\svn\Delphi\ProScan\WS.pas=E:\svn\Delphi\ProScan\WS\AfdrukService.pas 2020/07/29 10:32:57.000.627,=E:\svn\Delphi\ProScan\WS.pas 2020/07/29 10:33:03.000.336,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas= - 2020/07/29 10:33:17.000.085,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas=E:\svn\Delphi\ProScan\WS.pas + 2020/07/29 10:33:17.000.085,E:\svn\Delphi\ProScan\WS.pas=E:\svn\Delphi\ProScan\WS\DnaCodeService.pas 2020/07/30 14:52:25.000.855,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas= 2020/07/30 14:52:37.000.470,=E:\svn\Delphi\ProScan\WS.pas - 2020/07/30 14:52:50.000.983,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas=E:\svn\Delphi\ProScan\WS.pas + 2020/07/30 14:52:50.000.983,E:\svn\Delphi\ProScan\WS.pas=E:\svn\Delphi\ProScan\WS\DnaCodeService.pas 2020/10/19 08:33:37.000.990,=E:\svn\Delphi\ProScan\WS.pas 2020/10/19 08:34:12.000.717,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas= - 2020/10/19 08:34:25.000.363,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas=E:\svn\Delphi\ProScan\WS.pas + 2020/10/19 08:34:25.000.363,E:\svn\Delphi\ProScan\WS.pas=E:\svn\Delphi\ProScan\WS\DnaCodeService.pas 2020/11/18 08:49:28.000.766,=E:\svn\Delphi\ProScan\WS.pas 2020/11/18 08:49:52.000.117,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas= - 2020/11/18 08:50:02.000.996,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas=E:\svn\Delphi\ProScan\WS.pas + 2020/11/18 08:50:02.000.996,E:\svn\Delphi\ProScan\WS.pas=E:\svn\Delphi\ProScan\WS\DnaCodeService.pas 2021/01/22 11:58:29.000.860,=E:\svn\Delphi\ProScan\WS.pas 2021/09/21 16:36:46.000.236,=E:\svn\Delphi\ProScan\WS.pas 2021/09/21 16:37:05.000.529,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas= - 2021/09/21 16:37:34.000.667,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas=E:\svn\Delphi\ProScan\WS.pas + 2021/09/21 16:37:34.000.667,E:\svn\Delphi\ProScan\WS.pas=E:\svn\Delphi\ProScan\WS\DnaCodeService.pas + 2023/11/09 09:44:26.000.274,=E:\svn\Proscan\WS.pas + 2023/11/09 09:44:31.000.061,E:\svn\Proscan\WS\DnaCodeService.pas= + 2023/11/09 09:44:38.000.199,E:\svn\Proscan\WS.pas=E:\svn\Proscan\WS\DnaCodeService.pas + 2023/11/09 10:13:12.000.449,E:\svn\Proscan\WS\DnaCodeService.pas= + 2023/11/09 10:13:19.000.683,=E:\svn\Proscan\WS.pas + 2023/11/09 10:13:26.000.185,E:\svn\Proscan\WS.pas=E:\svn\Proscan\WS\DnaCodeService.pas + 2023/11/09 10:32:56.000.080,E:\svn\Proscan\WS\DnaCodeService.pas= + 2023/11/09 10:33:01.000.827,=E:\svn\Proscan\WS.pas + 2023/11/09 10:33:09.000.105,E:\svn\Proscan\WS.pas=E:\svn\Proscan\WS\DnaCodeService.pas + 2023/12/05 13:54:31.000.169,=E:\svn\Proscan\WS.pas + 2023/12/05 13:54:51.000.000,E:\svn\Proscan\WS\DnaCodeService.pas= + 2023/12/05 13:55:05.000.347,E:\svn\Proscan\WS\DnaCodeService.pas=E:\svn\Proscan\WS.pas + 2023/12/13 13:17:52.000.896,=E:\svn\Proscan\WS.pas + 2023/12/13 13:18:14.000.899,E:\svn\Proscan\WS\QRcodeNaarKenmerkenService.pas=E:\svn\Proscan\WS.pas + 2024/03/28 08:44:13.941,E:\svn\Proscan\ProScan.dproj=E:\svn\Proscan\ProScan.dproj @@ -210,8 +225,9 @@ - + + Index: ProScan/ProScan.res =================================================================== diff -u -r652 -r669 Binary files differ Index: ProScan/UI/DnaCodeScherm.pas =================================================================== diff -u -r665 -r669 --- ProScan/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 665) +++ ProScan/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 669) @@ -53,6 +53,8 @@ procedure ZetAfrondActieStatus(actief: boolean); function GeefJuisteToelevering(fDnaCodeAfmeldenResponse: DnaCodeAfmeldenResponse; fDnaCode: string): string; function GeefAantalOpPallet(Palletcode: String): integer; + procedure GenereerTbpCode(DnaCode: DnaCode); + procedure ZetPalletContext(PalletCode: string); public end; @@ -337,6 +339,8 @@ procedure TfmDnaCodeScherm.MeldDnaCodeAf; var + fZoekViaDnaCodeResponse: ZoekViaDnaCodeResponse; + fDnaCode: DnaCode; Response: DnaCodeAfmeldenResponse; List: TStrings; Locatie: string; @@ -345,6 +349,20 @@ if edtDnaCode.Text = '' then exit; + if UiContext.MoetTbpCodeGenereren then begin + fAgent := TAgent.Create(UiContext); + fZoekViaDnaCodeResponse := fAgent.ZoekViaDnaCode(edtDnaCode.Text); + fAgent.Free; + + if fZoekViaDnaCodeResponse.Header.Status <> '200' then begin + ToonPopupScherm(fZoekViaDnaCodeResponse.Header.Omschrijving, 'Probeer opnieuw') + end else begin + fDnaCode := fZoekViaDnaCodeResponse.DnaCodes; + GenereerTbpCode(fDnaCode); + UiContext.MoetTbpCodeGenereren := false; + end; + end; + UiContext.LaatsteDnaCode := edtDnaCode.Text; lblLaatstGescandData.Caption := edtDnaCode.Text; @@ -355,7 +373,7 @@ end; fAgent := TAgent.Create(UiContext); - Response := fAgent.DnaCodeAfmelden(edtDnaCode.Text,UiContext.Toelevering,UiContext.Pallet,UiContext.LpnCode,1,Locatie); + Response := fAgent.DnaCodeAfmelden(edtDnaCode.Text,UiContext.Toelevering,UiContext.Pallet,1,Locatie); fAgent.Free; try List := TStringList.Create; @@ -390,6 +408,31 @@ (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; +procedure TfmDnaCodeScherm.GenereerTbpCode(DnaCode: DnaCode); +var + fGeefVolgendeTbpCodeResponse: GeefVolgendeTbpCodeResponse; + fTbpCode: string; + fAgent: TAgent; +begin + inherited; + fAgent := TAgent.Create(UiContext); + fGeefVolgendeTbpCodeResponse := fAgent.GeefVolgendeTbpCode(DnaCode.Toelevering, DnaCode.ProductNummer); + fAgent.Free; + try + if fGeefVolgendeTbpCodeResponse.Header.Status <> '200' then begin + Self.ModalResult := mrPallet; + ToonPopupScherm(fGeefVolgendeTbpCodeResponse.Header.Omschrijving, 'Probeer opnieuw'); + fTbpCode := ''; + end else begin + fTbpCode := fGeefVolgendeTbpCodeResponse.VolgendeTbpCode; + UiContext.Toelevering := ''; + end; + ZetPalletContext(fTbpCode); + finally + fGeefVolgendeTbpCodeResponse.Free; + end; +end; + function TfmDnaCodeScherm.GeefJuisteToelevering(fDnaCodeAfmeldenResponse: DnaCodeAfmeldenResponse; fDnaCode: string): string; var fDnaCodeTeller: integer; @@ -829,4 +872,14 @@ Result := fAantal; end; +procedure TfmDnaCodeScherm.ZetPalletContext(PalletCode: string); +begin + if TCommonFunctions.IsKaderdeurLocatie(PalletCode) then + UiContext.Pallet := PalletCode + else + UiContext.Pallet := UpperCase(PalletCode); + + lblHuidigePalletData.Caption := UiContext.Pallet; +end; + end. Index: ProScan/WS/DnaCodeService.pas =================================================================== diff -u -r663 -r669 --- ProScan/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 663) +++ ProScan/WS/DnaCodeService.pas (.../DnaCodeService.pas) (revision 669) @@ -1,11 +1,11 @@ // ************************************************************************ // // The types declared in this file were generated from data read from the // WSDL File described below: -// WSDL : http://jlm-ws020:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.CLS?WSDL=1 -// >Import : http://jlm-ws020:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.CLS?WSDL=1>0 +// WSDL : http://jlm-ws020:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.cls?WSDL=1 +// >Import : http://jlm-ws020:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.cls?WSDL=1>0 // Encoding : UTF-8 // Version : 1.0 -// (9/11/2023 10:33:01 - - $Rev: 45757 $) +// (20/02/2024 14:17:58 - - $Rev: 45757 $) // ************************************************************************ // unit DnaCodeService; @@ -31,69 +31,66 @@ // indicate incorrect WSDL documents that failed to declare or import a schema type. // ************************************************************************ // // !:dateTime - "http://www.w3.org/2001/XMLSchema"[Gbl] + // !:long - "http://www.w3.org/2001/XMLSchema"[Gbl] // !:boolean - "http://www.w3.org/2001/XMLSchema"[Gbl] // !:string - "http://www.w3.org/2001/XMLSchema"[Gbl] - // !:long - "http://www.w3.org/2001/XMLSchema"[Gbl] ZoekViaStatusRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - GeefVolgendeLpnCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - GeefVolgendeTbpCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } BewerkKlantinstellingenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } RequestHeader = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } HernoemPalletRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + GeefVolgendeTbpCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DirecteLeveringRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaToeleveringRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaOrdernummerRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaPalletCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ResponseHeader = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DnaCodeAfmeldenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DataTransferObject = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } Klantinstellingen = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } GeneriekeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaToeleveringResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - DnaCodeAfmeldenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - BewerkKlantinstellingenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaOrdernummerResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaLpnCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ZoekViaLadecodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaPalletCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ZoekViaToeleveringResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaStatusResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - GeefVolgendeLpnCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + DnaCodeAfmeldenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } HernoemPalletResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DirecteLeveringResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } GeefVolgendeTbpCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + BewerkKlantinstellingenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } DnaCode = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ResponseHeader = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } PalletBijwerkenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ZoekAlleVhossLadesBijDnaCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekAlleVhossLadesBijDnaCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaBatchRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaBatchResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ValideerPalletCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekAlleDnaCodesDieOpVhossMoetenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekAlleDnaCodesDieOpVhossMoetenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekAlleVhossLadesBijDnaCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaDnaCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaLadecodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaLadecodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaLpnCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ZoekViaDnaCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaKlantnummerRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ZoekViaKlantnummerResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ZoekViaLadecodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ZoekViaBatchResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ZoekViaDnaCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ZoekViaDnaCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ToeleveringMetAantallen = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } RondAfVhossBatchRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } PalletBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } RondAfKaderdeurDagRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } RondAfKaderdeurDagResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } + ToeleveringBijwerkenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ToeleveringBijwerkenResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } ValideerPalletCodeRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ValideerPalletCodeResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } VhossKastenMetAantallen = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } RondAfVhossBatchResponse = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - ToeleveringBijwerkenRequest = class; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } {$SCOPEDENUMS ON} { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblSmpl] } DnaCodeStatus = (Nieuw, Gescand, Ongedaan, OnHold, InBuffer, InBatch); {$SCOPEDENUMS OFF} + ArrayOfDnaCodeDnaCode = array of DnaCode; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } // ************************************************************************ // @@ -114,37 +111,6 @@ // ************************************************************************ // - // XML : GeefVolgendeLpnCodeRequest, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - GeefVolgendeLpnCodeRequest = class(TRemotable) - private - FHeader: RequestHeader; - public - destructor Destroy; override; - published - property Header: RequestHeader read FHeader write FHeader; - end; - - ArrayOfDnaCodeDnaCode = array of DnaCode; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } - - - // ************************************************************************ // - // XML : GeefVolgendeTbpCodeRequest, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - GeefVolgendeTbpCodeRequest = class(TRemotable) - private - FHeader: RequestHeader; - public - destructor Destroy; override; - published - property Header: RequestHeader read FHeader write FHeader; - end; - - - - // ************************************************************************ // // XML : BewerkKlantinstellingenRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -160,9 +126,7 @@ FMeerdereToeleveringen: Boolean; public destructor Destroy; override; - // OPGEPAST: deze properties moeten public zijn ipv published, ookal zijn ze automatisch gegenereerd - // zoniet dan zal bij afmelden van een al afgemelde DnaCode en dan 'wegnemen van pallet' een access violation optreden - // De reden hiervan is ongekend, maar heeft iets te maken met RTTI en verschillen in Delphi versies + published property Header: RequestHeader read FHeader write FHeader; property Actie: string read FActie write FActie; property KlantId: string read FKlantId write FKlantId; @@ -221,6 +185,31 @@ // ************************************************************************ // + // XML : GeefVolgendeTbpCodeRequest, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + GeefVolgendeTbpCodeRequest = class(TRemotable) + private + FHeader: RequestHeader; + FToeleveringId: string; + FToeleveringId_Specified: boolean; + FProductNummer: string; + FProductNummer_Specified: boolean; + procedure SetToeleveringId(Index: Integer; const Astring: string); + function ToeleveringId_Specified(Index: Integer): boolean; + procedure SetProductNummer(Index: Integer; const Astring: string); + function ProductNummer_Specified(Index: Integer): boolean; + public + destructor Destroy; override; + published + property Header: RequestHeader read FHeader write FHeader; + property ToeleveringId: string Index (IS_OPTN) read FToeleveringId write SetToeleveringId stored ToeleveringId_Specified; + property ProductNummer: string Index (IS_OPTN) read FProductNummer write SetProductNummer stored ProductNummer_Specified; + end; + + + + // ************************************************************************ // // XML : DirecteLeveringRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -286,6 +275,21 @@ property PalletCode: string read FPalletCode write FPalletCode; end; + + + // ************************************************************************ // + // XML : ResponseHeader, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + ResponseHeader = class(TRemotable) + private + FStatus: String_; + FOmschrijving: String_; + published + property Status: String_ read FStatus write FStatus; + property Omschrijving: String_ read FOmschrijving write FOmschrijving; + end; + ArrayOfKlantinstellingenKlantinstellingen = array of Klantinstellingen; { "http://www.vanhoecke.be/Halux/AAP/DnaCode"[GblCplx] } @@ -378,7 +382,7 @@ function HalvePallet_Specified(Index: Integer): boolean; procedure SetMeerdereToeleveringen(Index: Integer; const ABoolean: Boolean); function MeerdereToeleveringen_Specified(Index: Integer): boolean; - public // Dit moet ook public zijn ipv published + published property KlantId: string Index (IS_OPTN) read FKlantId write SetKlantId stored KlantId_Specified; property Klantnaam: string Index (IS_OPTN) read FKlantnaam write SetKlantnaam stored Klantnaam_Specified; property IsExport: Boolean Index (IS_OPTN) read FIsExport write SetIsExport stored IsExport_Specified; @@ -406,112 +410,46 @@ // ************************************************************************ // - // XML : ZoekViaToeleveringResponse, global, + // XML : ZoekViaOrdernummerResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaToeleveringResponse = class(GeneriekeResponse) + ZoekViaOrdernummerResponse = class(GeneriekeResponse) private - FAantalInToelevering: Int64; - FAantalInToelevering_Specified: boolean; - FAantalReedsGescand: Int64; - FAantalReedsGescand_Specified: boolean; FDnaCodes: ArrayOfDnaCodeDnaCode; FDnaCodes_Specified: boolean; - procedure SetAantalInToelevering(Index: Integer; const AInt64: Int64); - function AantalInToelevering_Specified(Index: Integer): boolean; - procedure SetAantalReedsGescand(Index: Integer; const AInt64: Int64); - function AantalReedsGescand_Specified(Index: Integer): boolean; procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); function DnaCodes_Specified(Index: Integer): boolean; public destructor Destroy; override; published - property AantalInToelevering: Int64 Index (IS_OPTN) read FAantalInToelevering write SetAantalInToelevering stored AantalInToelevering_Specified; - property AantalReedsGescand: Int64 Index (IS_OPTN) read FAantalReedsGescand write SetAantalReedsGescand stored AantalReedsGescand_Specified; - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; + property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; // ************************************************************************ // - // XML : DnaCodeAfmeldenResponse, global, + // XML : ZoekViaLadecodeResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - DnaCodeAfmeldenResponse = class(GeneriekeResponse) + ZoekViaLadecodeResponse = class(GeneriekeResponse) private - FAantalInToelevering: Int64; - FAantalInToelevering_Specified: boolean; - FAantalReedsGescand: Int64; - FAantalReedsGescand_Specified: boolean; FDnaCodes: ArrayOfDnaCodeDnaCode; FDnaCodes_Specified: boolean; - FBatchId: string; - FBatchId_Specified: boolean; - FIsSST: Boolean; - FIsSST_Specified: boolean; - procedure SetAantalInToelevering(Index: Integer; const AInt64: Int64); - function AantalInToelevering_Specified(Index: Integer): boolean; - procedure SetAantalReedsGescand(Index: Integer; const AInt64: Int64); - function AantalReedsGescand_Specified(Index: Integer): boolean; procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); function DnaCodes_Specified(Index: Integer): boolean; - procedure SetBatchId(Index: Integer; const Astring: string); - function BatchId_Specified(Index: Integer): boolean; - procedure SetIsSST(Index: Integer; const ABoolean: Boolean); - function IsSST_Specified(Index: Integer): boolean; public destructor Destroy; override; published - property AantalInToelevering: Int64 Index (IS_OPTN) read FAantalInToelevering write SetAantalInToelevering stored AantalInToelevering_Specified; - property AantalReedsGescand: Int64 Index (IS_OPTN) read FAantalReedsGescand write SetAantalReedsGescand stored AantalReedsGescand_Specified; - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; - property BatchId: string Index (IS_OPTN) read FBatchId write SetBatchId stored BatchId_Specified; - property IsSST: Boolean Index (IS_OPTN) read FIsSST write SetIsSST stored IsSST_Specified; - end; - - - - // ************************************************************************ // - // XML : BewerkKlantinstellingenResponse, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - BewerkKlantinstellingenResponse = class(GeneriekeResponse) - private - FKlantinstellingen: ArrayOfKlantinstellingenKlantinstellingen; - FKlantinstellingen_Specified: boolean; - procedure SetKlantinstellingen(Index: Integer; const AArrayOfKlantinstellingenKlantinstellingen: ArrayOfKlantinstellingenKlantinstellingen); - function Klantinstellingen_Specified(Index: Integer): boolean; - public - destructor Destroy; override; - published - property Klantinstellingen: ArrayOfKlantinstellingenKlantinstellingen Index (IS_OPTN or IS_UNBD or IS_NLBL) read FKlantinstellingen write SetKlantinstellingen stored Klantinstellingen_Specified; - end; - - - - // ************************************************************************ // - // XML : ZoekViaOrdernummerResponse, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - ZoekViaOrdernummerResponse = class(GeneriekeResponse) - private - FDnaCodes: ArrayOfDnaCodeDnaCode; - FDnaCodes_Specified: boolean; - procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); - function DnaCodes_Specified(Index: Integer): boolean; - public - destructor Destroy; override; - published property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; // ************************************************************************ // - // XML : ZoekViaLpnCodeResponse, global, + // XML : ZoekViaPalletCodeResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaLpnCodeResponse = class(GeneriekeResponse) + ZoekViaPalletCodeResponse = class(GeneriekeResponse) private FDnaCodes: ArrayOfDnaCodeDnaCode; FDnaCodes_Specified: boolean; @@ -531,24 +469,29 @@ // ************************************************************************ // - // XML : ZoekViaPalletCodeResponse, global, + // XML : ZoekViaToeleveringResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaPalletCodeResponse = class(GeneriekeResponse) + ZoekViaToeleveringResponse = class(GeneriekeResponse) private + FAantalInToelevering: Int64; + FAantalInToelevering_Specified: boolean; + FAantalReedsGescand: Int64; + FAantalReedsGescand_Specified: boolean; FDnaCodes: ArrayOfDnaCodeDnaCode; FDnaCodes_Specified: boolean; - FMeerdereToeleveringenToegestaan: Boolean; - FMeerdereToeleveringenToegestaan_Specified: boolean; + procedure SetAantalInToelevering(Index: Integer; const AInt64: Int64); + function AantalInToelevering_Specified(Index: Integer): boolean; + procedure SetAantalReedsGescand(Index: Integer; const AInt64: Int64); + function AantalReedsGescand_Specified(Index: Integer): boolean; procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); function DnaCodes_Specified(Index: Integer): boolean; - procedure SetMeerdereToeleveringenToegestaan(Index: Integer; const ABoolean: Boolean); - function MeerdereToeleveringenToegestaan_Specified(Index: Integer): boolean; public destructor Destroy; override; published - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; - property MeerdereToeleveringenToegestaan: Boolean Index (IS_OPTN) read FMeerdereToeleveringenToegestaan write SetMeerdereToeleveringenToegestaan stored MeerdereToeleveringenToegestaan_Specified; + property AantalInToelevering: Int64 Index (IS_OPTN) read FAantalInToelevering write SetAantalInToelevering stored AantalInToelevering_Specified; + property AantalReedsGescand: Int64 Index (IS_OPTN) read FAantalReedsGescand write SetAantalReedsGescand stored AantalReedsGescand_Specified; + property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; @@ -572,14 +515,39 @@ // ************************************************************************ // - // XML : GeefVolgendeLpnCodeResponse, global, + // XML : DnaCodeAfmeldenResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - GeefVolgendeLpnCodeResponse = class(GeneriekeResponse) + DnaCodeAfmeldenResponse = class(GeneriekeResponse) private - FVolgendeLpnCode: string; + FAantalInToelevering: Int64; + FAantalInToelevering_Specified: boolean; + FAantalReedsGescand: Int64; + FAantalReedsGescand_Specified: boolean; + FDnaCodes: ArrayOfDnaCodeDnaCode; + FDnaCodes_Specified: boolean; + FBatchId: string; + FBatchId_Specified: boolean; + FIsSST: Boolean; + FIsSST_Specified: boolean; + procedure SetAantalInToelevering(Index: Integer; const AInt64: Int64); + function AantalInToelevering_Specified(Index: Integer): boolean; + procedure SetAantalReedsGescand(Index: Integer; const AInt64: Int64); + function AantalReedsGescand_Specified(Index: Integer): boolean; + procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); + function DnaCodes_Specified(Index: Integer): boolean; + procedure SetBatchId(Index: Integer; const Astring: string); + function BatchId_Specified(Index: Integer): boolean; + procedure SetIsSST(Index: Integer; const ABoolean: Boolean); + function IsSST_Specified(Index: Integer): boolean; + public + destructor Destroy; override; published - property VolgendeLpnCode: string read FVolgendeLpnCode write FVolgendeLpnCode; + property AantalInToelevering: Int64 Index (IS_OPTN) read FAantalInToelevering write SetAantalInToelevering stored AantalInToelevering_Specified; + property AantalReedsGescand: Int64 Index (IS_OPTN) read FAantalReedsGescand write SetAantalReedsGescand stored AantalReedsGescand_Specified; + property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; + property BatchId: string Index (IS_OPTN) read FBatchId write SetBatchId stored BatchId_Specified; + property IsSST: Boolean Index (IS_OPTN) read FIsSST write SetIsSST stored IsSST_Specified; end; @@ -629,6 +597,24 @@ // ************************************************************************ // + // XML : BewerkKlantinstellingenResponse, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + BewerkKlantinstellingenResponse = class(GeneriekeResponse) + private + FKlantinstellingen: ArrayOfKlantinstellingenKlantinstellingen; + FKlantinstellingen_Specified: boolean; + procedure SetKlantinstellingen(Index: Integer; const AArrayOfKlantinstellingenKlantinstellingen: ArrayOfKlantinstellingenKlantinstellingen); + function Klantinstellingen_Specified(Index: Integer): boolean; + public + destructor Destroy; override; + published + property Klantinstellingen: ArrayOfKlantinstellingenKlantinstellingen Index (IS_OPTN or IS_UNBD or IS_NLBL) read FKlantinstellingen write SetKlantinstellingen stored Klantinstellingen_Specified; + end; + + + + // ************************************************************************ // // XML : DnaCode, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -737,21 +723,6 @@ // ************************************************************************ // - // XML : ResponseHeader, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - ResponseHeader = class(TRemotable) - private - FStatus: String_; - FOmschrijving: String_; - published - property Status: String_ read FStatus write FStatus; - property Omschrijving: String_ read FOmschrijving write FOmschrijving; - end; - - - - // ************************************************************************ // // XML : PalletBijwerkenRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -773,6 +744,28 @@ // ************************************************************************ // + // XML : ZoekAlleVhossLadesBijDnaCodeRequest, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + ZoekAlleVhossLadesBijDnaCodeRequest = class(TRemotable) + private + FHeader: RequestHeader; + FDnaCode: string; + FGuiVhossVolgnummer: string; + FGuiVhossVolgnummer_Specified: boolean; + procedure SetGuiVhossVolgnummer(Index: Integer; const Astring: string); + function GuiVhossVolgnummer_Specified(Index: Integer): boolean; + public + destructor Destroy; override; + published + property Header: RequestHeader read FHeader write FHeader; + property DnaCode: string read FDnaCode write FDnaCode; + property GuiVhossVolgnummer: string Index (IS_OPTN) read FGuiVhossVolgnummer write SetGuiVhossVolgnummer stored GuiVhossVolgnummer_Specified; + end; + + + + // ************************************************************************ // // XML : ZoekAlleVhossLadesBijDnaCodeResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -808,19 +801,12 @@ // ************************************************************************ // - // XML : ZoekViaBatchResponse, global, + // XML : ValideerPalletCodeResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaBatchResponse = class(GeneriekeResponse) + ValideerPalletCodeResponse = class(GeneriekeResponse) private - FDnaCodes: ArrayOfDnaCodeDnaCode; - FDnaCodes_Specified: boolean; - procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); - function DnaCodes_Specified(Index: Integer): boolean; - public - destructor Destroy; override; published - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; @@ -861,40 +847,36 @@ // ************************************************************************ // - // XML : ZoekAlleVhossLadesBijDnaCodeRequest, global, + // XML : ZoekViaKlantnummerRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekAlleVhossLadesBijDnaCodeRequest = class(TRemotable) + ZoekViaKlantnummerRequest = class(TRemotable) private FHeader: RequestHeader; - FDnaCode: string; - FGuiVhossVolgnummer: string; - FGuiVhossVolgnummer_Specified: boolean; - procedure SetGuiVhossVolgnummer(Index: Integer; const Astring: string); - function GuiVhossVolgnummer_Specified(Index: Integer): boolean; + FKlantnummer: string; public destructor Destroy; override; published - property Header: RequestHeader read FHeader write FHeader; - property DnaCode: string read FDnaCode write FDnaCode; - property GuiVhossVolgnummer: string Index (IS_OPTN) read FGuiVhossVolgnummer write SetGuiVhossVolgnummer stored GuiVhossVolgnummer_Specified; + property Header: RequestHeader read FHeader write FHeader; + property Klantnummer: string read FKlantnummer write FKlantnummer; end; // ************************************************************************ // - // XML : ZoekViaDnaCodeRequest, global, + // XML : ZoekViaKlantnummerResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaDnaCodeRequest = class(TRemotable) + ZoekViaKlantnummerResponse = class(GeneriekeResponse) private - FHeader: RequestHeader; - FDnaCode: string; + FDnaCodes: ArrayOfDnaCodeDnaCode; + FDnaCodes_Specified: boolean; + procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); + function DnaCodes_Specified(Index: Integer): boolean; public destructor Destroy; override; published - property Header: RequestHeader read FHeader write FHeader; - property DnaCode: string read FDnaCode write FDnaCode; + property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; end; @@ -917,10 +899,10 @@ // ************************************************************************ // - // XML : ZoekViaLadecodeResponse, global, + // XML : ZoekViaBatchResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaLadecodeResponse = class(GeneriekeResponse) + ZoekViaBatchResponse = class(GeneriekeResponse) private FDnaCodes: ArrayOfDnaCodeDnaCode; FDnaCodes_Specified: boolean; @@ -935,18 +917,18 @@ // ************************************************************************ // - // XML : ZoekViaLpnCodeRequest, global, + // XML : ZoekViaDnaCodeRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // - ZoekViaLpnCodeRequest = class(TRemotable) + ZoekViaDnaCodeRequest = class(TRemotable) private FHeader: RequestHeader; - FLpnCode: string; + FDnaCode: string; public destructor Destroy; override; published property Header: RequestHeader read FHeader write FHeader; - property LpnCode: string read FLpnCode write FLpnCode; + property DnaCode: string read FDnaCode write FDnaCode; end; @@ -970,41 +952,6 @@ // ************************************************************************ // - // XML : ZoekViaKlantnummerRequest, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - ZoekViaKlantnummerRequest = class(TRemotable) - private - FHeader: RequestHeader; - FKlantnummer: string; - public - destructor Destroy; override; - published - property Header: RequestHeader read FHeader write FHeader; - property Klantnummer: string read FKlantnummer write FKlantnummer; - end; - - - - // ************************************************************************ // - // XML : ZoekViaKlantnummerResponse, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - ZoekViaKlantnummerResponse = class(GeneriekeResponse) - private - FDnaCodes: ArrayOfDnaCodeDnaCode; - FDnaCodes_Specified: boolean; - procedure SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); - function DnaCodes_Specified(Index: Integer): boolean; - public - destructor Destroy; override; - published - property DnaCodes: ArrayOfDnaCodeDnaCode Index (IS_OPTN or IS_UNBD or IS_NLBL) read FDnaCodes write SetDnaCodes stored DnaCodes_Specified; - end; - - - - // ************************************************************************ // // XML : ToeleveringMetAantallen, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -1098,6 +1045,27 @@ // ************************************************************************ // + // XML : ToeleveringBijwerkenRequest, global, + // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode + // ************************************************************************ // + ToeleveringBijwerkenRequest = class(TRemotable) + private + FHeader: RequestHeader; + FToelevering: string; + FStatus: DnaCodeStatus; + FIsDirecteLevering: Boolean; + public + destructor Destroy; override; + published + property Header: RequestHeader read FHeader write FHeader; + property Toelevering: string read FToelevering write FToelevering; + property Status: DnaCodeStatus read FStatus write FStatus; + property IsDirecteLevering: Boolean read FIsDirecteLevering write FIsDirecteLevering; + end; + + + + // ************************************************************************ // // XML : ToeleveringBijwerkenResponse, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -1126,17 +1094,6 @@ // ************************************************************************ // - // XML : ValideerPalletCodeResponse, global, - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - ValideerPalletCodeResponse = class(GeneriekeResponse) - private - published - end; - - - - // ************************************************************************ // // XML : VhossKastenMetAantallen, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // ************************************************************************ // @@ -1180,29 +1137,8 @@ end; - // ************************************************************************ // - // XML : ToeleveringBijwerkenRequest, global, // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode - // ************************************************************************ // - ToeleveringBijwerkenRequest = class(TRemotable) - private - FHeader: RequestHeader; - FToelevering: string; - FStatus: DnaCodeStatus; - FIsDirecteLevering: Boolean; - public - destructor Destroy; override; - published - property Header: RequestHeader read FHeader write FHeader; - property Toelevering: string read FToelevering write FToelevering; - property Status: DnaCodeStatus read FStatus write FStatus; - property IsDirecteLevering: Boolean read FIsDirecteLevering write FIsDirecteLevering; - end; - - - // ************************************************************************ // - // Namespace : http://www.vanhoecke.be/Halux/AAP/DnaCode // soapAction: http://www.vanhoecke.be/Halux/AAP/DnaCode/WS.Halux.AAP.DnaCodeService.%operationName% // transport : http://schemas.xmlsoap.org/soap/http // style : document @@ -1216,7 +1152,6 @@ ['{514675BC-4331-0084-2F76-0934B2799FAE}'] function BewerkKlantinstellingen(const BewerkKlantInstellingen: BewerkKlantinstellingenRequest): BewerkKlantinstellingenResponse; stdcall; function DnaCodeAfmelden(const DnaCodeAfmeldenRequest: DnaCodeAfmeldenRequest): DnaCodeAfmeldenResponse; stdcall; - function GeefVolgendeLpnCode(const GeefVolgendeLpnCodeRequest: GeefVolgendeLpnCodeRequest): GeefVolgendeLpnCodeResponse; stdcall; function GeefVolgendeTbpCode(const GeefVolgendeTbpCodeRequest: GeefVolgendeTbpCodeRequest): GeefVolgendeTbpCodeResponse; stdcall; function HernoemPallet(const HernoemPalletRequest: HernoemPalletRequest): HernoemPalletResponse; stdcall; function IsDirecteLevering(const DirecteLeveringRequest: DirecteLeveringRequest): DirecteLeveringResponse; stdcall; @@ -1231,7 +1166,6 @@ function ZoekViaDnaCode(const ZoekViaDnaCodeRequest: ZoekViaDnaCodeRequest): ZoekViaDnaCodeResponse; stdcall; function ZoekViaKlantnummer(const ZoekViaKlantnummerRequest: ZoekViaKlantnummerRequest): ZoekViaKlantnummerResponse; stdcall; function ZoekViaLadecode(const ZoekViaLadecodeRequest: ZoekViaLadecodeRequest): ZoekViaLadecodeResponse; stdcall; - function ZoekViaLpnCode(const ZoekViaLpnCodeRequest: ZoekViaLpnCodeRequest): ZoekViaLpnCodeResponse; stdcall; function ZoekViaOrdernummer(const ZoekViaOrdernummerRequest: ZoekViaOrdernummerRequest): ZoekViaOrdernummerResponse; stdcall; function ZoekViaPalletCode(const ZoekViaPalletCodeRequest: ZoekViaPalletCodeRequest): ZoekViaPalletCodeResponse; stdcall; function ZoekViaStatus(const ZoekViaStatusRequest: ZoekViaStatusRequest): ZoekViaStatusResponse; stdcall; @@ -1246,7 +1180,7 @@ function GetDnaCodeServiceSoap(UseWSDL: Boolean; Addr: string; HTTPRIO: THTTPRIO): DnaCodeServiceSoap; const - defWSDL = 'http://jlm-ws020:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.CLS?WSDL=1'; + defWSDL = 'http://jlm-ws020:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.cls?WSDL=1'; defURL = 'http://jlm-ws020:57772/csp/dev1/WS.Halux.AAP.DnaCodeService.cls'; defSvc = 'DnaCodeService'; defPrt = 'DnaCodeServiceSoap'; @@ -1287,18 +1221,6 @@ inherited Destroy; end; -destructor GeefVolgendeLpnCodeRequest.Destroy; -begin - SysUtils.FreeAndNil(FHeader); - inherited Destroy; -end; - -destructor GeefVolgendeTbpCodeRequest.Destroy; -begin - SysUtils.FreeAndNil(FHeader); - inherited Destroy; -end; - destructor BewerkKlantinstellingenRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); @@ -1333,6 +1255,34 @@ Result := FOokEWMSverwerken_Specified; end; +destructor GeefVolgendeTbpCodeRequest.Destroy; +begin + SysUtils.FreeAndNil(FHeader); + inherited Destroy; +end; + +procedure GeefVolgendeTbpCodeRequest.SetToeleveringId(Index: Integer; const Astring: string); +begin + FToeleveringId := Astring; + FToeleveringId_Specified := True; +end; + +function GeefVolgendeTbpCodeRequest.ToeleveringId_Specified(Index: Integer): boolean; +begin + Result := FToeleveringId_Specified; +end; + +procedure GeefVolgendeTbpCodeRequest.SetProductNummer(Index: Integer; const Astring: string); +begin + FProductNummer := Astring; + FProductNummer_Specified := True; +end; + +function GeefVolgendeTbpCodeRequest.ProductNummer_Specified(Index: Integer): boolean; +begin + Result := FProductNummer_Specified; +end; + destructor DirecteLeveringRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); @@ -1501,7 +1451,7 @@ inherited Destroy; end; -destructor ZoekViaToeleveringResponse.Destroy; +destructor ZoekViaOrdernummerResponse.Destroy; var I: Integer; begin @@ -1511,40 +1461,39 @@ inherited Destroy; end; -procedure ZoekViaToeleveringResponse.SetAantalInToelevering(Index: Integer; const AInt64: Int64); +procedure ZoekViaOrdernummerResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin - FAantalInToelevering := AInt64; - FAantalInToelevering_Specified := True; + FDnaCodes := AArrayOfDnaCodeDnaCode; + FDnaCodes_Specified := True; end; -function ZoekViaToeleveringResponse.AantalInToelevering_Specified(Index: Integer): boolean; +function ZoekViaOrdernummerResponse.DnaCodes_Specified(Index: Integer): boolean; begin - Result := FAantalInToelevering_Specified; + Result := FDnaCodes_Specified; end; -procedure ZoekViaToeleveringResponse.SetAantalReedsGescand(Index: Integer; const AInt64: Int64); +destructor ZoekViaLadecodeResponse.Destroy; +var + I: Integer; begin - FAantalReedsGescand := AInt64; - FAantalReedsGescand_Specified := True; + for I := 0 to System.Length(FDnaCodes)-1 do + SysUtils.FreeAndNil(FDnaCodes[I]); + System.SetLength(FDnaCodes, 0); + inherited Destroy; end; -function ZoekViaToeleveringResponse.AantalReedsGescand_Specified(Index: Integer): boolean; +procedure ZoekViaLadecodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin - Result := FAantalReedsGescand_Specified; -end; - -procedure ZoekViaToeleveringResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); -begin FDnaCodes := AArrayOfDnaCodeDnaCode; FDnaCodes_Specified := True; end; -function ZoekViaToeleveringResponse.DnaCodes_Specified(Index: Integer): boolean; +function ZoekViaLadecodeResponse.DnaCodes_Specified(Index: Integer): boolean; begin Result := FDnaCodes_Specified; end; -destructor DnaCodeAfmeldenResponse.Destroy; +destructor ZoekViaPalletCodeResponse.Destroy; var I: Integer; begin @@ -1554,83 +1503,72 @@ inherited Destroy; end; -procedure DnaCodeAfmeldenResponse.SetAantalInToelevering(Index: Integer; const AInt64: Int64); +procedure ZoekViaPalletCodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin - FAantalInToelevering := AInt64; - FAantalInToelevering_Specified := True; + FDnaCodes := AArrayOfDnaCodeDnaCode; + FDnaCodes_Specified := True; end; -function DnaCodeAfmeldenResponse.AantalInToelevering_Specified(Index: Integer): boolean; +function ZoekViaPalletCodeResponse.DnaCodes_Specified(Index: Integer): boolean; begin - Result := FAantalInToelevering_Specified; + Result := FDnaCodes_Specified; end; -procedure DnaCodeAfmeldenResponse.SetAantalReedsGescand(Index: Integer; const AInt64: Int64); +procedure ZoekViaPalletCodeResponse.SetMeerdereToeleveringenToegestaan(Index: Integer; const ABoolean: Boolean); begin - FAantalReedsGescand := AInt64; - FAantalReedsGescand_Specified := True; + FMeerdereToeleveringenToegestaan := ABoolean; + FMeerdereToeleveringenToegestaan_Specified := True; end; -function DnaCodeAfmeldenResponse.AantalReedsGescand_Specified(Index: Integer): boolean; +function ZoekViaPalletCodeResponse.MeerdereToeleveringenToegestaan_Specified(Index: Integer): boolean; begin - Result := FAantalReedsGescand_Specified; + Result := FMeerdereToeleveringenToegestaan_Specified; end; -procedure DnaCodeAfmeldenResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +destructor ZoekViaToeleveringResponse.Destroy; +var + I: Integer; begin - FDnaCodes := AArrayOfDnaCodeDnaCode; - FDnaCodes_Specified := True; + for I := 0 to System.Length(FDnaCodes)-1 do + SysUtils.FreeAndNil(FDnaCodes[I]); + System.SetLength(FDnaCodes, 0); + inherited Destroy; end; -function DnaCodeAfmeldenResponse.DnaCodes_Specified(Index: Integer): boolean; +procedure ZoekViaToeleveringResponse.SetAantalInToelevering(Index: Integer; const AInt64: Int64); begin - Result := FDnaCodes_Specified; + FAantalInToelevering := AInt64; + FAantalInToelevering_Specified := True; end; -procedure DnaCodeAfmeldenResponse.SetBatchId(Index: Integer; const Astring: string); +function ZoekViaToeleveringResponse.AantalInToelevering_Specified(Index: Integer): boolean; begin - FBatchId := Astring; - FBatchId_Specified := True; + Result := FAantalInToelevering_Specified; end; -function DnaCodeAfmeldenResponse.BatchId_Specified(Index: Integer): boolean; +procedure ZoekViaToeleveringResponse.SetAantalReedsGescand(Index: Integer; const AInt64: Int64); begin - Result := FBatchId_Specified; + FAantalReedsGescand := AInt64; + FAantalReedsGescand_Specified := True; end; -procedure DnaCodeAfmeldenResponse.SetIsSST(Index: Integer; const ABoolean: Boolean); +function ZoekViaToeleveringResponse.AantalReedsGescand_Specified(Index: Integer): boolean; begin - FIsSST := ABoolean; - FIsSST_Specified := True; + Result := FAantalReedsGescand_Specified; end; -function DnaCodeAfmeldenResponse.IsSST_Specified(Index: Integer): boolean; +procedure ZoekViaToeleveringResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin - Result := FIsSST_Specified; + FDnaCodes := AArrayOfDnaCodeDnaCode; + FDnaCodes_Specified := True; end; -destructor BewerkKlantinstellingenResponse.Destroy; -var - I: Integer; +function ZoekViaToeleveringResponse.DnaCodes_Specified(Index: Integer): boolean; begin - for I := 0 to System.Length(FKlantinstellingen)-1 do - SysUtils.FreeAndNil(FKlantinstellingen[I]); - System.SetLength(FKlantinstellingen, 0); - inherited Destroy; + Result := FDnaCodes_Specified; end; -procedure BewerkKlantinstellingenResponse.SetKlantinstellingen(Index: Integer; const AArrayOfKlantinstellingenKlantinstellingen: ArrayOfKlantinstellingenKlantinstellingen); -begin - FKlantinstellingen := AArrayOfKlantinstellingenKlantinstellingen; - FKlantinstellingen_Specified := True; -end; - -function BewerkKlantinstellingenResponse.Klantinstellingen_Specified(Index: Integer): boolean; -begin - Result := FKlantinstellingen_Specified; -end; - -destructor ZoekViaOrdernummerResponse.Destroy; +destructor ZoekViaStatusResponse.Destroy; var I: Integer; begin @@ -1640,18 +1578,18 @@ inherited Destroy; end; -procedure ZoekViaOrdernummerResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +procedure ZoekViaStatusResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin FDnaCodes := AArrayOfDnaCodeDnaCode; FDnaCodes_Specified := True; end; -function ZoekViaOrdernummerResponse.DnaCodes_Specified(Index: Integer): boolean; +function ZoekViaStatusResponse.DnaCodes_Specified(Index: Integer): boolean; begin Result := FDnaCodes_Specified; end; -destructor ZoekViaLpnCodeResponse.Destroy; +destructor DnaCodeAfmeldenResponse.Destroy; var I: Integer; begin @@ -1661,61 +1599,62 @@ inherited Destroy; end; -procedure ZoekViaLpnCodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +procedure DnaCodeAfmeldenResponse.SetAantalInToelevering(Index: Integer; const AInt64: Int64); begin - FDnaCodes := AArrayOfDnaCodeDnaCode; - FDnaCodes_Specified := True; + FAantalInToelevering := AInt64; + FAantalInToelevering_Specified := True; end; -function ZoekViaLpnCodeResponse.DnaCodes_Specified(Index: Integer): boolean; +function DnaCodeAfmeldenResponse.AantalInToelevering_Specified(Index: Integer): boolean; begin - Result := FDnaCodes_Specified; + Result := FAantalInToelevering_Specified; end; -procedure ZoekViaLpnCodeResponse.SetMeerdereToeleveringenToegestaan(Index: Integer; const ABoolean: Boolean); +procedure DnaCodeAfmeldenResponse.SetAantalReedsGescand(Index: Integer; const AInt64: Int64); begin - FMeerdereToeleveringenToegestaan := ABoolean; - FMeerdereToeleveringenToegestaan_Specified := True; + FAantalReedsGescand := AInt64; + FAantalReedsGescand_Specified := True; end; -function ZoekViaLpnCodeResponse.MeerdereToeleveringenToegestaan_Specified(Index: Integer): boolean; +function DnaCodeAfmeldenResponse.AantalReedsGescand_Specified(Index: Integer): boolean; begin - Result := FMeerdereToeleveringenToegestaan_Specified; + Result := FAantalReedsGescand_Specified; end; -destructor ZoekViaPalletCodeResponse.Destroy; -var - I: Integer; +procedure DnaCodeAfmeldenResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin - for I := 0 to System.Length(FDnaCodes)-1 do - SysUtils.FreeAndNil(FDnaCodes[I]); - System.SetLength(FDnaCodes, 0); - inherited Destroy; -end; - -procedure ZoekViaPalletCodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); -begin FDnaCodes := AArrayOfDnaCodeDnaCode; FDnaCodes_Specified := True; end; -function ZoekViaPalletCodeResponse.DnaCodes_Specified(Index: Integer): boolean; +function DnaCodeAfmeldenResponse.DnaCodes_Specified(Index: Integer): boolean; begin Result := FDnaCodes_Specified; end; -procedure ZoekViaPalletCodeResponse.SetMeerdereToeleveringenToegestaan(Index: Integer; const ABoolean: Boolean); +procedure DnaCodeAfmeldenResponse.SetBatchId(Index: Integer; const Astring: string); begin - FMeerdereToeleveringenToegestaan := ABoolean; - FMeerdereToeleveringenToegestaan_Specified := True; + FBatchId := Astring; + FBatchId_Specified := True; end; -function ZoekViaPalletCodeResponse.MeerdereToeleveringenToegestaan_Specified(Index: Integer): boolean; +function DnaCodeAfmeldenResponse.BatchId_Specified(Index: Integer): boolean; begin - Result := FMeerdereToeleveringenToegestaan_Specified; + Result := FBatchId_Specified; end; -destructor ZoekViaStatusResponse.Destroy; +procedure DnaCodeAfmeldenResponse.SetIsSST(Index: Integer; const ABoolean: Boolean); +begin + FIsSST := ABoolean; + FIsSST_Specified := True; +end; + +function DnaCodeAfmeldenResponse.IsSST_Specified(Index: Integer): boolean; +begin + Result := FIsSST_Specified; +end; + +destructor HernoemPalletResponse.Destroy; var I: Integer; begin @@ -1725,36 +1664,36 @@ inherited Destroy; end; -procedure ZoekViaStatusResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +procedure HernoemPalletResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin FDnaCodes := AArrayOfDnaCodeDnaCode; FDnaCodes_Specified := True; end; -function ZoekViaStatusResponse.DnaCodes_Specified(Index: Integer): boolean; +function HernoemPalletResponse.DnaCodes_Specified(Index: Integer): boolean; begin Result := FDnaCodes_Specified; end; -destructor HernoemPalletResponse.Destroy; +destructor BewerkKlantinstellingenResponse.Destroy; var I: Integer; begin - for I := 0 to System.Length(FDnaCodes)-1 do - SysUtils.FreeAndNil(FDnaCodes[I]); - System.SetLength(FDnaCodes, 0); + for I := 0 to System.Length(FKlantinstellingen)-1 do + SysUtils.FreeAndNil(FKlantinstellingen[I]); + System.SetLength(FKlantinstellingen, 0); inherited Destroy; end; -procedure HernoemPalletResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +procedure BewerkKlantinstellingenResponse.SetKlantinstellingen(Index: Integer; const AArrayOfKlantinstellingenKlantinstellingen: ArrayOfKlantinstellingenKlantinstellingen); begin - FDnaCodes := AArrayOfDnaCodeDnaCode; - FDnaCodes_Specified := True; + FKlantinstellingen := AArrayOfKlantinstellingenKlantinstellingen; + FKlantinstellingen_Specified := True; end; -function HernoemPalletResponse.DnaCodes_Specified(Index: Integer): boolean; +function BewerkKlantinstellingenResponse.Klantinstellingen_Specified(Index: Integer): boolean; begin - Result := FDnaCodes_Specified; + Result := FKlantinstellingen_Specified; end; destructor DnaCode.Destroy; @@ -1979,34 +1918,24 @@ inherited Destroy; end; -destructor ZoekAlleVhossLadesBijDnaCodeResponse.Destroy; -var - I: Integer; +destructor ZoekAlleVhossLadesBijDnaCodeRequest.Destroy; begin - for I := 0 to System.Length(FDnaCodes)-1 do - SysUtils.FreeAndNil(FDnaCodes[I]); - System.SetLength(FDnaCodes, 0); + SysUtils.FreeAndNil(FHeader); inherited Destroy; end; -procedure ZoekAlleVhossLadesBijDnaCodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +procedure ZoekAlleVhossLadesBijDnaCodeRequest.SetGuiVhossVolgnummer(Index: Integer; const Astring: string); begin - FDnaCodes := AArrayOfDnaCodeDnaCode; - FDnaCodes_Specified := True; + FGuiVhossVolgnummer := Astring; + FGuiVhossVolgnummer_Specified := True; end; -function ZoekAlleVhossLadesBijDnaCodeResponse.DnaCodes_Specified(Index: Integer): boolean; +function ZoekAlleVhossLadesBijDnaCodeRequest.GuiVhossVolgnummer_Specified(Index: Integer): boolean; begin - Result := FDnaCodes_Specified; + Result := FGuiVhossVolgnummer_Specified; end; -destructor ZoekViaBatchRequest.Destroy; -begin - SysUtils.FreeAndNil(FHeader); - inherited Destroy; -end; - -destructor ZoekViaBatchResponse.Destroy; +destructor ZoekAlleVhossLadesBijDnaCodeResponse.Destroy; var I: Integer; begin @@ -2016,17 +1945,23 @@ inherited Destroy; end; -procedure ZoekViaBatchResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +procedure ZoekAlleVhossLadesBijDnaCodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin FDnaCodes := AArrayOfDnaCodeDnaCode; FDnaCodes_Specified := True; end; -function ZoekViaBatchResponse.DnaCodes_Specified(Index: Integer): boolean; +function ZoekAlleVhossLadesBijDnaCodeResponse.DnaCodes_Specified(Index: Integer): boolean; begin Result := FDnaCodes_Specified; end; +destructor ZoekViaBatchRequest.Destroy; +begin + SysUtils.FreeAndNil(FHeader); + inherited Destroy; +end; + destructor ZoekAlleDnaCodesDieOpVhossMoetenRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); @@ -2054,27 +1989,31 @@ Result := FDnaCodes_Specified; end; -destructor ZoekAlleVhossLadesBijDnaCodeRequest.Destroy; +destructor ZoekViaKlantnummerRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); inherited Destroy; end; -procedure ZoekAlleVhossLadesBijDnaCodeRequest.SetGuiVhossVolgnummer(Index: Integer; const Astring: string); +destructor ZoekViaKlantnummerResponse.Destroy; +var + I: Integer; begin - FGuiVhossVolgnummer := Astring; - FGuiVhossVolgnummer_Specified := True; + for I := 0 to System.Length(FDnaCodes)-1 do + SysUtils.FreeAndNil(FDnaCodes[I]); + System.SetLength(FDnaCodes, 0); + inherited Destroy; end; -function ZoekAlleVhossLadesBijDnaCodeRequest.GuiVhossVolgnummer_Specified(Index: Integer): boolean; +procedure ZoekViaKlantnummerResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin - Result := FGuiVhossVolgnummer_Specified; + FDnaCodes := AArrayOfDnaCodeDnaCode; + FDnaCodes_Specified := True; end; -destructor ZoekViaDnaCodeRequest.Destroy; +function ZoekViaKlantnummerResponse.DnaCodes_Specified(Index: Integer): boolean; begin - SysUtils.FreeAndNil(FHeader); - inherited Destroy; + Result := FDnaCodes_Specified; end; destructor ZoekViaLadecodeRequest.Destroy; @@ -2083,7 +2022,7 @@ inherited Destroy; end; -destructor ZoekViaLadecodeResponse.Destroy; +destructor ZoekViaBatchResponse.Destroy; var I: Integer; begin @@ -2093,18 +2032,18 @@ inherited Destroy; end; -procedure ZoekViaLadecodeResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); +procedure ZoekViaBatchResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); begin FDnaCodes := AArrayOfDnaCodeDnaCode; FDnaCodes_Specified := True; end; -function ZoekViaLadecodeResponse.DnaCodes_Specified(Index: Integer): boolean; +function ZoekViaBatchResponse.DnaCodes_Specified(Index: Integer): boolean; begin Result := FDnaCodes_Specified; end; -destructor ZoekViaLpnCodeRequest.Destroy; +destructor ZoekViaDnaCodeRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); inherited Destroy; @@ -2127,33 +2066,6 @@ Result := FDnaCodes_Specified; end; -destructor ZoekViaKlantnummerRequest.Destroy; -begin - SysUtils.FreeAndNil(FHeader); - inherited Destroy; -end; - -destructor ZoekViaKlantnummerResponse.Destroy; -var - I: Integer; -begin - for I := 0 to System.Length(FDnaCodes)-1 do - SysUtils.FreeAndNil(FDnaCodes[I]); - System.SetLength(FDnaCodes, 0); - inherited Destroy; -end; - -procedure ZoekViaKlantnummerResponse.SetDnaCodes(Index: Integer; const AArrayOfDnaCodeDnaCode: ArrayOfDnaCodeDnaCode); -begin - FDnaCodes := AArrayOfDnaCodeDnaCode; - FDnaCodes_Specified := True; -end; - -function ZoekViaKlantnummerResponse.DnaCodes_Specified(Index: Integer): boolean; -begin - Result := FDnaCodes_Specified; -end; - procedure ToeleveringMetAantallen.SetToeleveringID(Index: Integer; const Astring: string); begin FToeleveringID := Astring; @@ -2231,6 +2143,12 @@ Result := FToeleveringMetAantallen_Specified; end; +destructor ToeleveringBijwerkenRequest.Destroy; +begin + SysUtils.FreeAndNil(FHeader); + inherited Destroy; +end; + destructor ValideerPalletCodeRequest.Destroy; begin SysUtils.FreeAndNil(FHeader); @@ -2291,12 +2209,6 @@ Result := FVhossKastenMetAantallen_Specified; end; -destructor ToeleveringBijwerkenRequest.Destroy; -begin - SysUtils.FreeAndNil(FHeader); - inherited Destroy; -end; - initialization { DnaCodeServiceSoap } InvRegistry.RegisterInterface(TypeInfo(DnaCodeServiceSoap), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'UTF-8'); @@ -2308,9 +2220,6 @@ { DnaCodeServiceSoap.DnaCodeAfmelden } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'DnaCodeAfmelden', '', '[ReturnName="DnaCodeAfmeldenResult"]'); - { DnaCodeServiceSoap.GeefVolgendeLpnCode } - InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'GeefVolgendeLpnCode', '', - '[ReturnName="GeefVolgendeLpnCodeResult"]'); { DnaCodeServiceSoap.GeefVolgendeTbpCode } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'GeefVolgendeTbpCode', '', '[ReturnName="GeefVolgendeTbpCodeResult"]'); @@ -2353,9 +2262,6 @@ { DnaCodeServiceSoap.ZoekViaLadecode } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'ZoekViaLadecode', '', '[ReturnName="ZoekViaLadecodeResult"]'); - { DnaCodeServiceSoap.ZoekViaLpnCode } - InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'ZoekViaLpnCode', '', - '[ReturnName="ZoekViaLpnCodeResult"]'); { DnaCodeServiceSoap.ZoekViaOrdernummer } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'ZoekViaOrdernummer', '', '[ReturnName="ZoekViaOrdernummerResult"]'); @@ -2368,78 +2274,73 @@ { DnaCodeServiceSoap.ZoekViaToelevering } InvRegistry.RegisterMethodInfo(TypeInfo(DnaCodeServiceSoap), 'ZoekViaToelevering', '', '[ReturnName="ZoekViaToeleveringResult"]'); + 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.RegisterXSClass(ZoekViaStatusRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaStatusRequest'); - RemClassRegistry.RegisterXSClass(GeefVolgendeLpnCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeefVolgendeLpnCodeRequest'); - RemClassRegistry.RegisterXSInfo(TypeInfo(ArrayOfDnaCodeDnaCode), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ArrayOfDnaCodeDnaCode'); - RemClassRegistry.RegisterXSClass(GeefVolgendeTbpCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeefVolgendeTbpCodeRequest'); RemClassRegistry.RegisterXSClass(BewerkKlantinstellingenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'BewerkKlantinstellingenRequest'); RemClassRegistry.RegisterXSInfo(TypeInfo(String_), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'String_', 'String'); RemClassRegistry.RegisterXSClass(RequestHeader, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'RequestHeader'); RemClassRegistry.RegisterXSClass(HernoemPalletRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'HernoemPalletRequest'); + RemClassRegistry.RegisterXSClass(GeefVolgendeTbpCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeefVolgendeTbpCodeRequest'); RemClassRegistry.RegisterXSClass(DirecteLeveringRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DirecteLeveringRequest'); RemClassRegistry.RegisterXSClass(ZoekViaToeleveringRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaToeleveringRequest'); RemClassRegistry.RegisterXSClass(ZoekViaOrdernummerRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaOrdernummerRequest'); RemClassRegistry.RegisterXSClass(ZoekViaPalletCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaPalletCodeRequest'); + RemClassRegistry.RegisterXSClass(ResponseHeader, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ResponseHeader'); RemClassRegistry.RegisterXSInfo(TypeInfo(ArrayOfKlantinstellingenKlantinstellingen), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ArrayOfKlantinstellingenKlantinstellingen'); RemClassRegistry.RegisterXSClass(DnaCodeAfmeldenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeAfmeldenRequest'); RemClassRegistry.RegisterXSClass(DataTransferObject, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DataTransferObject'); RemClassRegistry.RegisterXSClass(Klantinstellingen, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'Klantinstellingen'); RemClassRegistry.RegisterXSClass(GeneriekeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeneriekeResponse'); - RemClassRegistry.RegisterXSClass(ZoekViaToeleveringResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaToeleveringResponse'); - RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaToeleveringResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); - RemClassRegistry.RegisterXSClass(DnaCodeAfmeldenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeAfmeldenResponse'); - RemClassRegistry.RegisterExternalPropName(TypeInfo(DnaCodeAfmeldenResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); - RemClassRegistry.RegisterXSClass(BewerkKlantinstellingenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'BewerkKlantinstellingenResponse'); - RemClassRegistry.RegisterExternalPropName(TypeInfo(BewerkKlantinstellingenResponse), 'Klantinstellingen', '[ArrayItemName="Klantinstellingen"]'); RemClassRegistry.RegisterXSClass(ZoekViaOrdernummerResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaOrdernummerResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaOrdernummerResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); - RemClassRegistry.RegisterXSClass(ZoekViaLpnCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaLpnCodeResponse'); - RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaLpnCodeResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); + RemClassRegistry.RegisterXSClass(ZoekViaLadecodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaLadecodeResponse'); + RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaLadecodeResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); RemClassRegistry.RegisterXSClass(ZoekViaPalletCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaPalletCodeResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaPalletCodeResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); + RemClassRegistry.RegisterXSClass(ZoekViaToeleveringResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaToeleveringResponse'); + RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaToeleveringResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); RemClassRegistry.RegisterXSClass(ZoekViaStatusResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaStatusResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaStatusResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); - RemClassRegistry.RegisterXSClass(GeefVolgendeLpnCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeefVolgendeLpnCodeResponse'); + RemClassRegistry.RegisterXSClass(DnaCodeAfmeldenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCodeAfmeldenResponse'); + RemClassRegistry.RegisterExternalPropName(TypeInfo(DnaCodeAfmeldenResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); RemClassRegistry.RegisterXSClass(HernoemPalletResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'HernoemPalletResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(HernoemPalletResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); RemClassRegistry.RegisterXSClass(DirecteLeveringResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DirecteLeveringResponse'); RemClassRegistry.RegisterXSClass(GeefVolgendeTbpCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'GeefVolgendeTbpCodeResponse'); + RemClassRegistry.RegisterXSClass(BewerkKlantinstellingenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'BewerkKlantinstellingenResponse'); + RemClassRegistry.RegisterExternalPropName(TypeInfo(BewerkKlantinstellingenResponse), 'Klantinstellingen', '[ArrayItemName="Klantinstellingen"]'); RemClassRegistry.RegisterXSClass(DnaCode, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'DnaCode'); - RemClassRegistry.RegisterXSClass(ResponseHeader, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ResponseHeader'); RemClassRegistry.RegisterXSClass(PalletBijwerkenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'PalletBijwerkenRequest'); + RemClassRegistry.RegisterXSClass(ZoekAlleVhossLadesBijDnaCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekAlleVhossLadesBijDnaCodeRequest'); RemClassRegistry.RegisterXSClass(ZoekAlleVhossLadesBijDnaCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekAlleVhossLadesBijDnaCodeResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekAlleVhossLadesBijDnaCodeResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); RemClassRegistry.RegisterXSClass(ZoekViaBatchRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaBatchRequest'); - RemClassRegistry.RegisterXSClass(ZoekViaBatchResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaBatchResponse'); - RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaBatchResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); + RemClassRegistry.RegisterXSClass(ValideerPalletCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ValideerPalletCodeResponse'); RemClassRegistry.RegisterXSClass(ZoekAlleDnaCodesDieOpVhossMoetenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekAlleDnaCodesDieOpVhossMoetenRequest'); RemClassRegistry.RegisterXSClass(ZoekAlleDnaCodesDieOpVhossMoetenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekAlleDnaCodesDieOpVhossMoetenResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekAlleDnaCodesDieOpVhossMoetenResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); - RemClassRegistry.RegisterXSClass(ZoekAlleVhossLadesBijDnaCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekAlleVhossLadesBijDnaCodeRequest'); - RemClassRegistry.RegisterXSClass(ZoekViaDnaCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaDnaCodeRequest'); - RemClassRegistry.RegisterXSClass(ZoekViaLadecodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaLadecodeRequest'); - RemClassRegistry.RegisterXSClass(ZoekViaLadecodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaLadecodeResponse'); - RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaLadecodeResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); - RemClassRegistry.RegisterXSClass(ZoekViaLpnCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaLpnCodeRequest'); - RemClassRegistry.RegisterXSClass(ZoekViaDnaCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaDnaCodeResponse'); RemClassRegistry.RegisterXSClass(ZoekViaKlantnummerRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaKlantnummerRequest'); RemClassRegistry.RegisterXSClass(ZoekViaKlantnummerResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaKlantnummerResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaKlantnummerResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); + RemClassRegistry.RegisterXSClass(ZoekViaLadecodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaLadecodeRequest'); + RemClassRegistry.RegisterXSClass(ZoekViaBatchResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaBatchResponse'); + RemClassRegistry.RegisterExternalPropName(TypeInfo(ZoekViaBatchResponse), 'DnaCodes', '[ArrayItemName="DnaCode"]'); + RemClassRegistry.RegisterXSClass(ZoekViaDnaCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaDnaCodeRequest'); + RemClassRegistry.RegisterXSClass(ZoekViaDnaCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ZoekViaDnaCodeResponse'); RemClassRegistry.RegisterXSClass(ToeleveringMetAantallen, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringMetAantallen'); RemClassRegistry.RegisterXSInfo(TypeInfo(ArrayOfToeleveringMetAantallenToeleveringMetAantallen), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ArrayOfToeleveringMetAantallenToeleveringMetAantallen'); RemClassRegistry.RegisterXSClass(RondAfVhossBatchRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'RondAfVhossBatchRequest'); RemClassRegistry.RegisterXSClass(PalletBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'PalletBijwerkenResponse'); RemClassRegistry.RegisterXSClass(RondAfKaderdeurDagRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'RondAfKaderdeurDagRequest'); RemClassRegistry.RegisterXSClass(RondAfKaderdeurDagResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'RondAfKaderdeurDagResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(RondAfKaderdeurDagResponse), 'ToeleveringMetAantallen', '[ArrayItemName="ToeleveringMetAantallen"]'); + RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenRequest'); RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenResponse'); RemClassRegistry.RegisterXSClass(ValideerPalletCodeRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ValideerPalletCodeRequest'); - RemClassRegistry.RegisterXSClass(ValideerPalletCodeResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ValideerPalletCodeResponse'); RemClassRegistry.RegisterXSClass(VhossKastenMetAantallen, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'VhossKastenMetAantallen'); RemClassRegistry.RegisterXSInfo(TypeInfo(ArrayOfVhossKastenMetAantallenVhossKastenMetAantallen), 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ArrayOfVhossKastenMetAantallenVhossKastenMetAantallen'); RemClassRegistry.RegisterXSClass(RondAfVhossBatchResponse, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'RondAfVhossBatchResponse'); RemClassRegistry.RegisterExternalPropName(TypeInfo(RondAfVhossBatchResponse), 'VhossKastenMetAantallen', '[ArrayItemName="VhossKastenMetAantallen"]'); - RemClassRegistry.RegisterXSClass(ToeleveringBijwerkenRequest, 'http://www.vanhoecke.be/Halux/AAP/DnaCode', 'ToeleveringBijwerkenRequest'); end. \ No newline at end of file Index: ProScan/ProScan.identcache =================================================================== diff -u -r654 -r669 Binary files differ Index: ProScan/ProScan.dpr =================================================================== diff -u -r472 -r669 --- ProScan/ProScan.dpr (.../ProScan.dpr) (revision 472) +++ ProScan/ProScan.dpr (.../ProScan.dpr) (revision 669) @@ -22,7 +22,8 @@ MidasLib, OnvolledigeToeleveringScherm in 'UI\OnvolledigeToeleveringScherm.pas' {fmOnvolledigeToeleveringScherm}, AfdrukService in 'WS\AfdrukService.pas', - DnaCodeService in 'WS\DnaCodeService.pas'; + DnaCodeService in 'WS\DnaCodeService.pas', + QRcodeNaarKenmerkenService in 'WS\QRcodeNaarKenmerkenService.pas'; {$R *.res} Index: ProScan/ProScan.dproj =================================================================== diff -u -r654 -r669 --- ProScan/ProScan.dproj (.../ProScan.dproj) (revision 654) +++ ProScan/ProScan.dproj (.../ProScan.dproj) (revision 669) @@ -141,6 +141,7 @@ + Cfg_2 Base Index: ProScan/UI/InfoLogScherm.pas =================================================================== diff -u -r665 -r669 --- ProScan/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 665) +++ ProScan/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 669) @@ -79,7 +79,7 @@ if fWaarschuwingModalResult = mrYes then begin fAgent := TAgent.Create(UiContext); - Response := fAgent.DnaCodeAfmelden(sgToeleveringData.Rows[sgToeleveringData.Row][2], UiContext.Toelevering, sgToeleveringData.Rows[sgToeleveringData.Row][1],'', -1,''); + Response := fAgent.DnaCodeAfmelden(sgToeleveringData.Rows[sgToeleveringData.Row][2], UiContext.Toelevering, sgToeleveringData.Rows[sgToeleveringData.Row][1], -1,''); fAgent.Free; try if Response.Header.Status <> '200' then begin Index: ProScan/WS/Agent.pas =================================================================== diff -u -r665 -r669 --- ProScan/WS/Agent.pas (.../Agent.pas) (revision 665) +++ ProScan/WS/Agent.pas (.../Agent.pas) (revision 669) @@ -3,7 +3,7 @@ interface uses - DnaCodeService, GebruikerService, AfdrukService, System.SysUtils, Vcl.Forms, UiContext, System.Classes; + DnaCodeService, GebruikerService, AfdrukService, QRcodeNaarKenmerkenService, System.SysUtils, System.StrUtils, Vcl.Forms, UiContext, System.Classes; type TAgent = class @@ -12,6 +12,7 @@ fServer: string; fGebruikerServiceSoap: GebruikerServiceSoap; fDnaCodeServiceSoap: DnaCodeServiceSoap; + fQRcodeNaarKenmerkenServiceSoap: QRcodeNaarKenmerkenServiceSoap; fAfdrukServiceSoap: AfdrukServiceSoap; function ComputerName: String; function WUserName: String; @@ -22,22 +23,21 @@ function GebruikerAfmelden(): boolean; function ValideerPalletCode(PalletCode: string): ValideerPalletCodeResponse; function ZoekViaPalletCode(PalletCode: string): ZoekViaPalletCodeResponse; - function ZoekViaLpnCode(LpnCode: string): ZoekViaLpnCodeResponse; - function DnaCodeAfmelden(DnaCode, Toelevering, PalletCode: string; LpnCode: string; Aantal: integer; Locatie: string): DnaCodeAfmeldenResponse; + function DnaCodeAfmelden(DnaCode, Toelevering, PalletCode: string; Aantal: integer; Locatie: string): DnaCodeAfmeldenResponse; function ZoekViaToelevering(Toelevering: string): ZoekViaToeleveringResponse; function HernoemPallet(OudeCode, NieuweCode, EnkelDezeDnaCode: string; OokEWMSverwerken: boolean): HernoemPalletResponse; function IsDirecteLevering(Toelevering: string): DirecteLeveringResponse; function PalletBijwerken(Pallet: string; Status: DnaCodeStatus; IsDirecteLevering: boolean): PalletBijwerkenResponse; function ToeleveringBijwerken(Toelevering: string; Status: DnaCodeStatus; IsDirecteLevering: boolean): ToeleveringBijwerkenResponse; - function GeefVolgendeTbpCode(): GeefVolgendeTbpCodeResponse; - function GeefVolgendeLpnCode(): GeefVolgendeLpnCodeResponse; + function GeefVolgendeTbpCode(ToeleveringId: string; ProductNummer: string): GeefVolgendeTbpCodeResponse; function ZoekViaDnaCode(DnaCode: string): ZoekViaDnaCodeResponse; function ProboxEtiketAfdrukken(DnaCodesStringList: TStringList): ProboxEtiketAfdrukkenResponse; function RondAfKaderdeurDag(DnaCode: String): RondAfKaderdeurDagResponse; function ZoekAlleVhossLadesBijDnaCode(DnaCode: String): ZoekAlleVhossLadesBijDnaCodeResponse; function ZoekAlleDnaCodesDieOpVhossMoeten(FrameId: String): ZoekAlleDnaCodesDieOpVhossMoetenResponse; function BewerkKlantinstellingen(Actie: string; KlantId: string; IsExport: boolean; IsBlumXs: boolean; WegwerpPallet: boolean; MeerdereToeleveringen: boolean): BewerkKlantinstellingenResponse; function RondAfVhossBatch(BatchId: String): RondAfVhossBatchResponse; + function GeefKenmerken(KlantNummer: string; ProductNummer: string): QRcodeNaarKenmerkenResponse; end; implementation @@ -59,10 +59,11 @@ fGebruikerServiceSoap := GebruikerService.GetGebruikerServiceSoap(false,'http://'+fServer+':57772/csp/'+fNameSpace+'/WS.Halux.AAP.GebruikerService.cls',nil); fDnaCodeServiceSoap := DnaCodeService.GetDnaCodeServiceSoap(false,'http://'+fServer+':57772/csp/'+fNameSpace+'/WS.Halux.AAP.DnaCodeService.cls',nil); fAfdrukServiceSoap := AfdrukService.GetAfdrukServiceSoap(false,'http://'+fServer+':57772/csp/'+fNameSpace+'/WS.Halux.AAP.AfdrukService.cls',nil); + fQRcodeNaarKenmerkenServiceSoap := QRcodenaarKenmerkenService.GetQRcodeNaarKenmerkenServiceSoap(false,'http://'+fServer+':57772/csp/'+fNameSpace+'/WS.Vhisie4.QRcodeNaarKenmerkenService.cls',nil); end; function TAgent.DnaCodeAfmelden(DnaCode, Toelevering, PalletCode: string; - LpnCode: string; Aantal: integer; Locatie: string): DnaCodeAfmeldenResponse; + Aantal: integer; Locatie: string): DnaCodeAfmeldenResponse; var Request: DnaCodeAfmeldenRequest; Header: DnaCodeService.RequestHeader; @@ -76,7 +77,6 @@ Request.DnaCode := DnaCode; Request.Toelevering := Toelevering; Request.PalletCode := PalletCode; - Request.LpnCode := LpnCode; Request.Aantal := Aantal; Request.Locatie := Locatie; Request.BatchId := fUiContext.BatchId; @@ -125,13 +125,13 @@ fResponse := fGebruikerServiceSoap.GebruikerAfmelden(Request); Result := true; + fResponse.Free; finally Request.Free; - fResponse.Free; end; end; -function TAgent.GeefVolgendeTbpCode: GeefVolgendeTbpCodeResponse; +function TAgent.GeefVolgendeTbpCode(ToeleveringId: string; ProductNummer: string): GeefVolgendeTbpCodeResponse; var Request: GeefVolgendeTbpCodeRequest; Header: DnaCodeService.RequestHeader; @@ -142,31 +142,15 @@ Header.Initialen := fUiContext.Initialen; Header.ComputerNaam := FullName(); Request.Header := Header; + Request.ToeleveringId := ToeleveringId; + Request.ProductNummer := ProductNummer; result := fDnaCodeServiceSoap.GeefVolgendeTbpCode(Request); finally Request.Free; end; end; -function TAgent.GeefVolgendeLpnCode: GeefVolgendeLpnCodeResponse; -var - Request: GeefVolgendeLpnCodeRequest; - Header: DnaCodeService.RequestHeader; -begin - Request := GeefVolgendeLpnCodeRequest.Create; - Header := DnaCodeService.RequestHeader.Create; - try - Header.Initialen := fUiContext.Initialen; - Header.ComputerNaam := FullName(); - Request.Header := Header; - - result := fDnaCodeServiceSoap.GeefVolgendeLpnCode(Request); - finally - Request.Free; - end; -end; - function TAgent.HernoemPallet(OudeCode, NieuweCode, EnkelDezeDnaCode: string; OokEWMSverwerken: boolean): HernoemPalletResponse; var Request: HernoemPalletRequest; @@ -351,26 +335,6 @@ end; end; -function TAgent.ZoekViaLpnCode( - LpnCode: string): ZoekViaLpnCodeResponse; -var - Header: DnaCodeService.RequestHeader; - fZoekViaLpnCodeRequest: ZoekViaLpnCodeRequest; -begin - fZoekViaLpnCodeRequest := ZoekViaLpnCodeRequest.Create; - Header := DnaCodeService.RequestHeader.Create; - try - Header.Initialen := fUiContext.Initialen; - Header.ComputerNaam := FullName(); - fZoekViaLpnCodeRequest.Header := Header; - fZoekViaLpnCodeRequest.LpnCode := LpnCode; - - result := fDnaCodeServiceSoap.ZoekViaLpnCode(fZoekViaLpnCodeRequest); - finally - fZoekViaLpnCodeRequest.Free; - end; -end; - function TAgent.ZoekViaToelevering( Toelevering: string): ZoekViaToeleveringResponse; var @@ -485,6 +449,24 @@ end; end; +function TAgent.GeefKenmerken(KlantNummer: string; ProductNummer: string): QRcodeNaarKenmerkenResponse; +var + Header: QRcodeNaarKenmerkenService.RequestHeader; + fQRcodeNaarKenmerkenRequest: QRcodeNaarKenmerkenRequest; +begin + fQRcodeNaarKenmerkenRequest := QRcodeNaarKenmerkenRequest.Create; + Header := QRcodeNaarKenmerkenService.RequestHeader.Create; + try + Header.KlantID := SplitString(KlantNummer, '||')[2]; + fQRcodeNaarKenmerkenRequest.Header := Header; + fQRcodeNaarKenmerkenRequest.QRcodeData := 'AdminProductnummer=' + ProductNummer; + + result := fQRcodeNaarKenmerkenServiceSoap.GeefKenmerken(fQRcodeNaarKenmerkenRequest); + finally + fQRcodeNaarKenmerkenRequest.Free; + end; +end; + function TAgent.ComputerName: String; var buffer: array[0..255] of char; Index: ProScan/UI/DnaCodeReedsGescandScherm.pas =================================================================== diff -u -r665 -r669 --- ProScan/UI/DnaCodeReedsGescandScherm.pas (.../DnaCodeReedsGescandScherm.pas) (revision 665) +++ ProScan/UI/DnaCodeReedsGescandScherm.pas (.../DnaCodeReedsGescandScherm.pas) (revision 669) @@ -135,7 +135,7 @@ fAgent: TAgent; begin fAgent := TAgent.Create(UiContext); - Response := fAgent.DnaCodeAfmelden(UiContext.LaatsteDnaCode,UiContext.Toelevering,UiContext.Pallet,UiContext.LpnCode,-1,''); + Response := fAgent.DnaCodeAfmelden(UiContext.LaatsteDnaCode,UiContext.Toelevering,UiContext.Pallet,-1,''); fAgent.Free; try if Response.Header.Status <> '200' then begin Index: ProScan/UI/UiContext.pas =================================================================== diff -u -r663 -r669 --- ProScan/UI/UiContext.pas (.../UiContext.pas) (revision 663) +++ ProScan/UI/UiContext.pas (.../UiContext.pas) (revision 669) @@ -24,7 +24,6 @@ fInitialen: String; fLoginCode: String; fPallet: String; - fLpnCode: String; fToelevering: String; fLaatsteDnaCode: String; fInfoLogSchermToonGescand: boolean; @@ -37,6 +36,7 @@ fIsBlumXsPopupGetoond: boolean; fServerName: string; fModus: integer; + fMoetTbpCodeGenereren: boolean; fInternVhossId: string; fBatchId: String; fFormBreedte: integer; @@ -48,7 +48,6 @@ Property Initialen: String Read fInitialen Write fInitialen; Property LoginCode: String Read fLoginCode Write fLoginCode; Property Pallet: String Read fPallet Write fPallet; - Property LpnCode: String Read fLpnCode Write fLpnCode; Property Toelevering: String Read fToelevering Write fToelevering; Property LaatsteDnaCode: String Read fLaatsteDnaCode Write fLaatsteDnaCode; Property InfoLogSchermToonGescand: boolean Read fInfoLogSchermToonGescand Write fInfoLogSchermToonGescand; @@ -59,6 +58,7 @@ Property IsSSTPopupGetoond: boolean Read fIsSSTPopupGetoond Write fIsSSTPopupGetoond; Property ServerName: string Read fServerName Write fServerName; Property Modus: integer Read fModus Write fModus; + Property MoetTbpCodeGenereren: boolean Read fMoetTbpCodeGenereren Write fMoetTbpCodeGenereren; Property InternVhossId: string read fInternVhossId Write fInternVhossId; Property IsExportPopupGetoond: boolean Read fIsExportPopupGetoond write fIsExportPopupGetoond; Property IsBlumXsPopupGetoond: boolean Read fIsBlumXsPopupGetoond write fIsBlumXsPopupGetoond;