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

update 20250309

Browse Source
This commit is contained in:
Stefan Hutter
2025-03-09 08:12:30 +01:00
parent 3ad46bb5ef
commit 238e592ec8
46 changed files with 335 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/Diverses/SplashScreen.Designer.cs generated
View File

@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(138, 26);
this.label2.TabIndex = 2;
this.label2.Text = "6. März 2025";
this.label2.Text = "9. März 2025";
//
// SplashScreen
//

2
Client/DocMgmt/Dokumentpaket.Designer.cs generated
View File

@@ -345,7 +345,7 @@
this.groupBox1.Size = new System.Drawing.Size(249, 149);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Partnerdaten";
this.groupBox1.Text = "Kundendaten";
//
// btnSearchBP
//

26
Client/UIControls/DokList.Designer.cs generated
View File

@@ -64,6 +64,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panel2 = new System.Windows.Forms.Panel();
this.lblTitel = new System.Windows.Forms.Label();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
@@ -167,7 +168,6 @@ namespace OnDoc.UICintrols
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -207,7 +207,7 @@ namespace OnDoc.UICintrols
this.gruppenÖffnenToolStripMenuItem,
this.gruppenSchliessenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 468);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 446);
this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
//
// dokumentAnzeigenToolStripMenuItem
@@ -282,7 +282,7 @@ namespace OnDoc.UICintrols
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Kunde erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
@@ -491,6 +491,16 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -1392,16 +1402,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// docPreview1
//
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 0);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;

122
Client/UIControls/Serienbrief.Designer.cs generated
View File

