shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

29259328

Browse Source
This commit is contained in:
Stefan Hutter
2025-03-28 16:02:52 +01:00
parent e0d3dbbbff
commit c0bf4774b5
364 changed files with 1751 additions and 83539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
Client/Versandstrasse/Versandstrasse.Designer.cs generated
View File

@@ -30,10 +30,10 @@
{
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings1 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings1 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings4 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings4 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse));
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings1 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings4 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
this.treeViewAdv1 = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnDruckPaketNew = new System.Windows.Forms.ToolStripButton();
@@ -47,7 +47,6 @@
this.btnPrepare = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.treeViewAdvAdresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv();
this.label1 = new System.Windows.Forms.Label();
this.chkGAS = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.rbb1post = new System.Windows.Forms.RadioButton();
@@ -63,6 +62,7 @@
this.panel3 = new System.Windows.Forms.Panel();
this.panelPrepare = new System.Windows.Forms.Panel();
this.label4 = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.treeViewAdv1)).BeginInit();
this.toolStrip1.SuspendLayout();
this.GrpPaketDetails.SuspendLayout();
@@ -104,7 +104,7 @@
this.treeViewAdv1.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(732, 0);
this.treeViewAdv1.HelpTextControl.Name = "helpText";
this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(58, 18);
this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(49, 15);
this.treeViewAdv1.HelpTextControl.TabIndex = 0;
this.treeViewAdv1.HelpTextControl.Text = "help text";
this.treeViewAdv1.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
@@ -139,7 +139,7 @@
this.treeViewAdv1.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(642, 0);
this.treeViewAdv1.ToolTipControl.Name = "toolTip";
this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(51, 18);
this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(41, 15);
this.treeViewAdv1.ToolTipControl.TabIndex = 1;
this.treeViewAdv1.ToolTipControl.Text = "toolTip";
this.treeViewAdv1.TransparentControls = true;
@@ -169,7 +169,7 @@
this.tsbtnDruckPaketNew.Image = global::OnDoc.Properties.Resources.add_32x32_32;
this.tsbtnDruckPaketNew.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnDruckPaketNew.Name = "tsbtnDruckPaketNew";
this.tsbtnDruckPaketNew.Size = new System.Drawing.Size(153, 43);
this.tsbtnDruckPaketNew.Size = new System.Drawing.Size(127, 43);
this.tsbtnDruckPaketNew.Text = "Neues Druckpaket";
this.tsbtnDruckPaketNew.Click += new System.EventHandler(this.tsbtnDruckPaketNew_Click);
//
@@ -178,14 +178,14 @@
this.tsbtnVersenden.Image = global::OnDoc.Properties.Resources.Letter_24x24_32;
this.tsbtnVersenden.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnVersenden.Name = "tsbtnVersenden";
this.tsbtnVersenden.Size = new System.Drawing.Size(306, 43);
this.tsbtnVersenden.Size = new System.Drawing.Size(248, 43);
this.tsbtnVersenden.Text = "Dokumente an Versandstrasse übergeben";
this.tsbtnVersenden.Visible = false;
//
// tscheckboxpreview
//
this.tscheckboxpreview.Name = "tscheckboxpreview";
this.tscheckboxpreview.Size = new System.Drawing.Size(256, 43);
this.tscheckboxpreview.Size = new System.Drawing.Size(205, 43);
this.tscheckboxpreview.Text = "Vorschau aufbereitete Dokumente";
//
// GrpPaketDetails
@@ -195,22 +195,23 @@
this.GrpPaketDetails.Controls.Add(this.groupBox3);
this.GrpPaketDetails.Controls.Add(this.groupBox1);
this.GrpPaketDetails.Controls.Add(this.button1);
this.GrpPaketDetails.Dock = System.Windows.Forms.DockStyle.Fill;
this.GrpPaketDetails.Dock = System.Windows.Forms.DockStyle.Left;
this.GrpPaketDetails.Location = new System.Drawing.Point(0, 0);
this.GrpPaketDetails.Name = "GrpPaketDetails";
this.GrpPaketDetails.Size = new System.Drawing.Size(566, 493);
this.GrpPaketDetails.Size = new System.Drawing.Size(446, 493);
this.GrpPaketDetails.TabIndex = 9;
this.GrpPaketDetails.TabStop = false;
this.GrpPaketDetails.Text = "Details zum Druckpaket";
//
// panelVerify
//
this.panelVerify.Controls.Add(this.button2);
this.panelVerify.Controls.Add(this.label3);
this.panelVerify.Controls.Add(this.label2);
this.panelVerify.Controls.Add(this.btnSendFinal);
this.panelVerify.Location = new System.Drawing.Point(27, 386);
this.panelVerify.Location = new System.Drawing.Point(9, 386);
this.panelVerify.Name = "panelVerify";
this.panelVerify.Size = new System.Drawing.Size(405, 100);
this.panelVerify.Size = new System.Drawing.Size(431, 100);
this.panelVerify.TabIndex = 6;
this.panelVerify.Visible = false;
//
@@ -219,7 +220,7 @@
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(4, 17);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(176, 16);
this.label3.Size = new System.Drawing.Size(141, 13);
this.label3.TabIndex = 7;
this.label3.Text = "der Druckaufgrag ausgelöst.";
//
@@ -228,7 +229,7 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(4, 4);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(379, 16);
this.label2.Size = new System.Drawing.Size(310, 13);
this.label2.TabIndex = 6;
this.label2.Text = "Das aufbereitete PDF prüfen. Sofern \"geprüft\" betätigt wird, wird";
//
@@ -236,36 +237,34 @@
//
this.btnSendFinal.BackColor = System.Drawing.Color.YellowGreen;
this.btnSendFinal.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnSendFinal.Location = new System.Drawing.Point(106, 62);
this.btnSendFinal.Location = new System.Drawing.Point(232, 62);
this.btnSendFinal.Name = "btnSendFinal";
this.btnSendFinal.Size = new System.Drawing.Size(196, 35);
this.btnSendFinal.TabIndex = 5;
this.btnSendFinal.Text = " Definitiv versenden";
this.btnSendFinal.Text = "Unwiderruflich versenden";
this.btnSendFinal.UseVisualStyleBackColor = false;
this.btnSendFinal.Click += new System.EventHandler(this.btnSendFinal_Click);
//
// btnPrepare
//
this.btnPrepare.Location = new System.Drawing.Point(256, 337);
this.btnPrepare.Location = new System.Drawing.Point(6, 337);
this.btnPrepare.Name = "btnPrepare";
this.btnPrepare.Size = new System.Drawing.Size(181, 23);
this.btnPrepare.TabIndex = 4;
this.btnPrepare.Text = "Prüfen";
this.btnPrepare.Text = "Versand-Paket püfen";
this.btnPrepare.UseVisualStyleBackColor = true;
this.btnPrepare.Click += new System.EventHandler(this.btnSend_Click);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.treeViewAdvAdresse);
this.groupBox3.Controls.Add(this.label1);
this.groupBox3.Controls.Add(this.chkGAS);
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox3.Location = new System.Drawing.Point(3, 79);
this.groupBox3.Location = new System.Drawing.Point(3, 77);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(560, 254);
this.groupBox3.Size = new System.Drawing.Size(440, 254);
this.groupBox3.TabIndex = 2;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Rückantwort";
//
// treeViewAdvAdresse
//
@@ -290,7 +289,7 @@
this.treeViewAdvAdresse.HelpTextControl.TabIndex = 0;
this.treeViewAdvAdresse.HelpTextControl.Visible = true;
this.treeViewAdvAdresse.InactiveSelectedNodeForeColor = System.Drawing.SystemColors.ControlText;
this.treeViewAdvAdresse.Location = new System.Drawing.Point(17, 55);
this.treeViewAdvAdresse.Location = new System.Drawing.Point(6, 44);
this.treeViewAdvAdresse.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeViewAdvAdresse.Name = "treeViewAdvAdresse";
this.treeViewAdvAdresse.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
@@ -311,23 +310,14 @@
this.treeViewAdvAdresse.AfterSelect += new System.EventHandler(this.treeViewAdvAdresse_AfterSelect);
this.treeViewAdvAdresse.NodeMouseClick += new Syncfusion.Windows.Forms.Tools.TreeNodeAdvMouseClickArgs(this.treeViewAdvAdresse_NodeMouseClick);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(14, 41);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(130, 16);
this.label1.TabIndex = 2;
this.label1.Text = "Rückantwortadresse";
//
// chkGAS
//
this.chkGAS.AutoSize = true;
this.chkGAS.Location = new System.Drawing.Point(17, 21);
this.chkGAS.Location = new System.Drawing.Point(3, 21);
this.chkGAS.Name = "chkGAS";
this.chkGAS.Size = new System.Drawing.Size(134, 20);
this.chkGAS.Size = new System.Drawing.Size(178, 17);
this.chkGAS.TabIndex = 0;
this.chkGAS.Text = "GAS-Rückantwort";
this.chkGAS.Text = "Frankiertes Rückantowrtcouvert";
this.chkGAS.UseVisualStyleBackColor = true;
this.chkGAS.CheckedChanged += new System.EventHandler(this.chkGAS_CheckedChanged);
//
@@ -340,20 +330,20 @@
this.groupBox1.Controls.Add(this.rbversandoption2);
this.groupBox1.Controls.Add(this.rbversandoption1);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.Location = new System.Drawing.Point(3, 18);
this.groupBox1.Location = new System.Drawing.Point(3, 16);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(560, 61);
this.groupBox1.Size = new System.Drawing.Size(440, 61);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Versandoptionen";
this.groupBox1.Text = "Versandart";
//
// rbb1post
//
this.rbb1post.AutoSize = true;
this.rbb1post.Checked = true;
this.rbb1post.Location = new System.Drawing.Point(6, 21);
this.rbb1post.Location = new System.Drawing.Point(74, 21);
this.rbb1post.Name = "rbb1post";
this.rbb1post.Size = new System.Drawing.Size(75, 20);
this.rbb1post.Size = new System.Drawing.Size(62, 17);
this.rbb1post.TabIndex = 5;
this.rbb1post.TabStop = true;
this.rbb1post.Text = "B1-Post";
@@ -363,9 +353,9 @@
// rbb2post
//
this.rbb2post.AutoSize = true;
this.rbb2post.Location = new System.Drawing.Point(83, 21);
this.rbb2post.Location = new System.Drawing.Point(6, 21);
this.rbb2post.Name = "rbb2post";
this.rbb2post.Size = new System.Drawing.Size(75, 20);
this.rbb2post.Size = new System.Drawing.Size(62, 17);
this.rbb2post.TabIndex = 4;
this.rbb2post.Text = "B2-Post";
this.rbb2post.UseVisualStyleBackColor = true;
@@ -376,7 +366,7 @@
this.rbversandoption3.AutoSize = true;
this.rbversandoption3.Location = new System.Drawing.Point(222, 21);
this.rbversandoption3.Name = "rbversandoption3";
this.rbversandoption3.Size = new System.Drawing.Size(259, 20);
this.rbversandoption3.Size = new System.Drawing.Size(207, 17);
this.rbversandoption3.TabIndex = 2;
this.rbversandoption3.Text = "Hauptadresse, Postversand erzwingen";
this.rbversandoption3.UseVisualStyleBackColor = true;
@@ -385,9 +375,9 @@
// rbapost
//
this.rbapost.AutoSize = true;
this.rbapost.Location = new System.Drawing.Point(160, 21);
this.rbapost.Location = new System.Drawing.Point(142, 21);
this.rbapost.Name = "rbapost";
this.rbapost.Size = new System.Drawing.Size(260, 20);
this.rbapost.Size = new System.Drawing.Size(211, 17);
this.rbapost.TabIndex = 3;
this.rbapost.Text = "A-Post (Versand tagfertig bis 16:00 Uhr)";
this.rbapost.UseVisualStyleBackColor = true;
@@ -398,7 +388,7 @@
this.rbversandoption2.AutoSize = true;
this.rbversandoption2.Location = new System.Drawing.Point(222, 21);
this.rbversandoption2.Name = "rbversandoption2";
this.rbversandoption2.Size = new System.Drawing.Size(245, 20);
this.rbversandoption2.Size = new System.Drawing.Size(197, 17);
this.rbversandoption2.TabIndex = 1;
this.rbversandoption2.Text = "Hauptadresse, E-Banking erzwingen";
this.rbversandoption2.UseVisualStyleBackColor = true;
@@ -409,7 +399,7 @@
this.rbversandoption1.AutoSize = true;
this.rbversandoption1.Location = new System.Drawing.Point(222, 21);
this.rbversandoption1.Name = "rbversandoption1";
this.rbversandoption1.Size = new System.Drawing.Size(208, 20);
this.rbversandoption1.Size = new System.Drawing.Size(166, 17);
this.rbversandoption1.TabIndex = 0;
this.rbversandoption1.Text = "Hauptadresse und Versandart";
this.rbversandoption1.UseVisualStyleBackColor = true;
@@ -437,30 +427,30 @@
this.pdfViewerControl1.IsTextSearchEnabled = true;
this.pdfViewerControl1.IsTextSelectionEnabled = true;
this.pdfViewerControl1.Location = new System.Drawing.Point(0, 0);
messageBoxSettings1.EnableNotification = true;
this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings1;
messageBoxSettings4.EnableNotification = true;
this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings4;
this.pdfViewerControl1.MinimumZoomPercentage = 50;
this.pdfViewerControl1.Name = "pdfViewerControl1";
this.pdfViewerControl1.PageBorderThickness = 1;
pdfViewerPrinterSettings1.Copies = 1;
pdfViewerPrinterSettings1.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings1.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings1.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings1.PrintLocation")));
pdfViewerPrinterSettings1.ShowPrintStatusDialog = true;
this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings1;
pdfViewerPrinterSettings4.Copies = 1;
pdfViewerPrinterSettings4.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings4.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings4.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings4.PrintLocation")));
pdfViewerPrinterSettings4.ShowPrintStatusDialog = true;
this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings4;
this.pdfViewerControl1.ReferencePath = null;
this.pdfViewerControl1.ScrollDisplacementValue = 0;
this.pdfViewerControl1.ShowHorizontalScrollBar = true;
this.pdfViewerControl1.ShowToolBar = true;
this.pdfViewerControl1.ShowVerticalScrollBar = true;
this.pdfViewerControl1.Size = new System.Drawing.Size(437, 493);
this.pdfViewerControl1.Size = new System.Drawing.Size(554, 493);
this.pdfViewerControl1.SpaceBetweenPages = 8;
this.pdfViewerControl1.TabIndex = 10;
this.pdfViewerControl1.Text = "pdfViewerControl1";
textSearchSettings1.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings1.HighlightAllInstance = true;
textSearchSettings1.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl1.TextSearchSettings = textSearchSettings1;
textSearchSettings4.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings4.HighlightAllInstance = true;
textSearchSettings4.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl1.TextSearchSettings = textSearchSettings4;
this.pdfViewerControl1.ThemeName = "Default";
this.pdfViewerControl1.VerticalScrollOffset = 0;
this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
@@ -481,23 +471,23 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Left;
this.panel2.Location = new System.Drawing.Point(550, 48);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(566, 493);
this.panel2.Size = new System.Drawing.Size(449, 493);
this.panel2.TabIndex = 12;
//
// panel3
//
this.panel3.Controls.Add(this.pdfViewerControl1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(1116, 48);
this.panel3.Location = new System.Drawing.Point(999, 48);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(437, 493);
this.panel3.Size = new System.Drawing.Size(554, 493);
this.panel3.TabIndex = 13;
//
// panelPrepare
//
this.panelPrepare.BackColor = System.Drawing.Color.Silver;
this.panelPrepare.Controls.Add(this.label4);
this.panelPrepare.Location = new System.Drawing.Point(360, 155);
this.panelPrepare.Location = new System.Drawing.Point(384, 139);
this.panelPrepare.Name = "panelPrepare";
this.panelPrepare.Size = new System.Drawing.Size(832, 94);
this.panelPrepare.TabIndex = 14;
@@ -509,10 +499,20 @@
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(19, 34);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(525, 25);
this.label4.Size = new System.Drawing.Size(437, 20);
this.label4.TabIndex = 0;
this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten....";
//
// button2
//
this.button2.Location = new System.Drawing.Point(3, 68);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(123, 23);
this.button2.TabIndex = 7;
this.button2.Text = "Abbrechen";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// Versandstrasse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -561,7 +561,6 @@
private System.Windows.Forms.RadioButton rbversandoption2;
private System.Windows.Forms.RadioButton rbversandoption1;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox chkGAS;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.RadioButton rbb2post;
@@ -580,5 +579,6 @@
private System.Windows.Forms.Panel panelVerify;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button button2;
}
}

