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

update 20250416

Browse Source
This commit is contained in:
Stefan Hutter
2025-04-16 21:33:23 +02:00
parent a65bc81881
commit d278bed131
368 changed files with 85780 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

285
Client/Versandstrasse/Versandstrasse.cs
View File

@@ -23,6 +23,9 @@ using System.Net;
using Newtonsoft.Json;
using Windows.Media.Capture;
using Syncfusion.Olap.MDXQueryParser;
using Windows.Media.Streaming.Adaptive;
using System.Data.SqlTypes;
using NLog.LayoutRenderers.Wrappers;
namespace OnDoc.Versandstrasse
{
@@ -53,14 +56,15 @@ namespace OnDoc.Versandstrasse
if (serienbrief)
{
this.tsbtnDruckPaketNew.Enabled = false;
this.TabControlDokuments.TabPages[1].Enabled = false;
this.ribbonButtonNewCouvert.Enabled = false;
this.ribbonTab2.Enabled = false;
this.sb = pakete[0].sb;
this.btnPrepare.Text = "Versand prüfen";
}
else
{
tsbtnDruckPaketNew.Enabled = true;
ribbonButtonNewCouvert.Enabled = true;
}
}
@@ -76,23 +80,27 @@ namespace OnDoc.Versandstrasse
{
TreeNodeAdv node = new TreeNodeAdv();
node.Text = dr["bezeichnung"].ToString();
node.Tag = dr["einzeilig"].ToString();
node.TagObject = dr;
treeViewAdvAdresse.Nodes.Add(node);
node.TextColor = Color.Blue;
}
TreeNodeAdv stdnode = new TreeNodeAdv();
stdnode.Text = "Standard-Adressen";
treeViewAdvAdresse.Nodes.Add(stdnode);
treeViewAdvAdresse.SelectedNode = stdnode;
//TreeNodeAdv stdnode = new TreeNodeAdv();
//stdnode.Text = "Standard-Adressen";
//treeViewAdvAdresse.Nodes.Add(stdnode);
//treeViewAdvAdresse.SelectedNode = stdnode;
}
db.Get_Tabledata("Select * from Antwortadresse order by bezeichnung", false, true);
foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
{
TreeNodeAdv node = new TreeNodeAdv();
node.Text = dr["bezeichnung"].ToString();
node.Tag = dr["einzeilig"].ToString();
node.TagObject = dr;
if (hasprivateaddresses) { treeViewAdvAdresse.SelectedNode.Nodes.Add(node); } else { treeViewAdvAdresse.Nodes.Add(node); }
//node.TextColor = Color.Gray;
//if (hasprivateaddresses) { treeViewAdvAdresse.SelectedNode.Nodes.Add(node); } else { treeViewAdvAdresse.Nodes.Add(node); }
treeViewAdvAdresse.Nodes.Add(node);
}
treeViewAdvAdresse.SelectedNode = treeViewAdvAdresse.Nodes[0];
@@ -107,6 +115,11 @@ namespace OnDoc.Versandstrasse
Reload_Tree();
load_adressen();
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0];
this.pnlcouvert.Visible = true;
this.pnlpostkorb.Visible = false;
this.pnlpostkorb.Dock = DockStyle.Fill;
this.pnlcouvert.Dock = DockStyle.Fill;
}
private void Reload_Tree()
{
@@ -136,13 +149,14 @@ namespace OnDoc.Versandstrasse
DruckJob.TagObject = pakete[i];
set_nodeimage(DruckJob, 0);
treeViewAdv1.Nodes.Add(DruckJob);
PopulateDocs(pakete[i], ref DruckJob);
}
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.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;
treeViewAdv1.ExpandAll();
@@ -253,8 +267,9 @@ namespace OnDoc.Versandstrasse
foreach (Versanddokument vd in pakete[0].Dokument)
{
TreeNodeAdv tn = new TreeNodeAdv();
tn.Text = vd.DokumentID + " - " + vd.Bezeichnung;
tn.Text = vd.Bezeichnung+" ("+vd.DokumentID+")";
tn.Tag = vd.dokument;
set_nodeimage(tn, 3);
treeViewAdv1.Nodes[0].Nodes.Add(tn);
}
@@ -317,7 +332,27 @@ 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);
//gaga
//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)
{
sourcepaket.Dokument.Remove(vd1);
break;
}
}
savenode.TagObject = sourcepaket;
destinationNode.Expand();
break;
}
@@ -470,6 +505,14 @@ namespace OnDoc.Versandstrasse
private void btnSend_Click(object sender, EventArgs e)
{
Cursor.Current = Cursors.WaitCursor;
if (rbapost.Checked) { txtVersandoption.Text = "A_POST"; }
if (rbb1post.Checked) { txtVersandoption.Text = "B1_POST"; }
if (rbb2post.Checked) { txtVersandoption.Text = "B2_POST"; }
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();
@@ -482,9 +525,13 @@ namespace OnDoc.Versandstrasse
panelverifysb.Visible = true;
btnsendserienbrief.Visible = true;
btnSendFinal.Visible = false;
this.txtAnzahlDokumetneSB.Text = treeViewAdv1.Nodes[0].Nodes.Count.ToString();
return;
}
panelPrepare.Visible = true;
panelverifysb.Visible = false;
btnsendserienbrief.Visible = false;
btnSendFinal.Visible = true;
@@ -502,6 +549,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);
}
}
}
@@ -511,6 +559,7 @@ namespace OnDoc.Versandstrasse
// vsdok.dokument = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey, Application.StartupPath);
// //string dok = vs.Prepare_PDF(vsdok.DokumentID.ToString(), AppParams.tempdir, AppParams.connectionstring);
//}
treeViewAdv1.SelectedNode.TagObject = paket;
Stream[] streams = new Stream[paket.Dokument.Count];
int i = 0;
@@ -554,6 +603,8 @@ namespace OnDoc.Versandstrasse
streams = null;
treeViewAdv1.SelectedNode.TagObject = paket;
panelVerify.Visible = true;
this.txtAnzahlSeiten.Text = pdfViewerControl1.PageCount.ToString();
this.txtAnzahlDokumente.Text = paket.Dokument.Count().ToString();
}
catch { }
panelPrepare.Visible = false;
@@ -581,6 +632,8 @@ namespace OnDoc.Versandstrasse
private void chkGAS_CheckedChanged(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
this.panelverifysb.Visible = false;
if (chkGAS.Checked)
{
treeViewAdvAdresse.Enabled = true;
@@ -610,6 +663,7 @@ namespace OnDoc.Versandstrasse
private void btnSendFinal_Click(object sender, EventArgs e)
{
if (serienbrief)
{
Versandpaket svp = treeViewAdv1.Nodes[0].TagObject as Versandpaket;
@@ -618,8 +672,9 @@ namespace OnDoc.Versandstrasse
svp.finaldoc = node.TagObject.ToString();
svp.send_onbase_doc = true;
string _sqlWhere = @"dokumentid = '" + node.Text.Substring(0,22) + "'";
string dokumentid = node.Text.Substring(0, 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());
@@ -628,16 +683,18 @@ 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.Dokument.Clear();
svp.Dokument.Add(vd);
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.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);
@@ -648,6 +705,15 @@ namespace OnDoc.Versandstrasse
}
panelVerify.Visible = false;
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
List<Versanddokument> vdl = new List<Versanddokument>();
foreach (TreeNodeAdv node in treeViewAdv1.SelectedNode.Nodes)
{
foreach(Versanddokument vdok in vp.Dokument)
{
if (node.Tag == vdok.DokumentID) { vdl.Add(vdok); }
}
}
vp.Dokument = vdl;
vp.verified = true;
treeViewAdv1.SelectedNode.TagObject = vp;
panelVerify.Visible = false;
@@ -655,7 +721,8 @@ namespace OnDoc.Versandstrasse
SendTo_Versandstrasse();
pdfViewerControl1.Unload();
vdl = null;
vp = null;
}
private void SendTo_Versandstrasse()
{
@@ -672,19 +739,19 @@ namespace OnDoc.Versandstrasse
db.Get_Tabledata(sql, false, true);
if (db.dsdaten.Tables[0].Rows[0][0].ToString() == "True")
{
vd.dokument = "";
//vd.dokument = "";
vp.send_onbase_doc = false;
}
}
}
db.clear_parameter();
db.add_parameter("@tgnummer", AppParams.currenttgnummer);
db.add_parameter("@partnernr", vp.partnernr.ToString());
db.add_parameter("@gasadresse", vp.GASAdresse);
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.clear_parameter();
//db.add_parameter("@tgnummer", AppParams.currenttgnummer);
//db.add_parameter("@partnernr", vp.partnernr.ToString());
//db.add_parameter("@gasadresse", vp.GASAdresse);
//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);
@@ -694,8 +761,7 @@ namespace OnDoc.Versandstrasse
string jsonstring = JsonConvert.SerializeObject(vp);
//vp.send_onbase_doc = true;
if (!direktversenden)
{
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
@@ -708,6 +774,8 @@ namespace OnDoc.Versandstrasse
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();
@@ -723,10 +791,12 @@ namespace OnDoc.Versandstrasse
}
db.Update_Data();
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
if (!direktversenden)
{
return;
}
string URL = AppParams.RESTURI + "api/Send_Versandstrasse";
string URL = AppParams.RESTURI + "api/Send_Versandstrasse?paketid=" + paketid.ToString();
panelVerify.Visible = false;
@@ -773,6 +843,7 @@ namespace OnDoc.Versandstrasse
private void rbapost_CheckedChanged(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
string versandoption = "";
if (rbapost.Checked) { versandoption = "A_POST"; }
if (rbb1post.Checked) { versandoption = "B1_POST"; }
@@ -785,6 +856,7 @@ namespace OnDoc.Versandstrasse
private void treeViewAdvAdresse_AfterSelect(object sender, EventArgs e)
{
this.panelVerify.Visible = false;
try
{
Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket;
@@ -832,6 +904,7 @@ namespace OnDoc.Versandstrasse
{
try
{
this.panelVerify.Visible = false;
Cursor.Current = Cursors.WaitCursor;
TreeNodeAdv node = treeViewAdv1.SelectedNode;
if (node.Level == 1)
@@ -868,25 +941,27 @@ namespace OnDoc.Versandstrasse
{
foreach (TreeNodeAdv tn in treeViewAdvAdresse.Nodes)
{
if (tn.Text == paket.GASAdresse) { treeViewAdvAdresse.SelectedNode = tn; }
if (tn.Tag.ToString() == paket.GASAdresse) {
treeViewAdvAdresse.SelectedNode = tn;
}
}
}
}
else
{
if (tscheckboxpreview.Checked)
if (ribbonButtonDokPreview.Checked)
{
clsVersandstrasse vs = new clsVersandstrasse();
string dok = "";
if (serienbrief)
{
dok = vs.Prepare_PDF(node.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, node.Tag.ToString(), this.tschkcouvertpos.Checked);
dok = vs.Prepare_PDF(node.Text.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null, sb, node.Tag.ToString(), this.ribbonchkadresse.Checked);
}
else
{
dok = vs.Prepare_PDF(node.Tag.ToString(), AppParams.tempdir, AppParams.connectionstring, AppParams.RESTURI, AppParams.apikey, Application.StartupPath, null,null,"",this.tschkcouvertpos.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));
@@ -917,10 +992,6 @@ namespace OnDoc.Versandstrasse
private void TabControlDokuments_SelectedIndexChanged(object sender, EventArgs e)
{
if (TabControlDokuments.SelectedIndex == 1)
{
Refresh_VersandCouverts();
}
}
private void Refresh_VersandCouverts()
{
@@ -939,7 +1010,7 @@ namespace OnDoc.Versandstrasse
tn.TagObject = vp.finaldoc;
tn.Tag = dr[0].ToString();
if (vp.Versandoption.ToString() == "A_POST") { set_nodeimage(tn, 0); }
if (vp.Versandoption.ToString() == "B2_POST") { set_nodeimage(tn, 1); }
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)
@@ -962,10 +1033,25 @@ namespace OnDoc.Versandstrasse
try
{
TreeNodeAdv node = treeViewAdvCouverts.SelectedNode;
if (this.ribbonbuttondokpreviewpostkorb.Checked)
{
var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString()));
this.pdfViewerControl2.Load(stream);
stream = null;
}
if (node.Level==1)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where id=" + node.Tag.ToString(), false, true);
Versandpaket vp = JsonConvert.DeserializeObject<Versandpaket>(db.dsdaten.Tables[0].Rows[0]["paket"].ToString());
db = null;
this.textBox4.Text = this.pdfViewerControl2.PageCount.ToString();
this.textBox3.Text = node.Nodes.Count.ToString();
this.textBox2.Text = vp.Versandoption;
this.textBox1.Text = vp.GASAdresse;
}
var stream = new MemoryStream(Convert.FromBase64String(node.TagObject.ToString()));
this.pdfViewerControl2.Load(stream);
stream = null;
}
catch { }
}
@@ -1002,7 +1088,7 @@ namespace OnDoc.Versandstrasse
treeViewAdvCouverts.Nodes.Remove(treeViewAdvCouverts.SelectedNode);
pdfViewerControl2.Unload();
Reload_Tree();
this.TabControlDokuments.SelectedIndex = 0;
ribbon1.TabIndex = 0;
@@ -1016,7 +1102,7 @@ namespace OnDoc.Versandstrasse
if (node.Level > 1)
{
node = node.Parent;
reserve_vs_dokument(node.Tag.ToString(), 2);
reserve_vs_dokument(treeViewAdv1.SelectedNode.Tag.ToString(), 2);
treeViewAdv1.SelectedNode.Remove();
Verify_Couvert(node);
@@ -1076,21 +1162,102 @@ namespace OnDoc.Versandstrasse
private void tsbtnpreviewdoc_Click(object sender, EventArgs e)
{
tscheckboxpreview.Checked=tsbtnpreviewdoc.Checked;
if (tsbtnpreviewdoc.Checked == false)
{
this.pdfViewerControl1.Unload();
}
else
{
treeViewAdv1_AfterSelect(sender, e);
}
}
private void tsbtncheckaddress_Click(object sender, EventArgs e)
{
tschkcouvertpos.Checked=tsbtncheckaddress.Checked;
}
private void ribbonButton1_Click(object sender, EventArgs e)
{
}
private void ribbonButtonNewCouvert_Click(object sender, EventArgs e)
{
Versandpaket newpaket = new Versandpaket();
newpaket.PaketNr = (treeViewAdv1.Nodes.Count + 1).ToString();
newpaket.Versandoption = "B2_POST";
newpaket.GAS = "";
newpaket.GASAdresse = "";
newpaket.Mitteilung = "";
newpaket.Dokument = new List<Versanddokument>();
string NodeText = "Versand-Couvert " + (treeViewAdv1.Nodes.Count + 1).ToString();
TreeNodeAdv drucknode = new TreeNodeAdv();
drucknode.Text = NodeText;
drucknode.Tag = "Druckpaket";
drucknode.TagObject = newpaket;
pakete.Add(newpaket);
treeViewAdv1.Nodes.Add(drucknode);
}
private void ribbonTab1_ActiveChanged(object sender, EventArgs e)
{
if (this.ribbonTab1.Active)
{
this.pnlcouvert.Visible = true;
this.pnlcouvert.Dock= DockStyle.Fill;
this.pnlpostkorb.Visible = false;
}
}
private void ribbonTab2_ActiveChanged(object sender, EventArgs e)
{
if (this.ribbonTab2.Active)
{
this.pnlcouvert.Visible = false;
this.pnlpostkorb.Visible = true;
this.pnlpostkorb.Dock= DockStyle.Fill;
Refresh_VersandCouverts();
}
}
private void ribbonButtonDokPreview_Click(object sender, EventArgs e)
{
if (this.ribbonButtonDokPreview.Checked)
{
this.ribbonButtonDokPreview.Checked = false;
this.pdfViewerControl1.Unload();
}
else
{
this.ribbonButtonDokPreview.Checked = true;
treeViewAdv1_AfterSelect(sender, e);
}
}
private void ribbonchkadresse_Click(object sender, EventArgs e)
{
treeViewAdv1_AfterSelect(sender, e);
}
private void ribbon1_Click(object sender, EventArgs e)
{
this.pnlcouvert.Dock = DockStyle.Fill;
}
private void ribbonbuttondokpreviewpostkorb_Click(object sender, EventArgs e)
{
if (ribbonbuttondokpreviewpostkorb.Checked)
{
ribbonbuttondokpreviewpostkorb.Checked = false;
this.pdfViewerControl2.Unload();
}
else
{
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;
}
}
}