update 20250424
This commit is contained in:
Stefan Hutter
@@ -27,6 +27,8 @@ using Windows.Media.Streaming.Adaptive;
|
||||
using System.Data.SqlTypes;
|
||||
using NLog.LayoutRenderers.Wrappers;
|
||||
using System.Security.Cryptography;
|
||||
using Microsoft.SqlServer.Server;
|
||||
using System.Windows.Interop;
|
||||
|
||||
namespace OnDoc.Versandstrasse
|
||||
{
|
||||
@@ -126,6 +128,7 @@ namespace OnDoc.Versandstrasse
|
||||
lblprueftextSB.Text = db.dsdaten.Tables[0].Rows[1]["textblock"].ToString();
|
||||
lblprueftextsb2.Text = db.dsdaten.Tables[0].Rows[2]["textblock"].ToString();
|
||||
lblpostausgang.Text = db.dsdaten.Tables[0].Rows[3]["textblock"].ToString();
|
||||
lblserienbrief.Text = db.dsdaten.Tables[0].Rows[4]["textblock"].ToString();
|
||||
|
||||
lblpostausgang.MaximumSize = new Size(500, 60);
|
||||
db = null;
|
||||
@@ -138,6 +141,16 @@ namespace OnDoc.Versandstrasse
|
||||
this.pnlpostkorb.Visible = false;
|
||||
this.pnlpostkorb.Dock = DockStyle.Fill;
|
||||
this.pnlcouvert.Dock = DockStyle.Fill;
|
||||
if (!serienbrief)
|
||||
{
|
||||
lblpostausgang.Visible = true;
|
||||
this.lblpostausgang.Left = this.Width - lblpostausgang.Width;
|
||||
}
|
||||
else
|
||||
{
|
||||
lblserienbrief.Visible = true;
|
||||
this.lblserienbrief.Left = this.Width - lblserienbrief.Width;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -188,9 +201,9 @@ namespace OnDoc.Versandstrasse
|
||||
DB db = new DB(AppParams.connectionstring);
|
||||
for (int i = 0; i < pakete.Count; i++)
|
||||
{
|
||||
db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + pakete[i].partnernr.ToString(), false, true);
|
||||
db.Get_Tabledata("Select nrpar00, bkpar00 from partner where nrpar00=" + pakete[i].partnernr.ToString(), false, true);
|
||||
DruckJob = new TreeNodeAdv();
|
||||
DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString();
|
||||
DruckJob.Text = "Versand-Couvert - " + db.dsdaten.Tables[0].Rows[0][0].ToString()+ ", " + db.dsdaten.Tables[0].Rows[0][1].ToString();
|
||||
DruckJob.Tag = "Druckpaket";
|
||||
//pakete[i].partnernr = i;
|
||||
DruckJob.TagObject = pakete[i];
|
||||
@@ -228,15 +241,37 @@ namespace OnDoc.Versandstrasse
|
||||
}
|
||||
|
||||
string errormessage = "";
|
||||
private void add_errormessage(string message)
|
||||
System.Data.DataTable errormessages = new System.Data.DataTable();
|
||||
public class errormsg
|
||||
{
|
||||
if (errormessage.Trim() != "")
|
||||
public int number = 0;
|
||||
public string message = "";
|
||||
|
||||
public errormsg(int nr, string message)
|
||||
{
|
||||
errormessage = errormessage + Environment.NewLine +"- "+ message;
|
||||
}else { errormessage = "- "+message; }
|
||||
this.number = nr;
|
||||
this.message = message;
|
||||
}
|
||||
}
|
||||
List<errormsg> errors = new List<errormsg>();
|
||||
|
||||
private void add_errormessage(int nr, string message)
|
||||
|
||||
{
|
||||
|
||||
bool found = false;
|
||||
|
||||
foreach (errormsg ermsg in errors) {
|
||||
if (ermsg.number == nr) { found = true; break; }
|
||||
}
|
||||
if (!found)
|
||||
{
|
||||
errors.Add(new errormsg(nr, message));
|
||||
}
|
||||
}
|
||||
private bool Verify_Couvert(TreeNodeAdv node)
|
||||
{
|
||||
errors.Clear();
|
||||
|
||||
errormessage = "";
|
||||
lblerror.Visible = false;
|
||||
@@ -246,20 +281,30 @@ namespace OnDoc.Versandstrasse
|
||||
set_nodeimage(node, 1);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
DB db = new DB(AppParams.connectionstring);
|
||||
if (node.Nodes.Count > 0)
|
||||
{
|
||||
Versanddokument vd = node.Nodes[0].TagObject as Versanddokument;
|
||||
if (vd.Partnernr.ToString() != vp.partnernr.ToString())
|
||||
{
|
||||
db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM partner where nrpar00="+vd.Partnernr, false, true);
|
||||
node.Text = "Versand-Couvert" + " - " + db.dsdaten.Tables[0].Rows[0][0].ToString() + " " + db.dsdaten.Tables[0].Rows[0][1].ToString();
|
||||
vp.partnernr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
|
||||
}
|
||||
}
|
||||
if (vp.partnernr == 0 && node.Nodes.Count==1)
|
||||
{
|
||||
TreeNodeAdv tn = node.Nodes[0];
|
||||
db.Get_Tabledata("SELECT dbo.Partner.NRPAR00, dbo.Partner.BKPAR00 FROM dbo.dokument INNER JOIN dbo.Partner ON dbo.dokument.nrpar00 = dbo.Partner.NRPAR00 WHERE dbo.dokument.dokumentid='" + tn.Tag + "'", false, true);
|
||||
node.Text = node.Text + " - " + db.dsdaten.Tables[0].Rows[0][0].ToString() + " " + db.dsdaten.Tables[0].Rows[0][0].ToString();
|
||||
node.Text = node.Text + " - " + db.dsdaten.Tables[0].Rows[0][0].ToString() + " " + db.dsdaten.Tables[0].Rows[0][1].ToString();
|
||||
vp.partnernr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
|
||||
|
||||
}
|
||||
|
||||
if (chkGAS.Checked && txtadresse.Text == "")
|
||||
{
|
||||
add_errormessage("Keine Rückantowrtadresse gewählt");
|
||||
add_errormessage(7, "Für das Rückantwortcouvert wurde keine Adresse gewählt.");
|
||||
return false;
|
||||
}
|
||||
int currentbp = vp.partnernr;
|
||||
@@ -270,8 +315,7 @@ namespace OnDoc.Versandstrasse
|
||||
bool versandbereit = true;
|
||||
if (vp.partnernr > 99999999) {
|
||||
versandbereit = false;
|
||||
add_errormessage("Couvert muss für ein BP sein");
|
||||
|
||||
add_errormessage(6,"Im Versand-Couvert liegen ausschliesslich Personen-Dokumente. Der Versand braucht technisch ein BP-Dokument.");
|
||||
}
|
||||
|
||||
string kdenummern = "";
|
||||
@@ -289,7 +333,8 @@ namespace OnDoc.Versandstrasse
|
||||
db.Get_Tabledata("ondoc_versandstrasse_check_kdenr", true, false);
|
||||
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0])!=0) {
|
||||
versandbereit = false;
|
||||
add_errormessage(db.dsdaten.Tables[0].Rows[0][1].ToString());
|
||||
|
||||
add_errormessage(Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0].ToString()), db.dsdaten.Tables[0].Rows[0][1].ToString());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -311,14 +356,14 @@ namespace OnDoc.Versandstrasse
|
||||
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0)
|
||||
{
|
||||
set_nodeimage(dokumentnode, 0);
|
||||
add_errormessage("Nicht versandfähige Dokumente im Couvert");
|
||||
add_errormessage(4,"Im Versand-Couvert liegt ein Dokument, welches nicht via Versandstrasse verschickt werden kann");
|
||||
versandbereit = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0)
|
||||
{
|
||||
if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage("Versandfähiges Dokument Position 1 fehlt"); }
|
||||
if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage(2,"Im Versand-Couvert liegt an erstes Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist."); }
|
||||
else
|
||||
{
|
||||
set_nodeimage(dokumentnode, 5);
|
||||
@@ -329,12 +374,12 @@ namespace OnDoc.Versandstrasse
|
||||
}
|
||||
if (node.Nodes.Count == 0)
|
||||
{
|
||||
add_errormessage("Kene Dokumente im Couvert");
|
||||
add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente");
|
||||
versandbereit = false;
|
||||
}
|
||||
nodecounter++;
|
||||
}
|
||||
if (node.Nodes.Count < 1) { versandbereit = false;add_errormessage("Keine Dokumetne im Couvert"); }
|
||||
if (node.Nodes.Count < 1) { versandbereit = false;add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente"); }
|
||||
if (anzbp > 1) { versandbereit = false; }
|
||||
if (versandbereit == true)
|
||||
{
|
||||
@@ -344,6 +389,26 @@ namespace OnDoc.Versandstrasse
|
||||
}
|
||||
else
|
||||
{
|
||||
if (errors.Count > 0)
|
||||
{
|
||||
richTextBox1.Clear();
|
||||
richTextBox1.BulletIndent = 20;
|
||||
richTextBox1.SelectionBullet = true;
|
||||
//errors.Sort();
|
||||
errors.Sort((s1, s2) => s1.number.CompareTo(s2.number));
|
||||
errormessage = "";
|
||||
foreach (errormsg emsg in errors)
|
||||
{
|
||||
if (!errormessage.Contains(emsg.message))
|
||||
{
|
||||
//if (errormessage != "") { errormessage = errormessage + Environment.NewLine; }
|
||||
errormessage = errormessage + emsg.message+"\n";
|
||||
}
|
||||
}
|
||||
|
||||
richTextBox1.SelectedText = errormessage.Substring(0,errormessage.Length-1);
|
||||
|
||||
}
|
||||
lblerror.Visible = true;
|
||||
lblerror.Text = errormessage;
|
||||
set_nodeimage(node, 0);
|
||||
@@ -619,6 +684,7 @@ namespace OnDoc.Versandstrasse
|
||||
}
|
||||
|
||||
panelPrepare.Visible = true;
|
||||
panelPrepare.Left = (this.Width - panelPrepare.Width) / 2;
|
||||
|
||||
|
||||
panelverifysb.Visible = false;
|
||||
|
||||
Reference in New Issue
Block a user