update 20241201

This commit is contained in:
Stefan Hutter
2024-12-01 18:34:28 +01:00
parent 470d2e1bb5
commit fcc74b25cb
5244 changed files with 3378608 additions and 267 deletions

View File

@@ -54,6 +54,8 @@ namespace OnDoc.UIControls
public int barcode_width = 0;
public int barcode_height = 0;
public int barcode_horizontal = 0;
public string barcode_type = "";
public string barcode_content = "";
public UCAllgemeineDokumentParam()
{
@@ -152,20 +154,37 @@ namespace OnDoc.UIControls
catch { }
db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal, barcodetype, datamatrixcontent from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
this.vorlagenr = Convert.ToInt32(dr["office_vorlagenr"]);
this.kopfzeile_generieren = false;
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"]);
this.barcode_height = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bch"]);
this.barcode_horizontal = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bchorizontal"]);
try
{
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][1]) == true) { this.kopfzeile_generieren = true; }
}
catch { }
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"]);
this.barcode_height = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bch"]);
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 sql = "";
sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping ";
sql = sql + "where orig_bcpt = " + barcode_top.ToString() + " and orig_bcpl=" + barcode_left.ToString() + " ";
sql = sql + "and orig_bcw=" + barcode_width.ToString() + " and orig_bch=" + barcode_height.ToString();
db.Get_Tabledata(sql, false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
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"]);
this.barcode_height = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bch"]);
}
}
else
{
@@ -384,6 +403,7 @@ namespace OnDoc.UIControls
}
public void Update_DocGenData()
{
docgendata.partnernr = this.partnernr.ToString();
docgendata.inhaberadresse = this.txtPartnerInhaber.Text;
docgendata.zustelladresse = this.txtPartnerZusteller.Text;
@@ -445,9 +465,13 @@ namespace OnDoc.UIControls
dokdata.barcode_width = barcode_width;
dokdata.barcode_top = barcode_top;
dokdata.barcode_height = barcode_height;
dokdata.barcode_zusatz = barcode_zusatz;
dokdata.barcode_horizontal = barcode_horizontal;
dokdata.barcode_font = AppParams.barcodefont;
dokdata.barcode_fontsize = Convert.ToInt32(AppParams.barcodefontsize);
dokdata.barcode_textposition = AppParams.barcodetextposition;
dokdata.barcode_type = barcode_type;
dokdata.barcode_content = barcode_content;
dokdata.barcode_zusatz = "";
}
private void sfButton1_Click(object sender, EventArgs e)
{