update 20250711

This commit is contained in:
Stefan Hutter
2025-07-11 15:01:53 +02:00
parent 68e4725ff5
commit df8777631a
86 changed files with 236 additions and 68 deletions

View File

@@ -60,11 +60,11 @@
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(150, 330);
this.label2.Location = new System.Drawing.Point(156, 330);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(142, 26);
this.label2.Size = new System.Drawing.Size(135, 26);
this.label2.TabIndex = 2;
this.label2.Text = "26. Juni 2025";
this.label2.Text = "11. Juli 2025";
this.label2.Click += new System.EventHandler(this.label2_Click);
//
// SplashScreen

View File

@@ -29,7 +29,7 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Dokumenterstellung));
Model.clsdocgendata clsdocgendata1 = new Model.clsdocgendata();
Model.clsdocgendata clsdocgendata6 = new Model.clsdocgendata();
this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton();
this.btnDokumenterstellen = new Syncfusion.WinForms.Controls.SfButton();
this.PnlPreview = new System.Windows.Forms.Panel();
@@ -37,7 +37,6 @@
this.GrpFnkt = new System.Windows.Forms.GroupBox();
this.label7 = new System.Windows.Forms.Label();
this.btnOfficePrint = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.ribbonButtonVersandstrasse = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
@@ -99,7 +98,6 @@
this.GrpFnkt.BackColor = System.Drawing.Color.SeaShell;
this.GrpFnkt.Controls.Add(this.label7);
this.GrpFnkt.Controls.Add(this.btnOfficePrint);
this.GrpFnkt.Controls.Add(this.label6);
this.GrpFnkt.Controls.Add(this.label5);
this.GrpFnkt.Controls.Add(this.ribbonButtonVersandstrasse);
this.GrpFnkt.Controls.Add(this.label4);
@@ -140,30 +138,20 @@
this.btnOfficePrint.UseVisualStyleBackColor = true;
this.btnOfficePrint.Click += new System.EventHandler(this.btnOfficePrint_Click);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(515, 106);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(79, 13);
this.label6.TabIndex = 11;
this.label6.Text = "Versandstrasse";
this.label6.Visible = false;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(525, 94);
this.label5.Location = new System.Drawing.Point(450, 94);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 13);
this.label5.Size = new System.Drawing.Size(79, 13);
this.label5.TabIndex = 10;
this.label5.Text = "Archivieren";
this.label5.Text = "Versandstrasse";
this.label5.Visible = false;
//
// ribbonButtonVersandstrasse
//
this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Versandstrasse_48x48_32;
this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(519, 14);
this.ribbonButtonVersandstrasse.Image = global::OnDoc.Properties.Resources.Envelope_48x48_32;
this.ribbonButtonVersandstrasse.Location = new System.Drawing.Point(452, 14);
this.ribbonButtonVersandstrasse.Name = "ribbonButtonVersandstrasse";
this.ribbonButtonVersandstrasse.Size = new System.Drawing.Size(75, 79);
this.ribbonButtonVersandstrasse.TabIndex = 9;
@@ -270,30 +258,30 @@
this.ucAllgemeineDokumentParam1.bpperson_error_type = 0;
this.ucAllgemeineDokumentParam1.check_error = "";
this.ucAllgemeineDokumentParam1.checkpartner = true;
clsdocgendata1.anrede = null;
clsdocgendata1.bezeichnung = null;
clsdocgendata1.digitaleunterschrift = false;
clsdocgendata1.dokumentdatum = null;
clsdocgendata1.dokumenttypnr = null;
clsdocgendata1.dokumentwerte = null;
clsdocgendata1.ersteller = null;
clsdocgendata1.erstelling_in_office = false;
clsdocgendata1.erstellungsart = Model.Erstellungsart.DokumentBearbeiten;
clsdocgendata1.frormularOhneUnterschrift = false;
clsdocgendata1.inhaberadresse = null;
clsdocgendata1.logo = "";
clsdocgendata1.partnernr = null;
clsdocgendata1.postzustellung = null;
clsdocgendata1.status = null;
clsdocgendata1.team = null;
clsdocgendata1.unterschriftLinks = null;
clsdocgendata1.unterschriftRehts = null;
clsdocgendata1.verantwortlich = null;
clsdocgendata1.versandstrasse_moeglich = false;
clsdocgendata1.zustaendigkube = null;
clsdocgendata1.zustaendigmitarbeiter = null;
clsdocgendata1.zustelladresse = null;
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata1;
clsdocgendata6.anrede = null;
clsdocgendata6.bezeichnung = null;
clsdocgendata6.digitaleunterschrift = false;
clsdocgendata6.dokumentdatum = null;
clsdocgendata6.dokumenttypnr = null;
clsdocgendata6.dokumentwerte = null;
clsdocgendata6.ersteller = null;
clsdocgendata6.erstelling_in_office = false;
clsdocgendata6.erstellungsart = Model.Erstellungsart.DokumentBearbeiten;
clsdocgendata6.frormularOhneUnterschrift = false;
clsdocgendata6.inhaberadresse = null;
clsdocgendata6.logo = "";
clsdocgendata6.partnernr = null;
clsdocgendata6.postzustellung = null;
clsdocgendata6.status = null;
clsdocgendata6.team = null;
clsdocgendata6.unterschriftLinks = null;
clsdocgendata6.unterschriftRehts = null;
clsdocgendata6.verantwortlich = null;
clsdocgendata6.versandstrasse_moeglich = false;
clsdocgendata6.zustaendigkube = null;
clsdocgendata6.zustaendigmitarbeiter = null;
clsdocgendata6.zustelladresse = null;
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata6;
this.ucAllgemeineDokumentParam1.dokumentid = "";
this.ucAllgemeineDokumentParam1.dokumenttypnr = 0;
this.ucAllgemeineDokumentParam1.genertated_dokumentid = null;
@@ -349,7 +337,6 @@
private UIControls.DocPreview docPreview1;
private System.Windows.Forms.GroupBox GrpFnkt;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Button ribbonButtonVersandstrasse;
private System.Windows.Forms.Label label4;