@@ -31,10 +31,10 @@
this.components = new System.ComponentModel.Container();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv5 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv6 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv7 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv8 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Serienbrief));
this.GrpDokumentInhalt = new System.Windows.Forms.GroupBox();
this.grpFaktura = new System.Windows.Forms.GroupBox();
@@ -134,6 +134,9 @@
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.btnblexport = new System.Windows.Forms.Button();
this.folderBrowser1 = new Syncfusion.Windows.Forms.FolderBrowser(this.components);
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.GrpDokumentInhalt.SuspendLayout();
this.grpFaktura.SuspendLayout();
this.pnlprogress.SuspendLayout();
@@ -303,6 +306,7 @@
//
// grpDruckstapel
//
this.grpDruckstapel.Controls.Add(this.btnblexport);
this.grpDruckstapel.Controls.Add(this.panel2);
this.grpDruckstapel.Controls.Add(this.button2);
this.grpDruckstapel.Controls.Add(this.button1);
@@ -552,10 +556,10 @@
this.rbzustaendigkube.AutoSize = true;
this.rbzustaendigkube.Location = new System.Drawing.Point(22, 19);
this.rbzustaendigkube.Name = "rbzustaendigkube";
this.rbzustaendigkube.Size = new System.Drawing.Size(157, 17);
this.rbzustaendigkube.Size = new System.Drawing.Size(155, 17);
this.rbzustaendigkube.TabIndex = 0;
this.rbzustaendigkube.TabStop = true;
this.rbzustaendigkube.Text = "Kundenberater des Partners";
this.rbzustaendigkube.Text = "Kundenberater des Kunden";
this.rbzustaendigkube.UseVisualStyleBackColor = true;
//
// groupBox5
@@ -853,51 +857,51 @@
this.treeViewAdv1.Location = new System.Drawing.Point(3, 16);
this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeViewAdv1.Name = "treeViewAdv1";
treeNodeAdv1.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv1.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv1.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv1.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv1.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv1.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv1.EnsureDefaultOptionedChild = true;
treeNodeAdv1.MultiLine = true;
treeNodeAdv1.ShowLine = true;
treeNodeAdv1.Text = "In Bearbeitung";
treeNodeAdv2.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv2.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv2.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv2.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv2.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv2.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv2.EnsureDefaultOptionedChild = true;
treeNodeAdv2.MultiLine = true;
treeNodeAdv2.ShowLine = true;
treeNodeAdv2.Text = "Fehlerhaft";
treeNodeAdv3.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv3.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv3.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv3.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv3.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv3.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv3.EnsureDefaultOptionedChild = true;
treeNodeAdv3.MultiLine = true;
treeNodeAdv3.ShowLine = true;
treeNodeAdv3.Text = "Generierte Dokumente";
treeNodeAdv4.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv4.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv4.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv4.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv4.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv4.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv4.EnsureDefaultOptionedChild = true;
treeNodeAdv4.MultiLine = true;
treeNodeAdv4.ShowLine = true;
treeNodeAdv4.Text = "Abgeschlossen";
treeNodeAdv5.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv5.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv5.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv5.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv5.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv5.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv5.EnsureDefaultOptionedChild = true;
treeNodeAdv5.MultiLine = true;
treeNodeAdv5.ShowLine = true;
treeNodeAdv5.Text = "In Bearbeitung";
treeNodeAdv6.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv6.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv6.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv6.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv6.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv6.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv6.EnsureDefaultOptionedChild = true;
treeNodeAdv6.MultiLine = true;
treeNodeAdv6.ShowLine = true;
treeNodeAdv6.Text = "Fehlerhaft";
treeNodeAdv7.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv7.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv7.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv7.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv7.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv7.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv7.EnsureDefaultOptionedChild = true;
treeNodeAdv7.MultiLine = true;
treeNodeAdv7.ShowLine = true;
treeNodeAdv7.Text = "Generierte Dokumente";
treeNodeAdv8.ChildStyle.CheckBoxTickThickness = 1;
treeNodeAdv8.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv8.ChildStyle.EnsureDefaultOptionedChild = true;
treeNodeAdv8.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv8.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdv8.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdv8.EnsureDefaultOptionedChild = true;
treeNodeAdv8.MultiLine = true;
treeNodeAdv8.ShowLine = true;
treeNodeAdv8.Text = "Abgeschlossen";
this.treeViewAdv1.Nodes.AddRange(new Syncfusion.Windows.Forms.Tools.TreeNodeAdv[] {
treeNodeAdv1,
treeNodeAdv2,
treeNodeAdv3,
treeNodeAdv4});
treeNodeAdv5,
treeNodeAdv6,
treeNodeAdv7,
treeNodeAdv8});
this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeViewAdv1.Size = new System.Drawing.Size(230, 563);
this.treeViewAdv1.TabIndex = 3;
@@ -1167,7 +1171,7 @@
this.ribbonbuttonaddpartner.LargeImage = global::OnDoc.Properties.Resources.Partner_32x32_32;
this.ribbonbuttonaddpartner.Name = "ribbonbuttonaddpartner";
this.ribbonbuttonaddpartner.SmallImage = global::OnDoc.Properties.Resources.Partner_16x16_32;
this.ribbonbuttonaddpartner.Text = "Partner hinzufügen";
this.ribbonbuttonaddpartner.Text = "Kunde hinzufügen";
this.ribbonbuttonaddpartner.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center;
this.ribbonbuttonaddpartner.Click += new System.EventHandler(this.ribbonbuttonaddpartner_Click);
//
@@ -1178,7 +1182,7 @@
this.ribbonButtonPartnerPruefen.LargeImage = global::OnDoc.Properties.Resources.SB_Partnerliste_Pruefen_32x32_32;
this.ribbonButtonPartnerPruefen.Name = "ribbonButtonPartnerPruefen";
this.ribbonButtonPartnerPruefen.SmallImage = global::OnDoc.Properties.Resources.SB_Partnerliste_Pruefen_24x24_32;
this.ribbonButtonPartnerPruefen.Text = "Partnerliste prüfen";
this.ribbonButtonPartnerPruefen.Text = "Kundenliste prüfen";
this.ribbonButtonPartnerPruefen.Click += new System.EventHandler(this.ribbonButton2_Click);
//
// ribbonPanel8
@@ -1308,6 +1312,17 @@
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
// btnblexport
//
this.btnblexport.Location = new System.Drawing.Point(232, 136);
this.btnblexport.Name = "btnblexport";
this.btnblexport.Size = new System.Drawing.Size(239, 23);
this.btnblexport.TabIndex = 22;
this.btnblexport.Text = "Banklagernd-Dokumente exportieren";
this.btnblexport.UseVisualStyleBackColor = true;
this.btnblexport.Visible = false;
this.btnblexport.Click += new System.EventHandler(this.btnblexport_Click);
//
// Serienbrief
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1462,5 +1477,8 @@
private System.Windows.Forms.RibbonButton ribbonbuttonAbgelehnt;
private System.Windows.Forms.RibbonButton ribbonButtonToApproval;
private System.Windows.Forms.RibbonButton ribbonButton1;
private System.Windows.Forms.Button btnblexport;
private Syncfusion.Windows.Forms.FolderBrowser folderBrowser1;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
}
}

