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

update 20241206

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-06 21:38:12 +01:00
parent 9dccb8be8f
commit 8ade484063
187 changed files with 60608 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -129,7 +129,8 @@ namespace OnDoc.DocMgmt
dB.add_parameter("@BARCODEFONTSIZE","");
dB.add_parameter("@BarcodeKantenlaenge", "");
dB.Get_Tabledata("sp_get_barcodetype_and_value", true, false);
dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][3].ToString();
dokdata.barcode_content = dB.dsdaten.Tables[0].Rows[0][1].ToString();
dokdata.barcode_text = dB.dsdaten.Tables[0].Rows[0][4].ToString();
dB = null;
}

49
Client/DocMgmt/Dokumentpaket.cs
View File

@@ -37,6 +37,7 @@ namespace OnDoc.DocMgmt
private DataTable dokumentpaketvorlagen_Original = new DataTable();
private int profilnr {get;set;}
public int dokumentpaketnr { get; set; } = 0;
public int partnernr { get; set; } = 0;
public Dokumentpaket()
{
@@ -46,7 +47,18 @@ namespace OnDoc.DocMgmt
Broadcaster().AddListener(this);
Closing += Form_Closing;
}
public Dokumentpaket(int dokumentpaketnr, int partnernr)
{
InitializeComponent();
this.Style.TitleBar.BackColor = Theaming.Titelbar();
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
Broadcaster().AddListener(this);
Closing += Form_Closing;
this.dokumentpaketnr = dokumentpaketnr;
this.partnernr = partnernr;
}
public Dokumentpaket(int profilnr)
{
InitializeComponent();
@@ -139,6 +151,8 @@ namespace OnDoc.DocMgmt
{
dokList1.profilnr = this.profilnr;
dokList1.hide_panels();
dokList1.dokpaket_update_grid();
}
@@ -154,23 +168,32 @@ namespace OnDoc.DocMgmt
private void btnSearchBP_Click(object sender, EventArgs e)
{
if (this.partnernr == 0) {
Partnersuche ps = new Partnersuche();
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
this.txtbpnummer.Text = ps.partnernr.ToString(); ;
this.lblKurznameBP.Text = ps.partnerkurzname.ToString();
if (this.txtbpnummer.Text.Length > 9)
if (ps.DialogResult == DialogResult.OK)
{
MessageBox.Show("Beim gewählten Partner handelt es ich nicht um einBP.", "Partnerselektion", MessageBoxButtons.OK, MessageBoxIcon.Error);
this.txtbpnummer.Text = "";
this.lblKurznameBP.Text = "";
return;
this.txtbpnummer.Text = ps.partnernr.ToString(); ;
this.lblKurznameBP.Text = ps.partnerkurzname.ToString();
if (this.txtbpnummer.Text.Length > 9)
{
MessageBox.Show("Beim gewählten Partner handelt es ich nicht um einBP.", "Partnerselektion", MessageBoxButtons.OK, MessageBoxIcon.Error);
this.txtbpnummer.Text = "";
this.lblKurznameBP.Text = "";
return;
}
}
set_bp_person(ps.partnernr,0);
}
else
{
this.txtbpnummer.Text = partnernr.ToString();
set_bp_person(partnernr, 0);
}
}
private void btnSearchPerson_Click(object sender, EventArgs e)
{
Partnersuche ps = new Partnersuche();
@@ -380,8 +403,9 @@ namespace OnDoc.DocMgmt
if (check_all_doks() == false)
{
return;
}
if (!dokList1.grid_empty())
if (!dokList1.grid_empty() && dokList1.get_selected_records() != 0)
{
if (MessageBox.Show("Die bereits generierten Dokumente löschen?", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
@@ -471,6 +495,7 @@ namespace OnDoc.DocMgmt
progressBarAdv1.Visible = false;
filter = filter.Substring(0, filter.Length - 2) + ")";
dokList1.datafilter = filter;
dokList1.refresh_dokumente("view_dokumentpaket");
dokList1.refresh_dokumente();
}

182
Client/DocMgmt/Serienbrief.Designer.cs generated
View File

@@ -37,6 +37,10 @@
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.rbbpb = new System.Windows.Forms.RadioButton();
this.rbppa = new System.Windows.Forms.RadioButton();
this.rbppohne = new System.Windows.Forms.RadioButton();
this.grpDruckstapel = new System.Windows.Forms.GroupBox();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
@@ -111,12 +115,16 @@
this.panel1 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.panelLoad = new System.Windows.Forms.Panel();
this.label4 = new System.Windows.Forms.Label();
this.ctxmenutree = new System.Windows.Forms.ContextMenuStrip(this.components);
this.partnerlistePrüfenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentgenerierungZurücksetzenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.druckstapelAufbereitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.archivierenUndAbschliessenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.rbppohne = new System.Windows.Forms.RadioButton();
this.rbppa = new System.Windows.Forms.RadioButton();
this.rbbpb = new System.Windows.Forms.RadioButton();
this.GrpDokumentInhalt.SuspendLayout();
this.groupBox1.SuspendLayout();
this.grpDruckstapel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit();
this.pnlprogress.SuspendLayout();
@@ -143,7 +151,8 @@
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panelLoad.SuspendLayout();
this.ctxmenutree.SuspendLayout();
this.SuspendLayout();
//
// GrpDokumentInhalt
@@ -164,6 +173,50 @@
this.GrpDokumentInhalt.TabStop = false;
this.GrpDokumentInhalt.Text = "Dokument-Inahalt";
//
// groupBox1
//
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 = "Fakturierung";
//
// rbbpb
//
this.rbbpb.AutoSize = true;
this.rbbpb.Location = new System.Drawing.Point(166, 24);
this.rbbpb.Name = "rbbpb";
this.rbbpb.Size = new System.Drawing.Size(73, 17);
this.rbbpb.TabIndex = 2;
this.rbbpb.Text = "PP-B-Post";
this.rbbpb.UseVisualStyleBackColor = true;
//
// rbppa
//
this.rbppa.AutoSize = true;
this.rbppa.Location = new System.Drawing.Point(87, 24);
this.rbppa.Name = "rbppa";
this.rbppa.Size = new System.Drawing.Size(73, 17);
this.rbppa.TabIndex = 1;
this.rbppa.Text = "PP-A-Post";
this.rbppa.UseVisualStyleBackColor = true;
//
// rbppohne
//
this.rbppohne.AutoSize = true;
this.rbppohne.Checked = true;
this.rbppohne.Location = new System.Drawing.Point(20, 23);
this.rbppohne.Name = "rbppohne";
this.rbppohne.Size = new System.Drawing.Size(52, 17);
this.rbppohne.TabIndex = 0;
this.rbppohne.TabStop = true;
this.rbppohne.Text = "Keine";
this.rbppohne.UseVisualStyleBackColor = true;
//
// grpDruckstapel
//
this.grpDruckstapel.Controls.Add(this.button2);
@@ -642,6 +695,7 @@
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 579);
this.treeViewAdv1.ContextMenuStrip = this.ctxmenutree;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left;
this.treeViewAdv1.Enabled = false;
//
@@ -1051,6 +1105,65 @@
this.splitContainer1.SplitterDistance = 900;
this.splitContainer1.TabIndex = 5;
//
// panelLoad
//
this.panelLoad.BackColor = System.Drawing.Color.Silver;
this.panelLoad.Controls.Add(this.label4);
this.panelLoad.Location = new System.Drawing.Point(466, 87);
this.panelLoad.Name = "panelLoad";
this.panelLoad.Size = new System.Drawing.Size(578, 100);
this.panelLoad.TabIndex = 6;
this.panelLoad.Visible = false;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(12, 37);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(469, 20);
this.label4.TabIndex = 0;
this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten....";
//
// ctxmenutree
//
this.ctxmenutree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.partnerlistePrüfenToolStripMenuItem,
this.dokumentgenerierungZurücksetzenToolStripMenuItem,
this.druckstapelAufbereitenToolStripMenuItem,
this.archivierenUndAbschliessenToolStripMenuItem});
this.ctxmenutree.Name = "ctxmenutree";
this.ctxmenutree.Size = new System.Drawing.Size(266, 114);
this.ctxmenutree.Opening += new System.ComponentModel.CancelEventHandler(this.ctxmenutree_Opening);
//
// partnerlistePrüfenToolStripMenuItem
//
this.partnerlistePrüfenToolStripMenuItem.Name = "partnerlistePrüfenToolStripMenuItem";
this.partnerlistePrüfenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.partnerlistePrüfenToolStripMenuItem.Text = "Partnerliste prüfen";
this.partnerlistePrüfenToolStripMenuItem.Click += new System.EventHandler(this.partnerlistePrüfenToolStripMenuItem_Click);
//
// dokumentgenerierungZurücksetzenToolStripMenuItem
//
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Name = "dokumentgenerierungZurücksetzenToolStripMenuItem";
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Text = "Dokumentgenerierung zurücksetzen";
this.dokumentgenerierungZurücksetzenToolStripMenuItem.Click += new System.EventHandler(this.dokumentgenerierungZurücksetzenToolStripMenuItem_Click);
//
// druckstapelAufbereitenToolStripMenuItem
//
this.druckstapelAufbereitenToolStripMenuItem.Name = "druckstapelAufbereitenToolStripMenuItem";
this.druckstapelAufbereitenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.druckstapelAufbereitenToolStripMenuItem.Text = "Druckstapel aufbereiten";
this.druckstapelAufbereitenToolStripMenuItem.Click += new System.EventHandler(this.druckstapelAufbereitenToolStripMenuItem_Click);
//
// archivierenUndAbschliessenToolStripMenuItem
//
this.archivierenUndAbschliessenToolStripMenuItem.Name = "archivierenUndAbschliessenToolStripMenuItem";
this.archivierenUndAbschliessenToolStripMenuItem.Size = new System.Drawing.Size(265, 22);
this.archivierenUndAbschliessenToolStripMenuItem.Text = "Archivieren und abschliessen";
this.archivierenUndAbschliessenToolStripMenuItem.Click += new System.EventHandler(this.archivierenUndAbschliessenToolStripMenuItem_Click);
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1060,55 +1173,12 @@
this.docPreview1.TabIndex = 4;
this.docPreview1.ZoomPercentage = 0;
//
// groupBox1
//
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 = "Fakturierung";
//
// rbppohne
//
this.rbppohne.AutoSize = true;
this.rbppohne.Checked = true;
this.rbppohne.Location = new System.Drawing.Point(20, 23);
this.rbppohne.Name = "rbppohne";
this.rbppohne.Size = new System.Drawing.Size(52, 17);
this.rbppohne.TabIndex = 0;
this.rbppohne.TabStop = true;
this.rbppohne.Text = "Keine";
this.rbppohne.UseVisualStyleBackColor = true;
//
// rbppa
//
this.rbppa.AutoSize = true;
this.rbppa.Location = new System.Drawing.Point(87, 24);
this.rbppa.Name = "rbppa";
this.rbppa.Size = new System.Drawing.Size(73, 17);
this.rbppa.TabIndex = 1;
this.rbppa.Text = "PP-A-Post";
this.rbppa.UseVisualStyleBackColor = true;
//
// rbbpb
//
this.rbbpb.AutoSize = true;
this.rbbpb.Location = new System.Drawing.Point(166, 24);
this.rbbpb.Name = "rbbpb";
this.rbbpb.Size = new System.Drawing.Size(73, 17);
this.rbbpb.TabIndex = 2;
this.rbbpb.Text = "PP-B-Post";
this.rbbpb.UseVisualStyleBackColor = true;
//
// Serienbrief
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1633, 955);
this.Controls.Add(this.panelLoad);
this.Controls.Add(this.pnlLoad);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.GrpDokumentInhalt);
@@ -1121,6 +1191,8 @@
this.Text = "Serienbrief";
this.Load += new System.EventHandler(this.Serienbrief_Load);
this.GrpDokumentInhalt.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.grpDruckstapel.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).EndInit();
this.pnlprogress.ResumeLayout(false);
@@ -1152,8 +1224,9 @@
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.panelLoad.ResumeLayout(false);
this.panelLoad.PerformLayout();
this.ctxmenutree.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1239,5 +1312,12 @@
private System.Windows.Forms.RadioButton rbbpb;
private System.Windows.Forms.RadioButton rbppa;
private System.Windows.Forms.RadioButton rbppohne;
private System.Windows.Forms.Panel panelLoad;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.ContextMenuStrip ctxmenutree;
private System.Windows.Forms.ToolStripMenuItem partnerlistePrüfenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dokumentgenerierungZurücksetzenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem druckstapelAufbereitenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem archivierenUndAbschliessenToolStripMenuItem;
}
}