33
Client/Versandstrasse/Versandstrasse.cs
View File

@@ -261,7 +261,7 @@ namespace OnDoc.Versandstrasse
{
Versandpaket newpaket = new Versandpaket();
newpaket.PaketNr= (treeViewAdv1.Nodes.Count + 1).ToString();
newpaket.Versandoption = "B1";
newpaket.Versandoption = "B2_POST";
newpaket.GAS = "";
newpaket.GASAdresse = "";
newpaket.Mitteilung = "";
@@ -414,7 +414,18 @@ namespace OnDoc.Versandstrasse
vd.dokument = node.TagObject.ToString();
vd.inteintragnr = Convert.ToInt32(_newDataTable.Rows[0]["inteintragnr"].ToString());
svp.Dokument.Add(vd);
send_vs(ref svp);
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@tgnummer", AppParams.currenttgnummer);
db.add_parameter("@partnernr", svp.partnernr.ToString());
db.add_parameter("@gasadresse", svp.GASAdresse);
db.add_parameter("@versandoption", svp.Versandoption);
db.add_parameter("@dokumente", node.Text+" / "+sb.serienbriefnr.ToString()+"_"+_newDataTable.Rows[0]["inteintragnr"].ToString());
db.Get_Tabledata("Ondoc_Insert_Versandprotokoll", true, false);
svp.protokollid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
db = null;
send_vs(ref svp,false);
}
return;
}
@@ -451,6 +462,7 @@ namespace OnDoc.Versandstrasse
db.add_parameter("@versandoption", vp.Versandoption);
db.add_parameter("@dokumente", dokumente);
db.Get_Tabledata("Ondoc_Insert_Versandprotokoll", true, false);
vp.protokollid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
db = null;
send_vs(ref vp);
@@ -507,9 +519,9 @@ namespace OnDoc.Versandstrasse
private void rbapost_CheckedChanged(object sender, EventArgs e)
{
string versandoption = "";
if (rbapost.Checked) { versandoption = "A"; }
if (rbb1post.Checked) { versandoption = "B1"; }
if (rbb2post.Checked) { versandoption = "B2"; }
if (rbapost.Checked) { versandoption = "A_POST"; }
if (rbb1post.Checked) { versandoption = "B1_POST"; }
if (rbb2post.Checked) { versandoption = "B2_POST"; }
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket; ;
vp.Versandoption = versandoption;
@@ -555,11 +567,11 @@ namespace OnDoc.Versandstrasse
switch (paket.Versandoption)
{
case "A":
case "A_POST":
rbapost.Checked = true; break;
case "B1":
case "B1_POST":
rbb1post.Checked = true; break;
case "B2":
case "B2_POST":
rbb2post.Checked = true; break;
default:
rbb2post.Checked = true; break;
@@ -604,5 +616,10 @@ namespace OnDoc.Versandstrasse
GrpPaketDetails.Enabled = false;
}
}
private void button2_Click(object sender, EventArgs e)
{
panelVerify.Visible = false;
}
}
}

2
Client/Versandstrasse/Versandstrasse.resx
View File

@@ -120,7 +120,7 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="pdfViewerPrinterSettings1.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<data name="pdfViewerPrinterSettings4.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh