update 20250728

This commit is contained in:
Stefan Hutter
2025-07-28 18:45:01 +02:00
parent 2237be483d
commit e33c7ede5b
65 changed files with 436 additions and 212 deletions

View File

@@ -117,7 +117,20 @@ namespace OnDoc.Versandstrasse
private void Versandstrasse_Load(object sender, EventArgs e)
{
if (Properties.Settings.Default.GASSize == "True")
{
this.label5.Visible = false;
this.pnlcouvertgroesse.Visible = true;
this.pnlcouvertgroesse.Enabled= false;
this.rbc5mini.Checked = true;
this.rbc5normal.Checked = false;
}
else
{
this.label5.Visible = true;
this.pnlcouvertgroesse.Visible = false;
}
Reload_Tree();
load_adressen();
@@ -677,6 +690,7 @@ namespace OnDoc.Versandstrasse
newpaket.Versandoption = "B2_POST";
newpaket.GAS = "";
newpaket.GASAdresse = "";
newpaket.GASSize = "";
newpaket.Mitteilung = "";
newpaket.Dokument = new List<Versanddokument>();
@@ -857,6 +871,7 @@ namespace OnDoc.Versandstrasse
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
vp.GAS = "1";
treeViewAdv1.SelectedNode.TagObject = vp;
this.pnlcouvertgroesse.Enabled = true;
}
else
{
@@ -865,6 +880,7 @@ namespace OnDoc.Versandstrasse
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
vp.GAS = "";
treeViewAdv1.SelectedNode.TagObject = vp;
this.pnlcouvertgroesse.Enabled = false;
}
}
@@ -883,9 +899,18 @@ namespace OnDoc.Versandstrasse
if (serienbrief)
{
Versandpaket svp = treeViewAdv1.Nodes[0].TagObject as Versandpaket;
if (Properties.Settings.Default.GASSize == "True")
{
if (rbc5mini.Checked) { svp.GASSize = "C5mini"; }
if (rbc5normal.Checked) { svp.GASSize = "C5normal"; }
}
else
{
svp.GASSize = "";
}
foreach (TreeNodeAdv node in treeViewAdv1.Nodes[0].Nodes)
{
svp.finaldoc = node.TagObject.ToString();
svp.send_onbase_doc = true;
string dokumentid = node.Text.Substring(node.Text.Length-23, 22);
@@ -932,6 +957,15 @@ namespace OnDoc.Versandstrasse
panelVerify.Visible = false;
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
List<Versanddokument> vdl = new List<Versanddokument>();
if (Properties.Settings.Default.GASSize == "True")
{
if (rbc5mini.Checked) { vp.GASSize = "C5mini"; }
if (rbc5normal.Checked) { vp.GASSize = "C5normal"; }
}
else
{
vp.GASSize = "";
}
foreach (TreeNodeAdv node in treeViewAdv1.SelectedNode.Nodes)
{
foreach(Versanddokument vdok in vp.Dokument)
@@ -1442,6 +1476,7 @@ namespace OnDoc.Versandstrasse
newpaket.Versandoption = "B2_POST";
newpaket.GAS = "";
newpaket.GASAdresse = "";
newpaket.GASSize = "";
newpaket.Mitteilung = "";
newpaket.Dokument = new List<Versanddokument>();
@@ -1563,6 +1598,7 @@ namespace OnDoc.Versandstrasse
vp.Mitteilung = "";
vp.GAS = "";
vp.GASAdresse = "";
vp.GASSize = "";
vp.PaketNr = Guid.NewGuid().ToString();
vp.Dokument.Add(vs);