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

20250112

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-12 16:18:11 +01:00
parent 11b4f840f0
commit 1e3c169d49
79 changed files with 449 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/DocMgmt/Serienbrief.Designer.cs
Generated
+27 -26
View File
@@ -37,7 +37,7 @@
Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Serienbrief));
this.GrpDokumentInhalt = new System.Windows.Forms.GroupBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.grpFaktura = new System.Windows.Forms.GroupBox();
this.rbbpb = new System.Windows.Forms.RadioButton();
this.rbppa = new System.Windows.Forms.RadioButton();
this.rbppohne = new System.Windows.Forms.RadioButton();
@@ -122,11 +122,11 @@
this.panel1 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panelLoad = new System.Windows.Forms.Panel();
this.label4 = new System.Windows.Forms.Label();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpDokumentInhalt.SuspendLayout();
this.groupBox1.SuspendLayout();
this.grpFaktura.SuspendLayout();
this.grpDruckstapel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit();
this.pnlprogress.SuspendLayout();
@@ -159,7 +159,7 @@
//
// GrpDokumentInhalt
//
this.GrpDokumentInhalt.Controls.Add(this.groupBox1);
this.GrpDokumentInhalt.Controls.Add(this.grpFaktura);
this.GrpDokumentInhalt.Controls.Add(this.grpDruckstapel);
this.GrpDokumentInhalt.Controls.Add(this.pnlprogress);
this.GrpDokumentInhalt.Controls.Add(this.groupBox8);
@@ -175,17 +175,17 @@
this.GrpDokumentInhalt.TabStop = false;
this.GrpDokumentInhalt.Text = "Dokument-Inahalt";
//
// groupBox1
// grpFaktura
//
this.groupBox1.Controls.Add(this.rbbpb);
this.groupBox1.Controls.Add(this.rbppa);
this.groupBox1.Controls.Add(this.rbppohne);
this.groupBox1.Location = new System.Drawing.Point(546, 192);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(534, 55);
this.groupBox1.TabIndex = 16;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Frankatur";
this.grpFaktura.Controls.Add(this.rbbpb);
this.grpFaktura.Controls.Add(this.rbppa);
this.grpFaktura.Controls.Add(this.rbppohne);
this.grpFaktura.Location = new System.Drawing.Point(546, 192);
this.grpFaktura.Name = "grpFaktura";
this.grpFaktura.Size = new System.Drawing.Size(534, 55);
this.grpFaktura.TabIndex = 16;
this.grpFaktura.TabStop = false;
this.grpFaktura.Text = "Frankatur";
//
// rbbpb
//
@@ -1004,6 +1004,7 @@
// ribbonbuttonsavetemplate
//
this.ribbonbuttonsavetemplate.DropDownResizable = true;
this.ribbonbuttonsavetemplate.Enabled = false;
this.ribbonbuttonsavetemplate.Image = global::OnDoc.Properties.Resources.save_32x32_32;
this.ribbonbuttonsavetemplate.LargeImage = global::OnDoc.Properties.Resources.save_32x32_32;
this.ribbonbuttonsavetemplate.Name = "ribbonbuttonsavetemplate";
@@ -1175,6 +1176,15 @@
this.splitContainer1.SplitterDistance = 900;
this.splitContainer1.TabIndex = 5;
//
// docPreview1
//
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(725, 598);
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
// panelLoad
//
this.panelLoad.BackColor = System.Drawing.Color.Silver;
@@ -1195,15 +1205,6 @@
this.label4.TabIndex = 0;
this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten....";
//
// docPreview1
//
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(725, 598);
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
// Serienbrief
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1222,8 +1223,8 @@
this.Text = "Serienbrief";
this.Load += new System.EventHandler(this.Serienbrief_Load);
this.GrpDokumentInhalt.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.grpFaktura.ResumeLayout(false);
this.grpFaktura.PerformLayout();
this.grpDruckstapel.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).EndInit();
this.pnlprogress.ResumeLayout(false);
@@ -1339,7 +1340,7 @@
private System.Windows.Forms.RibbonButton RibbonButtonArchivierenUndAbschlessen;
private System.Windows.Forms.ToolStripMenuItem erneutGenerierenToolStripMenuItem;
private System.Windows.Forms.RibbonButton ribbonButtonDelete;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox grpFaktura;
private System.Windows.Forms.RadioButton rbbpb;
private System.Windows.Forms.RadioButton rbppa;
private System.Windows.Forms.RadioButton rbppohne;
Client/DocMgmt/Serienbrief.cs
+113 -105
View File
@@ -140,7 +140,7 @@ namespace OnDoc.UIControls
ribbonButtonPartnerPruefen.Enabled = false;
ribbonButtonVorlageBearbeiten.Enabled = false;
ribbonbuttonloadtemplate.Enabled = false;
ribbonbuttonsave.Enabled = false;
ribbonbuttonsavetemplate.Enabled = false;
ribbonbuttonaddpartner.Enabled = false;
ribbonButtonPartnerPruefen.Enabled = false;
RibbonButtonGenerateSB.Enabled = false;
@@ -159,9 +159,10 @@ namespace OnDoc.UIControls
groupBox6.Enabled = enabled;
groupBox7.Enabled = enabled;
groupBox8.Enabled = enabled;
grpFaktura.Enabled = enabled;
ribbonButtonVorlageBearbeiten.Enabled = enabled;
ribbonbuttonloadtemplate.Enabled = enabled;
ribbonbuttonsave.Enabled = enabled;
ribbonbuttonsavetemplate.Enabled = enabled;
}
if (type == 4)
@@ -511,6 +512,7 @@ namespace OnDoc.UIControls
else
{
this.GrpDokumentInhalt.Enabled = false;
this.grpFaktura.Enabled = false;
return;
}
}
@@ -878,6 +880,7 @@ namespace OnDoc.UIControls
}
update_zahlen();
GrpDokumentInhalt.Enabled = true;
grpFaktura.Enabled = true;
}
@@ -1206,127 +1209,132 @@ namespace OnDoc.UIControls
sp1 = vorlagendaten.Columns[i1].ColumnName;
feldnr = sp1;
}
switch (sp1)
try
{
// Mapping Zustelladresse
case "F_09_1":
case "F_09_10":
{
if (vorlagendaten.Rows[i]["Zustelladresse"] != "")
switch (sp1)
{
// Mapping Zustelladresse
case "F_09_1":
case "F_09_10":
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Zustelladresse"];
}
break;
}
case "F_09_89":
{
if (vorlagendaten.Rows[i]["Name"] != "")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Name"];
}
break;
}
case "F_09_111":
{
if (vorlagendaten.Rows[i]["Vorname"] != "")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Vorname"];
}
break;
}
case "F_09_122":
case "F_09_123":
case "F_09_20":
{
string s = "";
string s1;
if (vorlagendaten.Rows[i]["Briefanrede1"] != "")
{
s = vorlagendaten.Rows[i]["Briefanrede1"].ToString();
if (s.Substring(0, 4) == "Herr")
if (vorlagendaten.Rows[i]["Zustelladresse"] != "")
{
s = "r " + s;
}
else
{
s = " " + s;
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Zustelladresse"];
}
break;
}
if (vorlagendaten.Rows[i]["Briefanrede2"] != "")
case "F_09_89":
{
if (vorlagendaten.Rows[i]["Name"] != "")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Name"];
}
break;
}
case "F_09_111":
{
if (vorlagendaten.Rows[i]["Vorname"] != "")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Vorname"];
}
break;
}
case "F_09_122":
case "F_09_123":
case "F_09_20":
{
string s = "";
string s1;
if (vorlagendaten.Rows[i]["Briefanrede1"] != "")
{
s = vorlagendaten.Rows[i]["Briefanrede1"].ToString();
if (s.Substring(0, 4) == "Herr")
{
s = "r " + s;
}
else
{
s = " " + s;
}
}
if (vorlagendaten.Rows[i]["Briefanrede2"] != "")
{
if (!string.IsNullOrEmpty(s))
s = s + Environment.NewLine;
s1 = vorlagendaten.Rows[i]["Briefanrede2"].ToString();
if (s.Substring(0, 4) == "Herr")
{
s = s + "Sehr geehrter " + s1;
}
else
{
s = s + "Sehr geehrte " + s1;
}
}
if (!string.IsNullOrEmpty(s))
s = s + Environment.NewLine;
s1 = vorlagendaten.Rows[i]["Briefanrede2"].ToString();
if (s.Substring(0, 4) == "Herr")
{
s = s + "Sehr geehrter " + s1;
vorlagendaten.Rows[i][i1] = s;
}
else
break;
}
case "F_09_98":
{
if (vorlagendaten.Rows[i]["Strasse"] != "")
{
s = s + "Sehr geehrte " + s1;
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Strasse"];
}
break;
}
if (!string.IsNullOrEmpty(s))
case "F_09_93":
{
vorlagendaten.Rows[i][i1] = s;
}
if (vorlagendaten.Rows[i]["Ort"] != "")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"];
}
break;
}
case "F_09_98":
{
if (vorlagendaten.Rows[i]["Strasse"] != "")
break;
}
case var @case when @case == "F_09_93":
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Strasse"];
}
if (vorlagendaten.Rows[i]["Ort"] != "")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"];
}
break;
}
case "F_09_93":
{
if (vorlagendaten.Rows[i]["Ort"] != "")
break;
}
case "F_09_96":
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"];
}
if (vorlagendaten.Rows[i]["PLZ"] != "")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"];
}
break;
}
case var @case when @case == "F_09_93":
{
if (vorlagendaten.Rows[i]["Ort"] != "")
break;
}
case "F_09_132":
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"];
if (vorlagendaten.Rows[i]["PLZ"].ToString() != "" | vorlagendaten.Rows[i]["Ort"].ToString() != "0")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"] + " " + vorlagendaten.Rows[i]["Ort"];
}
break;
}
break;
}
case "F_09_96":
{
if (vorlagendaten.Rows[i]["PLZ"] != "")
default:
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"];
break;
}
break;
}
case "F_09_132":
{
if (vorlagendaten.Rows[i]["PLZ"].ToString() != "" | vorlagendaten.Rows[i]["Ort"].ToString() != "0")
{
vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"] + " " + vorlagendaten.Rows[i]["Ort"];
}
break;
}
default:
{
break;
}
}
}
catch { }
// Verknüpfte Felder
try
@@ -1995,12 +2003,12 @@ namespace OnDoc.UIControls
bez = id.result;
}
id.Dispose();
if (bez !="") {
//InputBoxItem[] items = new InputBoxItem[] { new InputBoxItem("Bezeichnung") };
//InputBox input = InputBox.Show("Name für die Vorlage",items,InputBoxButtons.OKCancel);
//if (input.Result == InputBoxResult.OK) {
// string bez = input.Items["Bezeichnung"].ToString();
if (bez !="") {
//InputBoxItem[] items = new InputBoxItem[] { new InputBoxItem("Bezeichnung") };
//InputBox input = InputBox.Show("Name für die Vorlage",items,InputBoxButtons.OKCancel);
//if (input.Result == InputBoxResult.OK) {
// string bez = input.Items["Bezeichnung"].ToString();
update_serienbriefdaten(false);
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select dbo.binarytobase64(vorlage),DocType from edex_sb_vorlage where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true);
string file = db.dsdaten.Tables[0].Rows[0][0].ToString();
Client/UIControls/UCAllgemeineDokumentParam.cs
+6 -2
View File
@@ -208,10 +208,14 @@ namespace OnDoc.UIControls
this.barcode_horizontal = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bchorizontal"]);
this.barcode_type = db.dsdaten.Tables[0].Rows[0]["BarcodeType"].ToString();
this.barcode_content = db.dsdaten.Tables[0].Rows[0]["DatamatrixContent"].ToString();
string logdata1 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString();
Logging.Logging.Debug("Barcode-Size Ursprung:" + logdata1,"OnDoc","");
if (this.ErstellungInOffice == false)
{
Logging.Logging.Debug("Erstellung not Office", "OnDoc", "");
string sql = "";
sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping ";
sql = sql + "where orig_bcpt = " + barcode_top.ToString() + " and orig_bcpl=" + barcode_left.ToString() + " ";
@@ -219,7 +223,7 @@ namespace OnDoc.UIControls
db.Get_Tabledata(sql, false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
string logdata1 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString();
logdata1 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString();
this.barcode_left = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpl"]);
this.barcode_top = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpt"]);
this.barcode_width = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcw"]);
Client/bin/Debug/DOCGEN.dll
BIN
View File
Binary file not shown.
Client/bin/Debug/DOCGEN.pdb
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDoc.exe
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDoc.pdb
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDocClient.zip
BIN
View File
Binary file not shown.
Client/bin/Debug/de-DE/OnDoc.resources.dll
BIN
View File
Binary file not shown.
Client/obj/Debug/Client.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/Client.csproj.GenerateResource.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.exe
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.pdb
BIN
View File
Binary file not shown.
Client/obj/Debug/de-DE/OnDoc.resources.dll
BIN
View File
Binary file not shown.