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

update 20250729

Browse Source
This commit is contained in:
Stefan Hutter
2025-07-29 19:28:12 +02:00
parent e33c7ede5b
commit f700066d6a
104 changed files with 761 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

354
Client/Versandstrasse/Versandstrasse.cs
View File

@@ -78,7 +78,7 @@ namespace OnDoc.Versandstrasse
{
bool hasprivateaddresses = false;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from Antwortadresse_mitarbeiter where mitarbeiternr = "+AppParams.CurrentMitarbeiter.ToString()+" order by reihenfolge", false, true);
db.Get_Tabledata("Select * from Antwortadresse_mitarbeiter where mitarbeiternr = " + AppParams.CurrentMitarbeiter.ToString() + " order by reihenfolge", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
hasprivateaddresses = true;
@@ -111,18 +111,18 @@ namespace OnDoc.Versandstrasse
//treeViewAdvAdresse.SelectedNode = 0;
treeViewAdvAdresse.Enabled = false;
db = null;
}
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.pnlcouvertgroesse.Enabled = false;
this.rbc5mini.Checked = true;
this.rbc5normal.Checked = false;
}
@@ -147,8 +147,8 @@ namespace OnDoc.Versandstrasse
db = null;
if (treeViewAdv1.Nodes.Count > 0)
{
if (treeViewAdv1.Nodes.Count > 0)
{
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0];
this.pnlcouvert.Visible = true;
this.pnlpostkorb.Visible = false;
@@ -167,7 +167,7 @@ namespace OnDoc.Versandstrasse
this.lblserienbrief.Left = this.Width - lblserienbrief.Width;
}
}
else
else
{
this.lblpostausgang.Visible = true;
this.lblpostausgang.Left = this.Width - lblpostausgang.Width;
@@ -175,7 +175,7 @@ namespace OnDoc.Versandstrasse
this.pnlpostkorb.Visible = true;
this.pnlpostkorb.Dock = DockStyle.Fill;
Refresh_VersandCouverts();
ribbon1.Select();
ribbon1_Click(sender, e);
@@ -185,9 +185,9 @@ namespace OnDoc.Versandstrasse
}
panelPrepare.Left = this.Width - this.panelPrepare.Width;
lblprueftext.MaximumSize = new Size(panelVerify.Width-10, 50);
lblprueftextSB.MaximumSize = new Size(panelVerify.Width-10, 50);
lblprueftextsb2.MaximumSize = new Size(panelVerify.Width-10, 50);
lblprueftext.MaximumSize = new Size(panelVerify.Width - 10, 50);
lblprueftextSB.MaximumSize = new Size(panelVerify.Width - 10, 50);
lblprueftextsb2.MaximumSize = new Size(panelVerify.Width - 10, 50);
@@ -220,12 +220,12 @@ namespace OnDoc.Versandstrasse
{
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()+ ", " + db.dsdaten.Tables[0].Rows[0][1].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];
set_nodeimage(DruckJob, 0);
treeViewAdv1.Nodes.Add(DruckJob);
@@ -235,7 +235,7 @@ namespace OnDoc.Versandstrasse
//db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true);
//if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Showlogin"]) == true) { button3.Visible = true; } else { button3.Visible = false; }
db = null;
db = null;
treeViewAdv1.ExpandAll();
foreach (TreeNodeAdv node in treeViewAdv1.Nodes)
{
@@ -278,12 +278,13 @@ namespace OnDoc.Versandstrasse
List<errormsg> errors = new List<errormsg>();
private void add_errormessage(int nr, string message)
{
bool found = false;
foreach (errormsg ermsg in errors) {
foreach (errormsg ermsg in errors)
{
if (ermsg.number == nr) { found = true; break; }
}
if (!found)
@@ -304,7 +305,7 @@ namespace OnDoc.Versandstrasse
db1.Get_Tabledata("Select isnull(versandstrasse_moeglich,0), isnull(versandstrasse_firstdoc,0) from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 0 || Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][1]) == 0)
{
richTextBox1.Clear();
richTextBox1.BulletIndent = 20;
richTextBox1.SelectionBullet = true;
@@ -325,12 +326,12 @@ namespace OnDoc.Versandstrasse
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);
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)
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);
@@ -350,9 +351,10 @@ namespace OnDoc.Versandstrasse
int anzbp = 1;
bool versandbereit = true;
if (vp.partnernr > 99999999) {
if (vp.partnernr > 99999999)
{
versandbereit = false;
add_errormessage(6,"Im Versand-Couvert liegen ausschliesslich Personen-Dokumente. Der Versand braucht technisch ein BP-Dokument.");
add_errormessage(6, "Im Versand-Couvert liegen ausschliesslich Personen-Dokumente. Der Versand braucht technisch ein BP-Dokument.");
}
string kdenummern = "";
@@ -360,18 +362,19 @@ namespace OnDoc.Versandstrasse
{
Versanddokument vd = dokumentnode.TagObject as Versanddokument;
if (kdenummern != "") { kdenummern = kdenummern + ";"; }
kdenummern = kdenummern + vd.Partnernr.ToString();
kdenummern = kdenummern + vd.Partnernr.ToString();
}
if (kdenummern != "")
{
db.clear_parameter();
db.add_parameter("@kundennummer",kdenummern);
db.add_parameter("@kundennummer", kdenummern);
db.Get_Tabledata("ondoc_versandstrasse_check_kdenr", true, false);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0])!=0) {
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) != 0)
{
versandbereit = false;
add_errormessage(Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0].ToString()), 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());
}
}
@@ -393,7 +396,7 @@ namespace OnDoc.Versandstrasse
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["vsm"]) == 0)
{
set_nodeimage(dokumentnode, 0);
add_errormessage(4,"Im Versand-Couvert liegt ein Dokument, welches nicht via Versandstrasse verschickt werden kann");
add_errormessage(4, "Im Versand-Couvert liegt ein Dokument, welches nicht via Versandstrasse verschickt werden kann");
versandbereit = false;
}
else
@@ -406,13 +409,14 @@ namespace OnDoc.Versandstrasse
}
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["firstdoc"]) == 0)
{
if (nodecounter == 0) { set_nodeimage(dokumentnode, 4);versandbereit = false; add_errormessage(2,"Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); }
if (nodecounter == 0) { set_nodeimage(dokumentnode, 4); versandbereit = false; add_errormessage(2, "Im Versand-Couvert liegt an erster Position ein Dokument, welches nicht als vorderstes Dokument tauglich ist"); }
else
{
set_nodeimage(dokumentnode, 5);
}
db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 0){
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 0)
{
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0)
{
set_nodeimage(dokumentnode, 4);
@@ -425,9 +429,11 @@ namespace OnDoc.Versandstrasse
}
else
{
db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='"+dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) >1 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) >1 ){
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0){
db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 1 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 1)
{
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0)
{
set_nodeimage(dokumentnode, 2);
versandbereit = false;
add_errormessage(7, "Im Versand-Couvert sind Dokumente mit fehlender faksimiler Unterschrift");
@@ -442,7 +448,7 @@ namespace OnDoc.Versandstrasse
}
nodecounter++;
}
if (node.Nodes.Count < 1) { versandbereit = false;add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente"); }
if (node.Nodes.Count < 1) { versandbereit = false; add_errormessage(1, "Im Versand-Couvert liegen keine Dokumente"); }
if (anzbp > 1) { versandbereit = false; }
if (versandbereit == true)
{
@@ -465,11 +471,11 @@ namespace OnDoc.Versandstrasse
if (!errormessage.Contains(emsg.message))
{
//if (errormessage != "") { errormessage = errormessage + Environment.NewLine; }
errormessage = errormessage + emsg.message+"\n";
errormessage = errormessage + emsg.message + "\n";
}
}
richTextBox1.SelectedText = errormessage.Substring(0,errormessage.Length-1);
richTextBox1.SelectedText = errormessage.Substring(0, errormessage.Length - 1);
}
lblerror.Visible = true;
@@ -484,9 +490,9 @@ namespace OnDoc.Versandstrasse
foreach (Versanddokument vd in pakete[0].Dokument)
{
TreeNodeAdv tn = new TreeNodeAdv();
tn.Text = vd.Bezeichnung+" ("+vd.DokumentID+")";
tn.Text = vd.Bezeichnung + " (" + vd.DokumentID + ")";
tn.Tag = vd.dokument;
set_nodeimage(tn, 3);
treeViewAdv1.Nodes[0].Nodes.Add(tn);
}
@@ -538,8 +544,9 @@ namespace OnDoc.Versandstrasse
TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition;
this.treeViewDragHighlightTracker.ClearHighlightNode();
this.currentSourceNode = null;
if (sourceNode.Level == 0) {
return;
if (sourceNode.Level == 0)
{
return;
}
if (destinationNode != null)
@@ -553,18 +560,18 @@ namespace OnDoc.Versandstrasse
sourceNode.Move(destinationNode, NodePositions.Next);
break;
case TreeViewDropPositions.OnNode:
Versandpaket sourcepaket = sourceNode.Parent.TagObject as Versandpaket;
TreeNodeAdv savenode = sourceNode.Parent;
sourceNode.Move(destinationNode.Nodes);
//Versanddokument dem neuen Versandpaket zuordnen
Versandpaket paket = destinationNode.TagObject as Versandpaket;
Versanddokument vd = sourceNode.TagObject as Versanddokument;
paket.Dokument.Add(vd);
destinationNode.TagObject = paket;
foreach (Versanddokument vd1 in sourcepaket.Dokument)
{
if (vd1.DokumentID == vd.DokumentID)
@@ -619,8 +626,8 @@ namespace OnDoc.Versandstrasse
TreeNodeAdv xdestinationNode = this.treeViewDragHighlightTracker.HighlightNode;
TreeViewDropPositions dropPosition = this.treeViewDragHighlightTracker.DropPosition;
if (sourceNode.Level==1) { return false; }
if (sourceNode.Level == 1) { return false; }
if (destinationNode == null || destinationNode == sourceNode)
return false;
@@ -706,7 +713,7 @@ namespace OnDoc.Versandstrasse
private void treeViewAdv1_NodeMouseClick(object sender, TreeViewAdvMouseClickEventArgs e)
{
}
private void button1_Click(object sender, EventArgs e)
@@ -736,7 +743,7 @@ namespace OnDoc.Versandstrasse
this.txtRückantwort.Text = txtadresse.Text.ToString();
this.txtRückantwortSB.Text = txtRückantwort.Text;
this.txtversandartsb.Text = txtVersandoption.Text;
if (serienbrief)
{
clsVersandstrasse vs = new clsVersandstrasse();
@@ -755,11 +762,11 @@ namespace OnDoc.Versandstrasse
panelPrepare.Visible = true;
panelPrepare.Left = (this.Width - panelPrepare.Width) / 2;
panelverifysb.Visible = false;
btnsendserienbrief.Visible = false;
btnSendFinal.Visible = true;
btnsendserienbrief.Visible = false;
btnSendFinal.Visible = true;
Application.DoEvents();
Cursor = Cursors.WaitCursor;
try
@@ -774,7 +781,7 @@ namespace OnDoc.Versandstrasse
{
clsVersandstrasse vs = new clsVersandstrasse();
vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath);
}
}
}
@@ -830,16 +837,30 @@ namespace OnDoc.Versandstrasse
treeViewAdv1.SelectedNode.TagObject = paket;
panelVerify.Visible = true;
this.txtAnzahlSeiten.Text = pdfViewerControl1.PageCount.ToString();
if (Properties.Settings.Default.GASSize == "True")
{
if (Convert.ToInt32(txtAnzahlSeiten.Text) > 30)
{
if (chkGAS.Checked && rbc5mini.Checked)
{
rbc5normal.Checked = true;
MessageBox.Show("Aufgrund der Anzahl Seiten wurde automatisch C5 Normal für das Rückantwort-Couvert gesetzt.", "Rückantwort-Couvert", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
}
this.txtAnzahlDokumente.Text = paket.Dokument.Count().ToString();
lblprieveiwbezeichnung.Text = "Aufbereitetes PDF";
}
catch (Exception ex) { MessageBox.Show(ex.Message);
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
panelPrepare.Visible = false;
Cursor = Cursors.Default;
Application.DoEvents();
}
}
private string save_stapel(ref Stream[] streams)
{
@@ -894,7 +915,7 @@ namespace OnDoc.Versandstrasse
private void btnSendFinal_Click(object sender, EventArgs e)
{
if (serienbrief)
{
@@ -910,12 +931,12 @@ namespace OnDoc.Versandstrasse
}
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);
string dokumentid = node.Text.Substring(node.Text.Length - 23, 22);
string _sqlWhere = @"dokumentid = '" + dokumentid + "'";
DataTable _newDataTable = sb.dsempfaenger.Tables[0].Select(_sqlWhere, "").CopyToDataTable();
svp.partnernr = Convert.ToInt32(_newDataTable.Rows[0]["partnernr"].ToString());
@@ -924,10 +945,10 @@ namespace OnDoc.Versandstrasse
vd.dokument = node.TagObject.ToString();
vd.inteintragnr = Convert.ToInt32(_newDataTable.Rows[0]["inteintragnr"].ToString());
svp.bemerkung = vd.DokumentID +" / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString();
svp.bemerkung = vd.DokumentID + " / " + sb.serienbriefnr.ToString() + "_" + _newDataTable.Rows[0]["inteintragnr"].ToString();
svp.Dokument.Clear();
svp.Dokument.Add(vd);
DB db = new DB(AppParams.connectionstring);
//db.clear_parameter();
//db.add_parameter("@tgnummer", AppParams.currenttgnummer);
@@ -941,12 +962,12 @@ namespace OnDoc.Versandstrasse
this.progressBarAdv1.Value = this.progressBarAdv1.Value + 1;
send_vs(ref svp, false);
}
sb.status = 1;
pdfViewerControl1.Unload();
@@ -968,7 +989,7 @@ namespace OnDoc.Versandstrasse
}
foreach (TreeNodeAdv node in treeViewAdv1.SelectedNode.Nodes)
{
foreach(Versanddokument vdok in vp.Dokument)
foreach (Versanddokument vdok in vp.Dokument)
{
if (node.Tag == vdok.DokumentID) { vdl.Add(vdok); }
}
@@ -992,19 +1013,20 @@ namespace OnDoc.Versandstrasse
DB db = new DB(AppParams.connectionstring);
string dokumente = "";
if (vp.Dokument.Count > 1) { vp.send_onbase_doc = false; }
else {
foreach (Versanddokument vd in vp.Dokument)
else
{
dokumente = dokumente + vd.DokumentID + ";";
string sql = "SELECT dbo.dokumenttyp.ErstellungInOffice FROM dbo.dokument INNER JOIN dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr WHERE (dbo.dokument.dokumentid = '" + vd.DokumentID + "')";
db.Get_Tabledata(sql, false, true);
if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "True")
foreach (Versanddokument vd in vp.Dokument)
{
//vd.dokument = "";
vp.send_onbase_doc = false;
dokumente = dokumente + vd.DokumentID + ";";
string sql = "SELECT dbo.dokumenttyp.ErstellungInOffice FROM dbo.dokument INNER JOIN dbo.dokumenttyp ON dbo.dokument.dokumenttypnr = dbo.dokumenttyp.dokumenttypnr WHERE (dbo.dokument.dokumentid = '" + vd.DokumentID + "')";
db.Get_Tabledata(sql, false, true);
if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "True")
{
//vd.dokument = "";
vp.send_onbase_doc = false;
}
}
}
}
//db.clear_parameter();
//db.add_parameter("@tgnummer", AppParams.currenttgnummer);
//db.add_parameter("@partnernr", vp.partnernr.ToString());
@@ -1022,37 +1044,37 @@ namespace OnDoc.Versandstrasse
string jsonstring = JsonConvert.SerializeObject(vp);
//vp.send_onbase_doc = true;
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@ersteller", AppParams.CurrentMitarbeiter.ToString());
db.Get_Tabledata("ondoc_create_versandpaket", true, false);
int paketid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=" + paketid.ToString(), false, true);
DataRow dr = db.daten.Tables[0].Rows[0];
dr[2] = jsonstring;
dr["aktiv"] = 1;
dr["versandoption"] = vp.Versandoption.ToString();
dr["Bemerkung"] = vp.bemerkung;
// db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@ersteller", AppParams.CurrentMitarbeiter.ToString());
db.Get_Tabledata("ondoc_create_versandpaket", true, false);
int paketid = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]);
db.daten.Tables.Clear();
db.Get_Tabledata_for_Update("Select * from ondoc_versandstrasse_paket_dokumentid where couvert_id = -1", false, true);
foreach (Versanddokument vd in vp.Dokument)
{
DataRow dr1 = db.daten.Tables[0].NewRow();
dr1[1] = paketid;
dr1[2] = vd.DokumentID;
dr1[3] = 1;
db.daten.Tables[0].Rows.Add(dr1);
}
db.Update_Data();
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
db.Get_Tabledata_for_Update("Select top 1 * from Ondoc_Versandstrasse_Paket where id=" + paketid.ToString(), false, true);
DataRow dr = db.daten.Tables[0].Rows[0];
dr[2] = jsonstring;
dr["aktiv"] = 1;
dr["versandoption"] = vp.Versandoption.ToString();
dr["Bemerkung"] = vp.bemerkung;
// db.daten.Tables[0].Rows.Add(dr);
db.Update_Data();
db.daten.Tables.Clear();
db.Get_Tabledata_for_Update("Select * from ondoc_versandstrasse_paket_dokumentid where couvert_id = -1", false, true);
foreach (Versanddokument vd in vp.Dokument)
{
DataRow dr1 = db.daten.Tables[0].NewRow();
dr1[1] = paketid;
dr1[2] = vd.DokumentID;
dr1[3] = 1;
db.daten.Tables[0].Rows.Add(dr1);
}
db.Update_Data();
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
if (!direktversenden)
{
return;
@@ -1140,10 +1162,11 @@ namespace OnDoc.Versandstrasse
{
txtadresse.Text = txtadresse.Text + dr["zeile7"].ToString() + Environment.NewLine;
}
catch { }
catch { }
}
catch {
catch
{
txtadresse.Text = "";
}
@@ -1204,8 +1227,9 @@ namespace OnDoc.Versandstrasse
{
foreach (TreeNodeAdv tn in treeViewAdvAdresse.Nodes)
{
if (tn.Tag.ToString() == paket.GASAdresse) {
treeViewAdvAdresse.SelectedNode = tn;
if (tn.Tag.ToString() == paket.GASAdresse)
{
treeViewAdvAdresse.SelectedNode = tn;
}
}
}
@@ -1225,7 +1249,7 @@ namespace OnDoc.Versandstrasse
}
else
{
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null,null,"",this.ribbonchkadresse.Checked);
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, null, "", this.ribbonchkadresse.Checked);
}
var stream = new MemoryStream(Convert.FromBase64String(dok));
@@ -1235,8 +1259,8 @@ namespace OnDoc.Versandstrasse
GrpPaketDetails.Enabled = false;
}
}
catch (Exception ex) { }
finally { Cursor.Current=Cursors.Default; }
catch (Exception ex) { }
finally { Cursor.Current = Cursors.Default; }
}
private void button2_Click(object sender, EventArgs e)
@@ -1246,7 +1270,7 @@ namespace OnDoc.Versandstrasse
private void contextMenuStrip1_Click(object sender, EventArgs e)
{
}
private void toolStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
@@ -1258,37 +1282,37 @@ namespace OnDoc.Versandstrasse
{
}
private void Refresh_VersandCouverts()
{
DB db = new DB(AppParams.connectionstring);
DB db2 = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
treeViewAdvCouverts.Nodes.Clear();
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
{
DB db = new DB(AppParams.connectionstring);
DB db2 = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
treeViewAdvCouverts.Nodes.Clear();
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dr["paket"].ToString());
TreeNodeAdv tn = new TreeNodeAdv();
db2.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + vp.partnernr.ToString(), false, true);
tn.Text = vp.partnernr.ToString() + " - " + db2.dsdaten.Tables[0].Rows[0][0].ToString();
tn.TagObject = vp.finaldoc;
tn.Tag = dr[0].ToString();
if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); }
if (vp.Versandoption.ToString() == "B1_POST") { set_nodeimage(tn, 1); }
if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 2); }
treeViewAdvCouverts.Nodes.Add(tn);
foreach (Versanddokument vd in vp.Dokument)
{
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(dr["paket"].ToString());
TreeNodeAdv tn = new TreeNodeAdv();
db2.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + vp.partnernr.ToString(), false, true);
tn.Text = vp.partnernr.ToString() + " - " + db2.dsdaten.Tables[0].Rows[0][0].ToString();
tn.TagObject = vp.finaldoc;
tn.Tag = dr[0].ToString();
if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); }
if (vp.Versandoption.ToString() == "B1_POST") { set_nodeimage(tn, 1); }
if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 2); }
treeViewAdvCouverts.Nodes.Add(tn);
foreach (Versanddokument vd in vp.Dokument)
{
TreeNodeAdv tn2 = new TreeNodeAdv();
tn2.Text = vd.Bezeichnung;
tn2.Tag = vd.DokumentID;
tn2.TagObject = vd.dokument;
tn.Nodes.Add(tn2);
}
TreeNodeAdv tn2 = new TreeNodeAdv();
tn2.Text = vd.Bezeichnung;
tn2.Tag = vd.DokumentID;
tn2.TagObject = vd.dokument;
tn.Nodes.Add(tn2);
}
db = null;
db2 = null;
}
db = null;
db2 = null;
}
@@ -1321,7 +1345,7 @@ namespace OnDoc.Versandstrasse
}
else
{
this.textBox4.Text = "";
this.textBox4.Text = "";
this.textBox3.Text = "";
this.textBox2.Text = "";
this.textBox1.Text = "";
@@ -1338,7 +1362,7 @@ namespace OnDoc.Versandstrasse
foreach (TreeNodeAdv tn in treeViewAdvCouverts.SelectedNodes)
{
db.Exec_SQL("Update ondoc_versandstrasse_paket set geloescht=getdate(), aktiv=0, geloescht_durch=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + tn.Tag.ToString());
}
db = null;
pdfViewerControl2.Unload();
@@ -1352,10 +1376,10 @@ namespace OnDoc.Versandstrasse
if (treeViewAdvCouverts.SelectedNode.Level != 1) { return; }
int id = Convert.ToInt32(treeViewAdvCouverts.SelectedNode.Tag);
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from Ondoc_Versandstrasse_Paket where id=" +id.ToString(), false, true);
db.Get_Tabledata("Select * from Ondoc_Versandstrasse_Paket where id=" + id.ToString(), false, true);
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(db.dsdaten.Tables[0].Rows[0]["Paket"].ToString());
pakete.Add(vp);
foreach (TreeNodeAdv tn in treeViewAdvCouverts.SelectedNodes)
{
db.Exec_SQL("Update ondoc_versandstrasse_paket set geloescht=getdate(), aktiv=0, reopen=1,geloescht_durch=" + AppParams.CurrentMitarbeiter.ToString() + " where id=" + id.ToString());
@@ -1367,7 +1391,7 @@ namespace OnDoc.Versandstrasse
lblprieveiwbezeichnung.Text = "";
Reload_Tree();
ribbon1.TabIndex = 0;
}
@@ -1383,11 +1407,11 @@ namespace OnDoc.Versandstrasse
node = node.Parent;
Versandpaket vp = node.TagObject as Versandpaket;
reserve_vs_dokument(treeViewAdv1.SelectedNode.Tag.ToString(), 2);
vp.Dokument.Remove(vd);
treeViewAdv1.SelectedNode.Remove();
Verify_Couvert(node);
}
else
@@ -1424,7 +1448,7 @@ namespace OnDoc.Versandstrasse
private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)
{
if (treeViewAdv1.SelectedNode.Level>1 && treeViewAdv1.SelectedNode.Parent.Text.Contains("Serienbrief"))
if (treeViewAdv1.SelectedNode.Level > 1 && treeViewAdv1.SelectedNode.Parent.Text.Contains("Serienbrief"))
{
löschenToolStripMenuItem.Enabled = false;
}
@@ -1457,7 +1481,7 @@ namespace OnDoc.Versandstrasse
private void tsbtnpreviewdoc_Click(object sender, EventArgs e)
{
}
private void tsbtncheckaddress_Click(object sender, EventArgs e)
@@ -1466,7 +1490,7 @@ namespace OnDoc.Versandstrasse
private void ribbonButton1_Click(object sender, EventArgs e)
{
}
private void ribbonButtonNewCouvert_Click(object sender, EventArgs e)
@@ -1496,7 +1520,7 @@ namespace OnDoc.Versandstrasse
{
this.lblpostausgang.Visible = false;
this.pnlcouvert.Visible = true;
this.pnlcouvert.Dock= DockStyle.Fill;
this.pnlcouvert.Dock = DockStyle.Fill;
this.pnlpostkorb.Visible = false;
}
}
@@ -1506,11 +1530,11 @@ namespace OnDoc.Versandstrasse
if (this.ribbonTab2.Active)
{
this.lblpostausgang.Visible = true;
this.lblpostausgang.Left = this.Width-lblpostausgang.Width;
this.lblpostausgang.Left = this.Width - lblpostausgang.Width;
this.pnlcouvert.Visible = false;
this.pnlpostkorb.Visible = true;
this.pnlpostkorb.Dock= DockStyle.Fill;
this.pnlpostkorb.Dock = DockStyle.Fill;
Refresh_VersandCouverts();
}
}
@@ -1551,22 +1575,22 @@ namespace OnDoc.Versandstrasse
}
else
{
ribbonbuttondokpreviewpostkorb.Checked= true;
ribbonbuttondokpreviewpostkorb.Checked = true;
treeViewAdv1_AfterSelect(sender, e);
}
}
private void Versandstrasse_Resize(object sender, EventArgs e)
{
this.treeViewAdvCouverts.Height = this.Height - this.ribbon1.Height-this.grpCouvertDetails.Height;
this.treeViewAdvCouverts.Height = this.Height - this.ribbon1.Height - this.grpCouvertDetails.Height;
panelPrepare.Left = this.Width - this.panelPrepare.Width;
}
private void Versandstrasse_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.treeViewAdv1.Nodes.Count > 0)
{
MessageBox.Show("Vor dem Schliessen sind die pendenten Couverts zu löschen oder in den Postausgang zu legen.","Schliessen",MessageBoxButtons.OK,MessageBoxIcon.Information);
if (this.treeViewAdv1.Nodes.Count > 0)
{
MessageBox.Show("Vor dem Schliessen sind die pendenten Couverts zu löschen oder in den Postausgang zu legen.", "Schliessen", MessageBoxButtons.OK, MessageBoxIcon.Information);
e.Cancel = true;
}
}
@@ -1576,7 +1600,7 @@ namespace OnDoc.Versandstrasse
int a = 0;
}
public void add_doc (Versanddokument vs)
public void add_doc(Versanddokument vs)
{
bool zugewiesen = false;
foreach (Versandpaket vp in pakete)
@@ -1605,7 +1629,7 @@ namespace OnDoc.Versandstrasse
pakete.Add(vp);
zugewiesen = true;
Reload_Tree();
}
}
@@ -1614,5 +1638,15 @@ namespace OnDoc.Versandstrasse
{
AppParams.versandstrassewindows_open = false;
}
private void rbc5mini_CheckedChanged(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
}
private void rbc5normal_CheckedChanged(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
}
}
}