Index: PlanScan/PlanScan.identcache
===================================================================
diff -u -r481 -r625
Binary files differ
Index: PlanScan/WS/Agent.pas
===================================================================
diff -u -r483 -r625
--- PlanScan/WS/Agent.pas (.../Agent.pas) (revision 483)
+++ PlanScan/WS/Agent.pas (.../Agent.pas) (revision 625)
@@ -37,7 +37,7 @@
function ZoekViaOrdernummer(Ordernummer: string): ZoekViaOrdernummerResponse;
function ZoekViaBatchId(BatchId: string): ZoekViaBatchResponse;
function BewerkKlantinstellingen(Actie: string; KlantId: string; IsExport: boolean; WegwerpPallet: boolean; MeerdereToeleveringen: boolean): BewerkKlantinstellingenResponse;
- function ProboxEtiketAfdrukken(DnaCodesStringList: TStringList): AfdrukService.ProboxEtiketAfdrukkenResponse;
+ function ProboxEtiketAfdrukken(DnaCodesStringList: TStringList; LijnWaaropGeprintMoetWorden: string): AfdrukService.ProboxEtiketAfdrukkenResponse;
function KlantEtiketAfdrukken(DnaCodesStringList: TStringList): KlantEtiketAfdrukkenResponse;
function ProductEtiketAfdrukken(DnaCodesStringList: TStringList): ProductEtiketAfdrukkenResponse;
end;
@@ -412,7 +412,7 @@
end;
end;
-function TAgent.ProboxEtiketAfdrukken(DnaCodesStringList: TStringList): AfdrukService.ProboxEtiketAfdrukkenResponse;
+function TAgent.ProboxEtiketAfdrukken(DnaCodesStringList: TStringList; LijnWaaropGeprintMoetWorden: string): AfdrukService.ProboxEtiketAfdrukkenResponse;
var
Header: AfdrukService.RequestHeader;
fProboxEtiketAfdrukkenRequest: AfdrukService.ProboxEtiketAfdrukkenRequest;
@@ -436,6 +436,7 @@
end;
fProboxEtiketAfdrukkenRequest.DnaCodes := DnaCodesArray;
+ fProboxEtiketAfdrukkenRequest.LijnWaaropGeprintMoetWorden := LijnWaaropGeprintMoetWorden;
result := fAfdrukServiceSoap.ProboxEtiketAfdrukken(fProboxEtiketAfdrukkenRequest);
finally
Index: PlanScan/PlanScan.dproj
===================================================================
diff -u -r495 -r625
--- PlanScan/PlanScan.dproj (.../PlanScan.dproj) (revision 495)
+++ PlanScan/PlanScan.dproj (.../PlanScan.dproj) (revision 625)
@@ -73,7 +73,7 @@
true
PlanScan_Icon.ico
1033
- server=cache01
+ server=tve-w10
false
@@ -117,8 +117,12 @@
dfm
-
+
+
+ dfm
+
+
Cfg_2
Index: PlanScan/PlanScan.dpr
===================================================================
diff -u -r468 -r625
--- PlanScan/PlanScan.dpr (.../PlanScan.dpr) (revision 468)
+++ PlanScan/PlanScan.dpr (.../PlanScan.dpr) (revision 625)
@@ -17,8 +17,9 @@
frameKlantinstellingen in 'UI\frameKlantinstellingen.pas' {frmKlantinstellingen: TFrame},
KlantinstellingenDetailScherm in 'UI\KlantinstellingenDetailScherm.pas' {fmKlantinstellingenDetail},
GebruikerService in 'WS\GebruikerService.pas',
- AfdrukService in 'WS\AfdrukService.pas',
- DnaCodeService in 'WS\DnaCodeService.pas';
+ DnaCodeService in 'WS\DnaCodeService.pas',
+ ProboxPrinterKeuze in 'UI\ProboxPrinterKeuze.pas' {formProboxPrinterKeuze},
+ AfdrukService in 'WS\AfdrukService.pas';
{$R *.res}
@@ -29,5 +30,6 @@
Application.CreateForm(TfmMain, fmMain);
Application.CreateForm(TfmLogin, fmLogin);
Application.CreateForm(TfmKlantinstellingenDetail, fmKlantinstellingenDetail);
+ Application.CreateForm(TformProboxPrinterKeuze, formProboxPrinterKeuze);
Application.Run;
end.
Index: PlanScan/UI/ProboxPrinterKeuze.pas
===================================================================
diff -u
--- PlanScan/UI/ProboxPrinterKeuze.pas (revision 0)
+++ PlanScan/UI/ProboxPrinterKeuze.pas (revision 625)
@@ -0,0 +1,74 @@
+unit ProboxPrinterKeuze;
+
+interface
+
+uses
+ Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
+ Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls;
+
+type
+ TformProboxPrinterKeuze = class(TForm)
+ Label1: TLabel;
+ btnStandaard: TButton;
+ btnLijn1: TButton;
+ btnLijn2: TButton;
+ btnLijn3: TButton;
+ btnLijn4: TButton;
+ btnTaor: TButton;
+ btnBewerkingscenter: TButton;
+ procedure btnStandaardClick(Sender: TObject);
+ procedure btnLijn1Click(Sender: TObject);
+ procedure btnLijn2Click(Sender: TObject);
+ procedure btnLijn3Click(Sender: TObject);
+ procedure btnLijn4Click(Sender: TObject);
+ procedure btnTaorClick(Sender: TObject);
+ procedure btnBewerkingscenterClick(Sender: TObject);
+ private
+ { Private declarations }
+ public
+ Lijn: string;
+ end;
+
+var
+ formProboxPrinterKeuze: TformProboxPrinterKeuze;
+
+implementation
+
+{$R *.dfm}
+
+procedure TformProboxPrinterKeuze.btnLijn1Click(Sender: TObject);
+begin
+ Lijn := '1';
+end;
+
+procedure TformProboxPrinterKeuze.btnLijn2Click(Sender: TObject);
+begin
+ Lijn := '2';
+end;
+
+procedure TformProboxPrinterKeuze.btnStandaardClick(Sender: TObject);
+begin
+ Lijn := '';
+end;
+
+procedure TformProboxPrinterKeuze.btnLijn3Click(Sender: TObject);
+begin
+ Lijn := '3';
+end;
+
+procedure TformProboxPrinterKeuze.btnLijn4Click(Sender: TObject);
+begin
+ Lijn := '4';
+end;
+
+procedure TformProboxPrinterKeuze.btnTaorClick(Sender: TObject);
+begin
+ Lijn := 'TAOR';
+end;
+
+procedure TformProboxPrinterKeuze.btnBewerkingscenterClick(Sender: TObject);
+begin
+ Lijn := 'BewerkingsCenter';
+end;
+
+end.
Index: PlanScan/WS/AfdrukService.pas
===================================================================
diff -u -r457 -r625
--- PlanScan/WS/AfdrukService.pas (.../AfdrukService.pas) (revision 457)
+++ PlanScan/WS/AfdrukService.pas (.../AfdrukService.pas) (revision 625)
@@ -5,7 +5,7 @@
// >Import : http://tve-w10:57772/csp/dev1/WS.Halux.AAP.AfdrukService.CLS?WSDL=1>0
// Encoding : UTF-8
// Version : 1.0
-// (14/07/2020 14:42:34 - - $Rev: 45757 $)
+// (24/09/2021 11:44:37 - - $Rev: 45757 $)
// ************************************************************************ //
unit AfdrukService;
@@ -119,11 +119,16 @@
private
FHeader: RequestHeader;
FDnaCodes: ArrayOfStringString;
+ FLijnWaaropGeprintMoetWorden: String_;
+ FLijnWaaropGeprintMoetWorden_Specified: boolean;
+ procedure SetLijnWaaropGeprintMoetWorden(Index: Integer; const AString_: String_);
+ function LijnWaaropGeprintMoetWorden_Specified(Index: Integer): boolean;
public
destructor Destroy; override;
published
- property Header: RequestHeader read FHeader write FHeader;
- property DnaCodes: ArrayOfStringString Index (IS_UNBD) read FDnaCodes write FDnaCodes;
+ property Header: RequestHeader read FHeader write FHeader;
+ property DnaCodes: ArrayOfStringString Index (IS_UNBD) read FDnaCodes write FDnaCodes;
+ property LijnWaaropGeprintMoetWorden: String_ Index (IS_OPTN) read FLijnWaaropGeprintMoetWorden write SetLijnWaaropGeprintMoetWorden stored LijnWaaropGeprintMoetWorden_Specified;
end;
@@ -265,6 +270,17 @@
inherited Destroy;
end;
+procedure ProboxEtiketAfdrukkenRequest.SetLijnWaaropGeprintMoetWorden(Index: Integer; const AString_: String_);
+begin
+ FLijnWaaropGeprintMoetWorden := AString_;
+ FLijnWaaropGeprintMoetWorden_Specified := True;
+end;
+
+function ProboxEtiketAfdrukkenRequest.LijnWaaropGeprintMoetWorden_Specified(Index: Integer): boolean;
+begin
+ Result := FLijnWaaropGeprintMoetWorden_Specified;
+end;
+
destructor GeneriekeResponse.Destroy;
begin
SysUtils.FreeAndNil(FHeader);
Index: PlanScan/UI/ProboxPrinterKeuze.dfm
===================================================================
diff -u
--- PlanScan/UI/ProboxPrinterKeuze.dfm (revision 0)
+++ PlanScan/UI/ProboxPrinterKeuze.dfm (revision 625)
@@ -0,0 +1,102 @@
+object formProboxPrinterKeuze: TformProboxPrinterKeuze
+ Left = 0
+ Top = 0
+ ActiveControl = btnStandaard
+ Caption = 'Printerkeuze'
+ ClientHeight = 299
+ ClientWidth = 635
+ Color = clBtnFace
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'Tahoma'
+ Font.Style = []
+ OldCreateOrder = False
+ Position = poOwnerFormCenter
+ PixelsPerInch = 96
+ TextHeight = 13
+ object Label1: TLabel
+ Left = 182
+ Top = 26
+ Width = 271
+ Height = 16
+ Caption = 'Proboxinhoudetiket afdrukken op welke printer?'
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -13
+ Font.Name = 'Tahoma'
+ Font.Style = []
+ ParentFont = False
+ end
+ object btnStandaard: TButton
+ Left = 261
+ Top = 48
+ Width = 113
+ Height = 41
+ Caption = 'Standaard'
+ Default = True
+ ModalResult = 1
+ TabOrder = 0
+ OnClick = btnStandaardClick
+ end
+ object btnLijn1: TButton
+ Left = 72
+ Top = 120
+ Width = 113
+ Height = 41
+ Caption = 'Lijn 1'
+ ModalResult = 1
+ TabOrder = 1
+ OnClick = btnLijn1Click
+ end
+ object btnLijn2: TButton
+ Left = 200
+ Top = 120
+ Width = 113
+ Height = 41
+ Caption = 'Lijn 2'
+ ModalResult = 1
+ TabOrder = 2
+ OnClick = btnLijn2Click
+ end
+ object btnLijn3: TButton
+ Left = 328
+ Top = 120
+ Width = 113
+ Height = 41
+ Caption = 'Lijn 3'
+ ModalResult = 1
+ TabOrder = 3
+ OnClick = btnLijn3Click
+ end
+ object btnLijn4: TButton
+ Left = 459
+ Top = 120
+ Width = 113
+ Height = 41
+ Caption = 'Lijn 4'
+ ModalResult = 1
+ TabOrder = 4
+ OnClick = btnLijn4Click
+ end
+ object btnTaor: TButton
+ Left = 200
+ Top = 200
+ Width = 113
+ Height = 41
+ Caption = 'TAOR'
+ ModalResult = 1
+ TabOrder = 5
+ OnClick = btnTaorClick
+ end
+ object btnBewerkingscenter: TButton
+ Left = 328
+ Top = 200
+ Width = 113
+ Height = 41
+ Caption = 'Bewerkingscenter'
+ ModalResult = 1
+ TabOrder = 6
+ OnClick = btnBewerkingscenterClick
+ end
+end
Index: PlanScan/PlanScan.dproj.local
===================================================================
diff -u -r495 -r625
--- PlanScan/PlanScan.dproj.local (.../PlanScan.dproj.local) (revision 495)
+++ PlanScan/PlanScan.dproj.local (.../PlanScan.dproj.local) (revision 625)
@@ -31,8 +31,8 @@
2020/04/20 08:48:05.000.552,=E:\svn\Delphi\PlanScan\Unit1.pas
2020/04/20 08:48:21.000.787,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas
2020/04/20 08:48:21.000.787,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm
- 2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas=E:\svn\Delphi\PlanScan\UI\frameDnaCodes.pas
2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.dfm=E:\svn\Delphi\PlanScan\UI\frameDnaCodes.dfm
+ 2020/04/20 09:19:59.000.705,E:\svn\Delphi\PlanScan\UI\frmDnaCodes.pas=E:\svn\Delphi\PlanScan\UI\frameDnaCodes.pas
2020/04/20 09:21:17.000.241,=E:\svn\Delphi\PlanScan\Unit1.pas
2020/04/20 10:46:18.000.858,=E:\svn\Delphi\PlanScan\Unit1.pas
2020/04/20 10:49:21.000.229,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\frameGebruikers.pas
@@ -72,6 +72,12 @@
2020/07/30 14:51:51.000.877,=E:\svn\Delphi\PlanScan\WS.pas
2020/07/30 14:52:02.000.905,E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas=
2020/07/30 14:52:16.000.466,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\DnaCodeService.pas
+ 2021/09/24 10:48:36.000.362,=E:\svn\Delphi\PlanScan\Unit1.pas
+ 2021/09/24 10:59:10.000.156,E:\svn\Delphi\PlanScan\Unit1.pas=E:\svn\Delphi\PlanScan\UI\ProboxPrinterKeuze.pas
+ 2021/09/24 10:59:10.000.156,E:\svn\Delphi\PlanScan\Unit1.dfm=E:\svn\Delphi\PlanScan\UI\ProboxPrinterKeuze.dfm
+ 2021/09/24 11:44:37.000.779,=E:\svn\Delphi\PlanScan\WS.pas
+ 2021/09/24 11:44:49.000.937,E:\svn\Delphi\PlanScan\WS\AfdrukService.pas=
+ 2021/09/24 11:45:16.000.600,E:\svn\Delphi\PlanScan\WS.pas=E:\svn\Delphi\PlanScan\WS\AfdrukService.pas
@@ -87,12 +93,14 @@
+
+
-
+
Index: PlanScan/UI/frameDnaCodes.pas
===================================================================
diff -u -r544 -r625
--- PlanScan/UI/frameDnaCodes.pas (.../frameDnaCodes.pas) (revision 544)
+++ PlanScan/UI/frameDnaCodes.pas (.../frameDnaCodes.pas) (revision 625)
@@ -6,7 +6,7 @@
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes,
Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls,
Vcl.ExtCtrls, Vcl.Grids, Vcl.DBGrids, AfdrukService, DnaCodeService, Agent, Data.DB,
- Datasnap.DBClient, UiContext, typinfo, Vcl.Imaging.pngimage;
+ Datasnap.DBClient, UiContext, typinfo, Vcl.Imaging.pngimage, ProboxPrinterKeuze;
type
TfrmDnaCodes = class(TFrame)
@@ -128,9 +128,20 @@
var
DnaCodesStringList: TStringList;
fProboxAfdrukkenResponse: AfdrukService.ProboxEtiketAfdrukkenResponse;
+ fZoekViaDnaCodeResponse: ZoekViaDnaCodeResponse;
+ fProboxPrinterKeuze: TformProboxPrinterKeuze;
+ fPrinterWaaropAfgedruktMoetWorden: string;
begin
+ try
+ fProboxPrinterKeuze := TformProboxPrinterKeuze.Create(self);
+ fProboxPrinterKeuze.ShowModal();
+ fPrinterWaaropAfgedruktMoetWorden := fProboxPrinterKeuze.Lijn;
+ finally
+ fProboxPrinterKeuze.Free;
+ end;
+
DnaCodesStringList := GeefAlleDnaCodesUitGrid();
- fProboxAfdrukkenResponse := TAgent.Create(fmMain.UiContext).ProboxEtiketAfdrukken(DnaCodesStringList);
+ fProboxAfdrukkenResponse := TAgent.Create(fmMain.UiContext).ProboxEtiketAfdrukken(DnaCodesStringList, fPrinterWaaropAfgedruktMoetWorden);
try
if fProboxAfdrukkenResponse.Header.Status <> '200' then begin
ShowMessage(fProboxAfdrukkenResponse.Header.Omschrijving)