46
Client/DocMgmt/Serienbrief.cs
View File

@@ -406,6 +406,7 @@ namespace OnDoc.UIControls
{
try
{
panelLoad.Visible = true;
this.sb = null;
this.sb = new serienbrief();
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
@@ -425,9 +426,11 @@ namespace OnDoc.UIControls
update_serienbriefdaten(false);
open_sb(sb.serienbriefnr);
treeViewAdv1.Enabled = true;
panelLoad.Visible = false;
}
catch (Exception ex)
{
panelLoad.Visible = false;
Logging.Logging.Debug(ex.Message, "OnDoc", "SB Error");
}
@@ -543,10 +546,14 @@ namespace OnDoc.UIControls
DB db = new DB(AppParams.connectionstring);
if (newsb)
{
db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
db.Get_Tabledata("Select bezeichnung,office_vorlagenr, isnull(vertrag,0) as vertrag, isnull(physisches_archiv,0) as archiv from dokumenttyp where dokumenttypnr=" + sb.dokumenttypnr.ToString(), false, true);
sb.bezeichnung = db.dsdaten.Tables[0].Rows[0][0].ToString();
sb.officevorlagenr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]);
sb.vertrag= Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]);
db.Get_Tabledata("Select beschreibung from physischesarchiv where phyischesarchivnr = " + db.dsdaten.Tables[0].Rows[0][3].ToString(),false,true);
sb.barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString();
if (sb.barcode_zusatz != "") { sb.barcode_zusatz = " / " + sb.barcode_zusatz; }
}
}
@@ -734,6 +741,8 @@ namespace OnDoc.UIControls
sb.barcode_type = db.dsdaten.Tables[0].Rows[0]["barcodetype"].ToString();
sb.barcode_content = db.dsdaten.Tables[0].Rows[0]["datamatrixcontent"].ToString();
string sql = "";
sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping ";
@@ -1824,5 +1833,40 @@ namespace OnDoc.UIControls
}
private void ctxmenutree_Opening(object sender, CancelEventArgs e)
{
partnerlistePrüfenToolStripMenuItem.Visible = false;
dokumentgenerierungZurücksetzenToolStripMenuItem.Visible = false;
druckstapelAufbereitenToolStripMenuItem.Visible = false;
archivierenUndAbschliessenToolStripMenuItem.Visible = false;
if (ribbonButtonPartnerPruefen.Enabled) partnerlistePrüfenToolStripMenuItem.Visible = true;
if (RibbonButtonArchivierenUndAbschlessen.Enabled) archivierenUndAbschliessenToolStripMenuItem.Visible = true;
if (ribbonButtonDruckstapel.Enabled) druckstapelAufbereitenToolStripMenuItem.Visible = true;
if (treeViewAdv1.SelectedNode.Text.Substring(0,4)=="Gene") (dokumentgenerierungZurücksetzenToolStripMenuItem.Visible)=true;
}
private void partnerlistePrüfenToolStripMenuItem_Click(object sender, EventArgs e)
{
ribbonButton2_Click(sender, e);
}
private void dokumentgenerierungZurücksetzenToolStripMenuItem_Click(object sender, EventArgs e)
{
sfDataGridEmpfaenger.SelectAll();
erneutGenerierenToolStripMenuItem_Click(sender, e);
}
private void druckstapelAufbereitenToolStripMenuItem_Click(object sender, EventArgs e)
{
ribbonButtonDruckstapel_Click(sender, e);
}
private void archivierenUndAbschliessenToolStripMenuItem_Click(object sender, EventArgs e)
{
RibbonButtonArchivierenUndAbschlessen_Click(sender, e);
}
}
}

3
Client/DocMgmt/Serienbrief.resx
View File

@@ -120,6 +120,9 @@
<metadata name="ctxmenuEmpfaenger.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>156, 17</value>
</metadata>
<metadata name="ctxmenutree.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>321, 17</value>
</metadata>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>