Index: ProScan/UI/DnaCodeScherm.pas =================================================================== diff -u -r529 -r531 --- ProScan/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 529) +++ ProScan/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 531) @@ -129,45 +129,50 @@ fIsDirecteLevering: boolean; begin inherited; - fAantalLadesOpHuidigePallet := BepaalAantalLadesOpHuidigePallet; - if fAantalLadesOpHuidigePallet > 0 then begin - if (UiContext.Modus = modusKAD) then begin - PalletBijwerken(DnaCodeStatus.InBuffer,false); - UiContext.Pallet := ''; - Self.ModalResult := mrPallet; - end else if (UiContext.Modus = modusVHOSS) then begin - if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin + ZetAfrondActieStatus(false); + try + fAantalLadesOpHuidigePallet := BepaalAantalLadesOpHuidigePallet; + if fAantalLadesOpHuidigePallet > 0 then begin + if (UiContext.Modus = modusKAD) then begin PalletBijwerken(DnaCodeStatus.InBuffer,false); UiContext.Pallet := ''; - UiContext.Toelevering := ''; - UiContext.BatchId := ''; Self.ModalResult := mrPallet; - end else begin - if (ToonPopupScherm('Vhoss nog niet volledig.'+#13#10+'Toch verwerken?','Ja','Annuleren',14,6,7) = mrYes) then begin + end else if (UiContext.Modus = modusVHOSS) then begin + if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin PalletBijwerken(DnaCodeStatus.InBuffer,false); UiContext.Pallet := ''; + UiContext.Toelevering := ''; + UiContext.BatchId := ''; Self.ModalResult := mrPallet; end else begin - Self.ModalResult := mrDnaCode; + if (ToonPopupScherm('Vhoss nog niet volledig.'+#13#10+'Toch verwerken?','Ja','Annuleren',14,6,7) = mrYes) then begin + PalletBijwerken(DnaCodeStatus.InBuffer,false); + UiContext.Pallet := ''; + Self.ModalResult := mrPallet; + end else begin + Self.ModalResult := mrDnaCode; + end; end; + end else if ((UiContext.Modus = modusDefault) and (ToonPopupScherm(lblHuidigePalletData.Caption+' verwerken?'+#13#10+inttostr(fAantalLadesOpHuidigePallet)+' lade(s)','Ja','Annuleren',14,6,7) = mrYes)) then begin + fIsDirecteLevering := (UiContext.Modus = modusDefault) and BepaalDirecteLevering; + if fIsDirecteLevering then begin + ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); + imgDirecteLevering.Visible := true; + end; + PalletBijwerken(DnaCodeStatus.InBuffer,fIsDirecteLevering); + DrukProboxEtiketAfIndienNodig; + UiContext.Pallet := ''; + Self.ModalResult := mrPallet; + end else begin + Self.ModalResult := mrDnaCode; end; - end else if ((UiContext.Modus = modusDefault) and (ToonPopupScherm(lblHuidigePalletData.Caption+' verwerken?'+#13#10+inttostr(fAantalLadesOpHuidigePallet)+' lade(s)','Ja','Annuleren',14,6,7) = mrYes)) then begin - fIsDirecteLevering := (UiContext.Modus = modusDefault) and BepaalDirecteLevering; - if fIsDirecteLevering then begin - ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); - imgDirecteLevering.Visible := true; - end; - PalletBijwerken(DnaCodeStatus.InBuffer,fIsDirecteLevering); - DrukProboxEtiketAfIndienNodig; - UiContext.Pallet := ''; + end else Self.ModalResult := mrPallet; - end else begin - Self.ModalResult := mrDnaCode; - end; - end else - Self.ModalResult := mrPallet; - PostMessage(Self.Handle,WM_Close,0,0); - (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); + finally + ZetAfrondActieStatus(true); + PostMessage(Self.Handle,WM_Close,0,0); + (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); + end; end; procedure TfmDnaCodeScherm.actAfrondenExecute(Sender: TObject); @@ -180,50 +185,53 @@ if UiContext.Toelevering = '' then exit; ZetAfrondActieStatus(false); - if (UiContext.Modus = modusKAD) then begin - RondAfKaderdeurDag(); - UiContext.Toelevering := ''; - UiContext.Pallet := ''; - end else if (UiContext.Modus = modusVHOSS) then begin - RondAfVhossBatch(); - UiContext.Toelevering := ''; - UiContext.Pallet := ''; - end else begin - fIsDirecteLevering := (UiContext.Modus = modusDefault) and BepaalDirecteLevering; - if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin - if fIsDirecteLevering then begin - ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); - imgDirecteLevering.Visible := true; - end; - ZetToeleveringStatus(DnaCodeStatus.InBuffer, fIsDirecteLevering); - if Self.ModalResult = mrPallet then begin - ToonPopupScherm('Toelevering succesvol afgerond','OK','',19,-1,-1,clGreen); - UiContext.Toelevering := ''; - UiContext.BatchId := ''; - DrukProboxEtiketAfIndienNodig; - end; + try + if (UiContext.Modus = modusKAD) then begin + RondAfKaderdeurDag(); + UiContext.Toelevering := ''; + UiContext.Pallet := ''; + end else if (UiContext.Modus = modusVHOSS) then begin + RondAfVhossBatch(); + UiContext.Toelevering := ''; + UiContext.Pallet := ''; end else begin - fOnvolledigeToeleveringScherm := TfmOnvolledigeToeleveringScherm.Create(self); - try - fOnvolledigeToeleveringScherm.UiContext := UiContext; - fWaarschuwingModalResult := fOnvolledigeToeleveringScherm.ShowModal; - if fWaarschuwingModalResult = mrNo then begin - ZetToeleveringStatus(DnaCodeStatus.InBuffer, fIsDirecteLevering); + fIsDirecteLevering := (UiContext.Modus = modusDefault) and BepaalDirecteLevering; + if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin + if fIsDirecteLevering then begin + ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); + imgDirecteLevering.Visible := true; + end; + ZetToeleveringStatus(DnaCodeStatus.InBuffer, fIsDirecteLevering); + if Self.ModalResult = mrPallet then begin + ToonPopupScherm('Toelevering succesvol afgerond','OK','',19,-1,-1,clGreen); UiContext.Toelevering := ''; UiContext.BatchId := ''; - Self.ModalResult := mrPallet; DrukProboxEtiketAfIndienNodig; - end else begin - Self.ModalResult := mrDnaCode; end; - finally - fOnvolledigeToeleveringScherm.Free; + end else begin + fOnvolledigeToeleveringScherm := TfmOnvolledigeToeleveringScherm.Create(self); + try + fOnvolledigeToeleveringScherm.UiContext := UiContext; + fWaarschuwingModalResult := fOnvolledigeToeleveringScherm.ShowModal; + if fWaarschuwingModalResult = mrNo then begin + ZetToeleveringStatus(DnaCodeStatus.InBuffer, fIsDirecteLevering); + UiContext.Toelevering := ''; + UiContext.BatchId := ''; + Self.ModalResult := mrPallet; + DrukProboxEtiketAfIndienNodig; + end else begin + Self.ModalResult := mrDnaCode; + end; + finally + fOnvolledigeToeleveringScherm.Free; + end; end; end; + finally + ZetAfrondActieStatus(true); + PostMessage(Self.Handle,WM_Close,0,0); + (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; - ZetAfrondActieStatus(true); - PostMessage(Self.Handle,WM_Close,0,0); - (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; function TfmDnaCodeScherm.BepaalAantalLadesOpHuidigePallet: integer; Index: ProScan/ProScan.identcache =================================================================== diff -u -r522 -r531 Binary files differ Index: ProScan/ProScan.dproj.local =================================================================== diff -u -r518 -r531 --- ProScan/ProScan.dproj.local (.../ProScan.dproj.local) (revision 518) +++ ProScan/ProScan.dproj.local (.../ProScan.dproj.local) (revision 531) @@ -2,176 +2,177 @@ 2019/03/01 14:25:16.000.954,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.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:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm + 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas + 2019/03/01 14:26:05.000.981,E:\svn\Delphi\AAPClient\ProScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj 2019/03/01 14:28:35.000.977,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas - 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm + 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/01 15:26:22.000.761,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm + 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas 2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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\GebruikerService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas 2019/03/05 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.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/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/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.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/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 08:39:12.000.150,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm - 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas + 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas - 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 10:26:55.000.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas - 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm - 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas - 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm - 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm + 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:45.000.805,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\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm + 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 11:14:25.000.860,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas - 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm + 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.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 13:41:42.000.692,=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 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/08 16:42:04.000.691,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 16:42:12.000.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/12 11:42:34.000.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/03/12 11:42:41.000.845,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/18 09:44:48.000.103,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.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 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm + 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas 2019/03/18 11:06:46.000.842,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/18 11:07:10.000.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/19 14:36:29.000.587,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\UiContext.pas + 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/20 14:52:28.000.434,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/20 14:52:34.000.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/22 12:38:06.000.040,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.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/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/04/10 07:45:17.000.841,=E:\svn\Delphi\AAPClient\WS.pas 2019/04/10 07:45:55.000.611,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/05/02 15:08:14.000.961,=E:\svn\Delphi\AAPClient\WS.pas 2019/05/02 15:08:28.000.270,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/09/03 15:55:43.000.155,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.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/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm + 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas 2019/09/04 13:14:25.000.076,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.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 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 14:42:49.000.071,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/06 07:39:37.000.990,=E:\svn\Delphi\AAPClient\WS.pas 2019/09/06 07:39:48.000.040,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm - 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas + 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm + 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/09/06 07:44:11.000.442,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/09/06 07:45:06.000.602,=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas - 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/09/09 10:12:07.000.120,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= 2019/09/25 09:00:58.000.441,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/10/01 13:49:36.000.449,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/01 13:49:56.000.314,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/02 13:33:49.000.729,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 13:33:55.000.547,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/02 15:42:02.000.588,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/02 15:42:14.000.814,=E:\svn\Delphi\AAPClient\WS.pas - 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/03 11:18:12.000.484,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/03 15:21:13.000.953,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\WS\Agent.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\WS\Agent.pas 2019/10/07 09:39:36.000.456,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:39:44.000.760,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:43:00.000.939,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:43:11.000.201,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 10:02:08.000.507,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas + 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/10/15 10:29:07.000.266,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/15 10:29:23.000.010,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/21 13:21:40.000.148,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/21 13:21:55.000.323,=E:\svn\Delphi\AAPClient\WS.pas - 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2020/02/13 14:45:20.000.233,=E:\svn\Delphi\AAPClient\WS.pas 2020/02/13 14:45:36.000.322,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2020/02/13 14:45:56.000.560,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2020/03/16 11:37:39.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.pas=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/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.pas=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/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.pas=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/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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/04/03 10:31:50.000.819,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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.pas=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/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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/05/29 11:42:47.000.154,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/06/02 10:34:24.000.522,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2020/06/03 17:25:05.000.147,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.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\Unit1.pas=E:\svn\Delphi\ProScan\BL\BlPallet.pas + 2020/06/11 13:42:37.000.605,E:\svn\Delphi\ProScan\BL\BlPallet.pas=E:\svn\Delphi\ProScan\Unit1.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.pas=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/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\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: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: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\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/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\UI\OnvolledigeToeleveringScherm.dfm=E:\svn\Delphi\ProScan\Unit1.dfm 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.pas=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/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.pas=E:\svn\Delphi\ProScan\WS\AfdrukService.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: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.pas=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/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.pas=E:\svn\Delphi\ProScan\WS\DnaCodeService.pas + 2020/07/30 14:52:50.000.983,E:\svn\Delphi\ProScan\WS\DnaCodeService.pas=E:\svn\Delphi\ProScan\WS.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.pas=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/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.pas=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 + 2021/01/22 11:58:29.860,=E:\svn\Delphi\ProScan\WS.pas @@ -210,5 +211,6 @@ + Index: ProScan/ProScan.dproj =================================================================== diff -u -r512 -r531 --- ProScan/ProScan.dproj (.../ProScan.dproj) (revision 512) +++ ProScan/ProScan.dproj (.../ProScan.dproj) (revision 531) @@ -71,7 +71,7 @@ true - displaymode=desktop server=cacheaccept2010 + displaymode=desktop server=localhost ProScan_Icon.ico true 1033