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

Update 20260514

Browse Source
This commit is contained in:
Stefan Hutter
2026-05-14 10:49:27 +02:00
parent d3d7b06872
commit 83a0703324
247 changed files with 900388 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/Versandstrasse/Versandstrasse.cs
+42 -7
View File
@@ -382,9 +382,10 @@ namespace OnDoc.Versandstrasse
}
}
int doccount = 0;
foreach (TreeNodeAdv dokumentnode in node.Nodes)
{
doccount = doccount + 1;
if (dokumentnode.Tag.ToString().Contains("ATT"))
{
hastattachment = true;
@@ -407,7 +408,26 @@ namespace OnDoc.Versandstrasse
// anzbp = anzbp + 1;
//}
//Versandstrasse möglich
////Versandstrasse möglich
//rbb1post.Enabled = true;
//rbb2post.Enabled = true;
//rbapost.Enabled = true;
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) == 5 && nodecounter == 0)
{
forceeinschreiben = true;
}
if (forceeinschreiben == false && Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) == 5 && nodecounter > 0)
{
// set_nodeimage(dokumentnode, 0);
add_errormessage(4, "Im Versand-Couvert liegt ein Dokument, welches als EINSCHREIBEN versendet wird, jedoch nicht an erster Position ist.");
versandbereit = false;
}
// rbb1post.Enabled = false;
// rbb2post.Enabled = false;
// rbapost.Enabled = false;
// rbb2post.Checked = false;
//
//}
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0)
{
set_nodeimage(dokumentnode, 0);
@@ -416,7 +436,7 @@ namespace OnDoc.Versandstrasse
}
else
{
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) > 1)
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) > 1 && Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Postzustellung"]) != 5)
{
set_nodeimage(dokumentnode, 2);
versandbereit = false;
@@ -1332,24 +1352,31 @@ namespace OnDoc.Versandstrasse
catch { }
}
bool forceeinschreiben = false;
private void treeViewAdv1_AfterSelect(object sender, EventArgs e)
{
try
{
this.panelVerify.Visible = false;
Cursor.Current = Cursors.WaitCursor;
TreeNodeAdv node = treeViewAdv1.SelectedNode;
if (node.Level == 1)
{
forceeinschreiben = false;
if (Verify_Couvert(node) == false)
{
GrpPaketDetails.Enabled = false;
return;
}
GrpPaketDetails.Enabled = true;
Versandpaket paket = node.TagObject as Versandpaket; ;
if (forceeinschreiben) { rbeinschreiben.Checked = true; }
rbapost.Enabled = true;
rbb1post.Enabled = true;
rbb2post.Enabled = true;
switch (paket.Versandoption)
{
case "A_POST":
@@ -1359,11 +1386,19 @@ namespace OnDoc.Versandstrasse
case "B2_POST":
rbb2post.Checked = true; break;
case "EINSCHREIBEN":
rbeinschreiben.Checked = true;break;
rbeinschreiben.Checked = true;
if (forceeinschreiben)
{
rbapost.Enabled = false;
rbb1post.Enabled = false;
rbb2post.Enabled = false;
}
break;
default:
rbb2post.Checked = true; break;
}
if (paket.GAS != "")
{