View File

@@ -17,6 +17,7 @@ using Database;
using OnDoc.UIControls;
using BroadcastListener.Classes;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
using OnDoc.Helper;
using DOCGEN;
@@ -111,6 +112,7 @@ namespace OnDoc.DocMgmt
}
private void Dokumenterstellung_Load(object sender, EventArgs e)
{
this.Style.TitleBar.BackColor = Theaming.Titelbar();
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
@@ -303,9 +305,16 @@ namespace OnDoc.DocMgmt
db.Save_To_DB(dokdata.Dokumentid, filename);
db = null;
}
ribbonButtonVersandstrasse.Visible = false;
label5.Visible = false;
if (ucAllgemeineDokumentParam1.docgendata.versandstrasse_moeglich == true)
{
ribbonButtonVersandstrasse.Enabled = true;
ribbonButtonVersandstrasse.Visible = true;
label5.Visible = true;
}
else { ribbonButtonVersandstrasse.Enabled = false; }
@@ -372,9 +381,57 @@ namespace OnDoc.DocMgmt
this.Close();
}
private void reserve_vs_dokument(string dokumentid, int fnkt)
{
DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.add_parameter("@dokumentid", dokumentid);
db.add_parameter("@mitarbeiter", AppParams.CurrentMitarbeiter.ToString());
db.add_parameter("@fnkt", fnkt.ToString());
db.Get_Tabledata("Ondoc_Handle_Versandstrasse_Reserved_Dokcuments", true, false);
db = null;
}
OnDoc.Versandstrasse.Versandstrasse vs;
private void button5_Click(object sender, EventArgs e)
{
DocFunction = 5;
List<Versandpaket> versandpakete = new List<Versandpaket>();
if (this.partnernr < 99999999)
{
Versandpaket vp = new Versandpaket();
vp.Dokument = new List<Versanddokument>();
vp.partnernr = ucAllgemeineDokumentParam1.partnernr;
vp.Versandoption = "B2_POST";
vp.Mitteilung = "";
vp.GAS = "";
vp.GASAdresse = "";
vp.PaketNr = Guid.NewGuid().ToString();
DB db1 = new DB(AppParams.connectionstring);
db1.Dok_in_Bearbeitung(2, this.dokumentid, AppParams.CurrentMitarbeiter);
db1.Get_Tabledata("Select bezeichnung from dokumenttyp where dokumenttypnr="+this.ucAllgemeineDokumentParam1.dokumenttypnr.ToString(),false,true);
vp.Dokument.Add(new Versanddokument(this.dokumentid, db1.dsdaten.Tables[0].Rows[0][0].ToString(),vp.partnernr.ToString()));
db1 = null;
reserve_vs_dokument(this.dokumentid, 1);
versandpakete.Add(vp);
}
try
{
vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete);
vs.ShowDialog();
vs.BringToFront();
AppParams.versandstrassewindows_open = false;
}
catch
{
}
this.Close();
}

