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

@@ -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();
}