update 20250126
This commit is contained in:
1 parent
608c67d21b
commit
3f765247ee
97 files changed
+274
-98
No files matched your search
@@ -822,6 +822,7 @@
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="UIControls\Administrator\AdminDokTypGenerierung.resx">
|
||||
<DependentUpon>AdminDokTypGenerierung.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="UIControls\Administrator\Dokumenttyp.resx">
|
||||
<DependentUpon>Dokumenttyp.cs</DependentUpon>
|
||||
|
||||
+5
-2
@@ -68,9 +68,9 @@
|
||||
// btnDokumenterstellen
|
||||
//
|
||||
this.btnDokumenterstellen.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
|
||||
this.btnDokumenterstellen.Location = new System.Drawing.Point(915, 638);
|
||||
this.btnDokumenterstellen.Location = new System.Drawing.Point(905, 638);
|
||||
this.btnDokumenterstellen.Name = "btnDokumenterstellen";
|
||||
this.btnDokumenterstellen.Size = new System.Drawing.Size(124, 28);
|
||||
this.btnDokumenterstellen.Size = new System.Drawing.Size(134, 28);
|
||||
this.btnDokumenterstellen.TabIndex = 17;
|
||||
this.btnDokumenterstellen.Text = "Dokument erstellen";
|
||||
this.btnDokumenterstellen.Click += new System.EventHandler(this.sfButton2_Click);
|
||||
@@ -265,6 +265,8 @@
|
||||
//
|
||||
this.ucAllgemeineDokumentParam1.ausDokumentpaket = false;
|
||||
this.ucAllgemeineDokumentParam1.barcode = false;
|
||||
this.ucAllgemeineDokumentParam1.bedingt_retournierbar = false;
|
||||
this.ucAllgemeineDokumentParam1.bpdokument = false;
|
||||
this.ucAllgemeineDokumentParam1.bpperson_error_type = 0;
|
||||
this.ucAllgemeineDokumentParam1.check_error = "";
|
||||
this.ucAllgemeineDokumentParam1.checkpartner = true;
|
||||
@@ -292,6 +294,7 @@
|
||||
clsdocgendata1.zustaendigmitarbeiter = null;
|
||||
clsdocgendata1.zustelladresse = null;
|
||||
this.ucAllgemeineDokumentParam1.docgendata = clsdocgendata1;
|
||||
this.ucAllgemeineDokumentParam1.dokumentid = "";
|
||||
this.ucAllgemeineDokumentParam1.dokumenttypnr = 0;
|
||||
this.ucAllgemeineDokumentParam1.genertated_dokumentid = null;
|
||||
this.ucAllgemeineDokumentParam1.interop = false;
|
||||
|
||||
@@ -80,6 +80,8 @@ namespace OnDoc.DocMgmt
|
||||
Closing += Form_Closing;
|
||||
this.dokumentid=dokumentid;
|
||||
this.editdoc = true;
|
||||
btnDokumenterstellen.Text = "Dokument bearbeiten";
|
||||
|
||||
}
|
||||
|
||||
private void Form_Closing(object sender, CancelEventArgs e)
|
||||
|
||||
@@ -462,6 +462,7 @@ namespace OnDoc.UICintrols
|
||||
var datarow = record as DataRowView;
|
||||
string documentid = datarow["dokumentid"].ToString();
|
||||
dokument_bearbeiten(documentid, false);
|
||||
|
||||
}
|
||||
}
|
||||
public void dokument_bearbeiten(string dokid, bool newdok = false)
|
||||
@@ -511,16 +512,55 @@ namespace OnDoc.UICintrols
|
||||
else
|
||||
{
|
||||
Dokumenterstellung dokbearbeitung = new Dokumenterstellung(selected_dokumentid);
|
||||
if (dokbearbeitung.ShowDialog() == DialogResult.Abort)
|
||||
dokbearbeitung.ShowDialog();
|
||||
DB db1 = new DB(AppParams.connectionstring);
|
||||
switch (dokbearbeitung.DocFunction)
|
||||
{
|
||||
DB db1 = new DB(AppParams.connectionstring);
|
||||
db1.Dok_in_Bearbeitung(2, selected_dokumentid, AppParams.CurrentMitarbeiter);
|
||||
db1 = null;
|
||||
case 0:
|
||||
db1.Dok_in_Bearbeitung(2, selected_dokumentid, AppParams.CurrentMitarbeiter);
|
||||
db1 = null;
|
||||
break;
|
||||
case 1:
|
||||
Cursor = Cursors.WaitCursor;
|
||||
System.Windows.Forms.Application.DoEvents();
|
||||
selected_dokumentid = dokbearbeitung.dokumentid;
|
||||
selected_partnernr = dokbearbeitung.partnernr.ToString(); ;
|
||||
interop = dokbearbeitung.interop;
|
||||
runmacros = dokbearbeitung.runmacros;
|
||||
dok = GetDoc(false);
|
||||
OpenDoc(dok, true, interop, false);
|
||||
Cursor = Cursors.Default;
|
||||
System.Windows.Forms.Application.DoEvents();
|
||||
break;
|
||||
case 6:
|
||||
//DB db1 = new DB(AppParams.connectionstring);
|
||||
selected_dokumentid = dokbearbeitung.dokumentid;
|
||||
selected_partnernr = dokbearbeitung.partnernr.ToString(); ;
|
||||
interop = dokbearbeitung.interop;
|
||||
//runmacros = dokbearbeitung.runmacros;
|
||||
string filename = dokbearbeitung.filename;
|
||||
|
||||
|
||||
Logging.Logging.Debug("Doklist Docfunction=6", "Doklist", "");
|
||||
//db1.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbeiter);
|
||||
//db1 = null;
|
||||
clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
OpenDoc(dok, true, interop, runmacros);
|
||||
};
|
||||
db1 = null;
|
||||
|
||||
//if (dokbearbeitung.ShowDialog() == DialogResult.Abort)
|
||||
//{
|
||||
// DB db1 = new DB(AppParams.connectionstring);
|
||||
// db1.Dok_in_Bearbeitung(2, selected_dokumentid, AppParams.CurrentMitarbeiter);
|
||||
// db1 = null;
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// OpenDoc(dok, true, interop, runmacros);
|
||||
//};
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -670,7 +670,11 @@ namespace OnDoc.UIControls
|
||||
if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; }
|
||||
if (docgendata.frormularOhneUnterschrift==true) { dokdata.Form_ohne_Unterschrift = "True" ; } else { dokdata.Form_ohne_Unterschrift = "False"; }
|
||||
|
||||
|
||||
dokdata.Zustaendig_Kube = "0";
|
||||
if (this.rbzustaendigkube.Checked)
|
||||
{
|
||||
dokdata.Zustaendig_Kube = "1";
|
||||
};
|
||||
dokdata.dokumentwerte = docgendata.dokumentwerte;
|
||||
dokdata.Barcode = barcode;
|
||||
dokdata.VorlageNr = this.vorlagenr.ToString();
|
||||
@@ -1024,7 +1028,7 @@ namespace OnDoc.UIControls
|
||||
{
|
||||
rbzustaendigkube.Checked = true;
|
||||
rbzustaendigmitarbeiter.Checked = false;
|
||||
cbboxzustaendigkube.SelectedValue = Convert.ToInt32(dr["zustaendig_kube"]);
|
||||
cbboxzustaendigkube.SelectedValue = Convert.ToInt32(dr["zustaendiger"]);
|
||||
} else
|
||||
{
|
||||
rbzustaendigmitarbeiter.Checked = true;
|
||||
|
||||
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user