View File

@@ -77,15 +77,15 @@
this.zoomIn,
this.zoomOut,
this.zoomComboBox,
this.toolStripButton1,
this.FitPage,
this.FitWidth,
this.toolStripButton1,
this.tsbtnrefresh,
this.tsschnellansicht});
this.Open.Location = new System.Drawing.Point(3, 0);
this.Open.Name = "Open";
this.Open.Padding = new System.Windows.Forms.Padding(5);
this.Open.Size = new System.Drawing.Size(665, 41);
this.Open.Size = new System.Drawing.Size(552, 41);
this.Open.TabIndex = 5;
this.Open.Text = "toolStrip1";
//

View File

@@ -125,10 +125,10 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADRSURBVDhPY3CLL/8Pw65x5Q8YSATOsRXCrvGlGxgoMcgt
rtTRLb7sCUgvWQbZ29ezuMWXt9n7pf2F6SXZIOfECiW3+LITyPpINsgtoSzKJaL8E7ohRBvkl1TK6xpX
rtTRLb7sCUgvWQbZ29ezuMWXt9n7pv6F6SXZIOfECiW3+LITyPpINsgtoSzKJaL8E7ohRBvkl1TK6xpX
vghdM0kGeSRUmLrGl99B14iO8RrkElsuh8sr6BivQSDgkVip5RZbcgldIzomaBAI2MfXc7jGl09G10yy
QTDgFlvq4xZf/hrdEJINAgGXpFIpt9jyPRQbBAL19fVMbnHl5W7xab8pMggGkJMGRQaBACyxAgDrfTPa
tvmLXAAAAABJRU5ErkJggg==
QTDgFlvq4xZf/hrdEJINAgGXpFIpt9jyPRQbBAL19fVMbnHl5W7xqb8pMggGkJMGRQaBACyxAgDj9DPX
njG3twAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnPrevious.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -136,8 +136,8 @@
iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACtSURBVDhPY2AgAXjFl0i4xZVtRRfHCdziy4Pd4oveuMWX
/0eXwwAuaeX8rnHli0CKYRhdDQpwiyt1dIwpe4SsAacm+/h6Drf4sj63+PJ/6BqwanKOLTd0jSu7iq4Q
q6bQ0FBml7jyKrf4tN/oitAxWINbTIWKa3zZMXRJXJjBNa4s3S2+/Au6BD5MniaynEd2QCADkoIcGZAc
uciApGSEDEhOsMiApKyBDGCZEACF9g6WWkMUggAAAABJRU5ErkJggg==
q6bQ0FBml7jyKrf41N/oitAxWINbTIWKa3zZMXRJXJjBNa4s3S2+/Au6BD5MniaynEd2QCADkoIcGZAc
uciApGSEDEhOsMiApKyBDGCZEACCLQ6UhY/boQAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnNext.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -145,39 +145,39 @@
iVBORw0KGgoAAAANSUhEUgAAAA0AAAASCAYAAACAa1QyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPY3CNLd3iFV8iwUAKcIsv/+8WX/7aPaEsCF0O
J4BqAmPX+LKFHtH1fOhqMACyJggueugeX+6Arg4FYGoC439u8eW99vH1HOjqwQCLBjh2iS+/4hpfYoCu
B68mMPYr/+UaV1YZGhrKTLwmKHaJKz/qEVeiTJImKP7iFl+RRltNpDmP1IAgNchJjVwSkxGpCZa0rEFO
JgQA6ZMOnBDgDiMAAAAASUVORK5CYII=
B68mMPYt/+UaV1YZGhrKTLwmKHaJKz/qEVeiTJImKP7iFl+RRltNpDmP1IAgNchJjVwSkxGpCZa0rEFO
JgQA5egOmulL3r0AAAAASUVORK5CYII=
</value>
</data>
<data name="btnLast.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAAPCAYAAADphp8SAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADVSURBVDhPY3CNK1/kl1TKy0AicI0rf+AWX/4fhhlAhGt8
+R2PhApTdMX4AFaDIDjtt1tceXl9fT0TuiZsAI9BEOwaX7bbJalUCl0jOiBoEBS/dost9UHXjAyINQjq
+R2PhApTdMX4AFaDIDj1t1tceXl9fT0TuiZsAI9BEOwaX7bbJalUCl0jOiBoEBS/dost9UHXjAyINQjq
uvLJ9vH1HOiGgABJBoFxbMklj8RKLcoNii//7xJR/skltlyOIoNwJQ2SDMKXWIkyCOQVt4SyKHTNyIAI
g8pOOCdWKKFrRAc4DbL3S/vrFl/eZm9fz4KuCRvAYVDZE7e4Ukd0xfgAhkGu8aUbnGMrhNEVEgLoBgEA
xIcz2dQw6AYAAAAASUVORK5CYII=
g8pOOCdWKKFrRAc4DbL3Tf3rFl/eZm9fz4KuCRvAYVDZE7e4Ukd0xfgAhkGu8aUbnGMrhNEVEgLoBgEA
vzwz1r076J0AAAAASUVORK5CYII=
</value>
</data>
<data name="zoomIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADMSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf9BmEw
GyQWVxEJUoOuDwW4JZS5usaX33GLL/+PDzvHl9x2j61wQdcPBm5xZZn2fml/0TXhwmC1cWWZKIa4xpUH
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADMSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf+BmEw
GyQWVxEJUoOuDwW4JZS5usaX33GLL/+PDzvHl9x2j61wQdcPBm5xZZn2vql/0TXhwmC1cWWZKIa4xpUH
oiskFoP0gg2xj88XcIoufoWugFgM0gsyg8EtvjwXXZIMnMvgEld+CIsESRhkBshF35AF3ePLHYjBaIZ9
AxmEYjpKLOABGPrQXeQaX2JADMZwETXDiDqxRrV0BAJUSdnwWKBGXoMBquR+GCC3PAIAFcnw/PEJ/FIA
AxmEYjpKLOABGPrQXeQaX2JADMZwETXDiDqxRrV0BAJUSdnwWKBGXoMBquR+GCC3PAIA+Kbw8P6QEA4A
AAAASUVORK5CYII=
</value>
</data>
<data name="zoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABIAAAARCAYAAADQWvz5AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEbSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf9BmEw
GyQWVxEJUoOuDwW4x1a4uMaX33GLL/+PDzvHl9wGqUXXDwZucWWZ9n5pf9E14cJgtXFlmSiGuMaVB6Ir
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEbSURBVDhPY2BAA/b29SwucRWRbnFlq1ziyx+7xaf+BmEw
GyQWVxEJUoOuDwW4x1a4uMaX33GLL/+PDzvHl9wGqUXXDwZucWWZ9r6pf9E14cJgtXFlmSiGuMaVB6Ir
BCuOL/voHFdyAYRBbHR5EAbpBRtiH58v4BRd/ApdAVhRfOkGuGXxpRvQ5UEYpBdkBoNbfHkuuiQpBkFx
LoNLXPkhLBIkGQQyA+Sib8iC7vHlDjDsGlOpAzcoplIHWQ7NsG8gg1BMh2kkBDD0obvINb7EAI5jihVh
GkFsZDkMF1EzjKgTa1RLR2BFOFK2W3zRG7f48gMQDGZjqIGnbBigSl6DAbeEMldicj9IDc7cDwPw8ii+
fLVbfNkTYssjAPMozQbaRklFAAAAAElFTkSuQmCC
fLVbfNkTYssjANYUzPoM0k19AAAAAElFTkSuQmCC
</value>
</data>
<data name="FitPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -716,6 +716,14 @@ namespace OnDoc.UICintrols
//db1.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbeiter);
//db1 = null;
clsProcessWatch.AddToList(selected_dokumentid, filename, apptype);
break;
case 4:
archivedoc(dokbearbeitung.dokumentid);
break;
case 5:
break;
break;
default:
break;
@@ -1960,6 +1968,7 @@ namespace OnDoc.UICintrols
//dokumentAnVersandstrasseToolStripMenuItem.Visible = true;
refresh_dokumente();
}
private void RibbonButtonFavoriten_Click(object sender, EventArgs e)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.