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

update 20250413

Browse Source
This commit is contained in:
Stefan Hutter
2025-04-13 13:47:09 +02:00
parent 2ac3265dcd
commit a65bc81881
41 changed files with 1878 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Client/UIControls/DokList.cs
View File

@@ -1645,7 +1645,7 @@ namespace OnDoc.UICintrols
}
private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count < 1) { return; }
int i = 0;
@@ -1675,7 +1675,7 @@ namespace OnDoc.UICintrols
vp.Mitteilung = "";
vp.GAS = "";
vp.GASAdresse = "";
vp.PaketNr = i.ToString();
vp.PaketNr = Guid.NewGuid().ToString();
vp.Dokument.Add(new Versanddokument(datarow["dokumentid"].ToString(), datarow["doktyp"].ToString(), datarow["partner-nr"].ToString()));
reserve_vs_dokument(datarow["dokumentid"].ToString(), 1);

6
Client/UIControls/DokList.resx
View File

@@ -190,7 +190,7 @@
<data name="tsbtnpreviewno.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -205,7 +205,7 @@
<data name="tsbtnpreviewbottom.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
@@ -220,7 +220,7 @@
<data name="tsbtnpreviewright.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
/aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM

28
Client/UIControls/Serienbrief.cs
View File

@@ -936,6 +936,9 @@ namespace OnDoc.UIControls
{
RibbonButtonArchivierenUndAbschlessen.Enabled = true;
ribbonButtonVersandstrasse.Enabled = true;
ribbonButtonVersandstrasse.Enabled = true;
if (sb.ppfaktura!=0) { ribbonButtonVersandstrasse.Enabled = false; }
ribbonButtonDruckstapel.Enabled = true;
if (cbdigitaleunterschrfiten.Checked)
@@ -2886,6 +2889,31 @@ namespace OnDoc.UIControls
vp.GAS = "";
vp.GASAdresse = "";
vp.PaketNr = "0";
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
DB db = new DB(AppParams.connectionstring);
init_progressbar("Dokumente vorbereiten", dv.Count);
dv.RowFilter = "Status = 1";
dv.Sort = "Partnernr";
foreach (DataRowView rowView in dv)
{
add_progress();
OnBaseDocUpload.OnBaseDokument onbasedoc = new OnBaseDocUpload.OnBaseDokument();
System.Data.DataRow dr = rowView.Row;
db.Get_Tabledata("Select dokumentid, dbo.BinaryToBase64(dokument) as dokument from edex_sb_serienbrief_dokument where dokumentid='" + dr["dokumentid"].ToString() + "' order by inteintragnr", false, true);
string dokument = db.dsdaten.Tables[0].Rows[0]["dokument"].ToString();
db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + dr["partnernr"].ToString(), false, true);
Versanddokument vd = new Versanddokument("", "", "");
vd.Partnernr = dr["Partnernr"].ToString();
vd.inteintragnr = Convert.ToInt32(dr["inteintragnr"].ToString());
vd.Bezeichnung = dr["Partnernr"].ToString() + " - " + db.dsdaten.Tables[0].Rows[0][0].ToString();
vd.DokumentID = dr["dokumentid"].ToString();
vd.dokument = dokument;
vp.Dokument.Add(vd);
add_progress();
}
db = null;
finish_progress();
versandpakete.Add(vp);
OnDoc.Versandstrasse.Versandstrasse vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete);
vs.ShowDialog();