153
Client/UIControls/Serienbrief.cs
View File

@@ -522,10 +522,10 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = true;
sfDataGridEmpfaenger.Columns["BLKUNDE"].Width = 50;
}
sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns[0].HeaderText = "Kunden-Nr";
//sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = true;
sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
//sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
sfDataGridEmpfaenger.Columns["ERSTELLER"].Visible = false;
sfDataGridEmpfaenger.Columns["DRUCKJOBID"].Visible = false;
sfDataGridEmpfaenger.Columns["AKTIV"].Visible = false;
@@ -538,6 +538,7 @@ namespace OnDoc.UIControls
sfDataGridEmpfaenger.Columns["Strasse"].Visible = false;
sfDataGridEmpfaenger.Columns["PLZ"].Visible = false;
sfDataGridEmpfaenger.Columns["Ort"].Visible = false;
sfDataGridEmpfaenger.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
}
catch { }
@@ -1153,7 +1154,7 @@ namespace OnDoc.UIControls
int lastid = sb.dsempfaenger.Tables[0].Rows.Count;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + ipartnernr, false, true);
db.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + ipartnernr, false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
System.Data.DataRow dr = sb.dsempfaenger.Tables[0].NewRow();
@@ -1162,8 +1163,17 @@ namespace OnDoc.UIControls
dr[i] = "";
}
dr["partnernr"] = Convert.ToInt32(ipartnernr);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) == 1)
{
dr["kurzbezeichnung"] = "SALDIERT: "+db.dsdaten.Tables[0].Rows[0][0].ToString();
}
else
{
dr["kurzbezeichnung"] = db.dsdaten.Tables[0].Rows[0][0].ToString();
dr["STATUS"] = 0;
}
dr["STATUS"] = 0;
dr["FEHLERCODE"] = 0;
dr["IntEintragnr"] = lastid;
@@ -1237,6 +1247,18 @@ namespace OnDoc.UIControls
// Logging.Logging.Debug("dr1 ", "OnDoc", dr1["Status"].ToString());
try
{
if (Convert.ToInt32(dr1["status"]) == -9)
{
dr1["Status"] = 0;
if (dr1[1].ToString().Contains("SALDIERT:"))
{
}
else
{
dr1[1] = "SALDIERT: " + dr1[1].ToString();
}
}
if (Convert.ToInt32(dt.Rows[i]["Fehlercode"]) > 0)
{
dr1["Fehlercode"] = dt.Rows[i]["Fehlercode"];
@@ -2029,6 +2051,11 @@ namespace OnDoc.UIControls
int stapel = 1;
int i = 0;
int anzahl_stapel = (normalcount / 100) + 1;
if (blcount > 0)
{
btnblexport.Visible = true;
System.Windows.Forms.Application.DoEvents();
}
Stream[] streams = null;
if (normalcount > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[normalcount];
init_progressbar("Druckstapel generieren", dv.Count);
@@ -2065,46 +2092,46 @@ namespace OnDoc.UIControls
}
save_stapel(stapel, ref streams);
}
if (blcount > 0)
{
i = 0;
anzahl_stapel = (blcount / 100) + 1;
streams = null;
if (blcount > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[blcount];
stapel = stapel + 1;
i = 0;
foreach (DataRowView rowView in dv)
{
add_progress();
System.Data.DataRow dr = rowView.Row;
if (dr["blkunde"].ToString() == "1")
{
//if (blcount > 0)
//{
// i = 0;
// anzahl_stapel = (blcount / 100) + 1;
// streams = null;
// if (blcount > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[blcount];
// stapel = stapel + 1;
// i = 0;
// foreach (DataRowView rowView in dv)
// {
// add_progress();
// System.Data.DataRow dr = rowView.Row;
// if (dr["blkunde"].ToString() == "1")
// {
db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
if (stream.Length > 0)
{
streams[i] = stream;
i++;
if (i >= stapelgroesse)
{
save_stapel(stapel, ref streams);
// db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
// var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
// if (stream.Length > 0)
// {
// streams[i] = stream;
// i++;
// if (i >= stapelgroesse)
// {
// save_stapel(stapel, ref streams);
i = 0;
if (dv.Count - (stapel * stapelgroesse) >= stapelgroesse) { streams = new Stream[stapelgroesse]; }
else
{
streams = new Stream[dv.Count - (stapel * stapelgroesse)];
}
//streams = new Stream[dv.Count - (stapel * stapelgroesse)];
stapel++;
}
}
}
}
save_stapel(stapel, ref streams);
// i = 0;
// if (dv.Count - (stapel * stapelgroesse) >= stapelgroesse) { streams = new Stream[stapelgroesse]; }
// else
// {
// streams = new Stream[dv.Count - (stapel * stapelgroesse)];
// }
// //streams = new Stream[dv.Count - (stapel * stapelgroesse)];
// stapel++;
// }
// }
// }
// }
// save_stapel(stapel, ref streams);
}
//}
//PdfDocumentBase.Merge(finalDoc, streams);
//FileStream fs = new FileStream(AppParams.tempdir+sb.serienbriefnr.ToString()+".pdf",FileMode.Create);
//finalDoc.Save(fs);
@@ -2698,14 +2725,50 @@ namespace OnDoc.UIControls
if (dataRow["blkunde"].ToString() == "1")
{
e.Style.BackColor = Color.Red;
e.Style.BackColor = Color.FromArgb(250, 141, 118);
}
}
if (e.Column.MappingName == "Kurzbezeichnung")
{
if (dataRow["kurzbezeichnung"].ToString().Contains("SALDIERT:"))
{
e.Style.BackColor = Color.FromArgb(250, 141, 118);
}
}
}
private void btnblexport_Click(object sender, EventArgs e)
{
folderBrowserDialog1.ShowNewFolderButton = true;
folderBrowserDialog1.SelectedPath=AppParams.tempdir;
if (folderBrowserDialog1.ShowDialog() == DialogResult.OK)
{
DB db = new DB(AppParams.connectionstring);
FileHelper fh = new FileHelper();
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
foreach (DataRowView rowView in dv)
{
System.Data.DataRow dr = rowView.Row;
if (dr["blkunde"].ToString() == "1")
{
db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
string filename = dr[0].ToString() + "_" + dr["dokumentid"].ToString() + ".pdf";
fh.SaveBase64ToFile(db.dsdaten.Tables[0].Rows[0][0].ToString(),folderBrowserDialog1.SelectedPath+@"\"+filename );
}
}
db = null;
fh = null;
}
}
}
}

12
Client/UIControls/Serienbrief.resx
View File

@@ -133,22 +133,28 @@
<data name="ribbonButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton1.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButton1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vgAADr4B6kKxwAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
vQAADr0BR/uQrQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="folderBrowser1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>441, 17</value>
</metadata>
<metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>574, 17</value>
</metadata>
</root>

BIN
Client/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.