diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 8e4d8beb..3ca9085c 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -737,6 +737,8 @@ Public Class cFakturierung If FIRMA.Firma_ID = 4 Then rpt.lblEORIUeberschrift.Text = "St-Nr.:" + rpt.lblFirma.Visible = False + rpt.Line15.Visible = False End If Select Case FIRMA.Firma_ID'VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -1086,6 +1088,8 @@ Public Class cFakturierung If FIRMA.Firma_ID = 4 Then rpt.lblWarenWertUeberschrift.Visible = False rpt.txtWarenwert.Visible = False + rpt.txtGrenze.Visible = False + rpt.txtGrenzeUeberschrift.Visible = False End If rpt.txtZollbelegNr.Text = If(RECHNUNG.BelegNr, "") @@ -1127,7 +1131,12 @@ Public Class cFakturierung 'rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(RECHNUNG.RechnungsLandKz, "", RECHNUNG.RechnungSprache).ToString.ToUpper If KD_RG IsNot Nothing AndAlso If(KD_RG.Steuernummer, "") <> String.Empty Then - rpt.lblRechnung_Steuernummer.Text = If(KD_RG.LandKz, "") & " " & If(KD_RG.Steuernummer, "").ToString.Trim + If RECHNUNG.Firma_ID = 4 Then + rpt.lblRechnung_Steuernummer.Text = If(KD_RG.Steuernummer, "").ToString.Trim 'ohne LandKz gewünscht + Else + rpt.lblRechnung_Steuernummer.Text = If(KD_RG.LandKz, "") & " " & If(KD_RG.Steuernummer, "").ToString.Trim + End If + ' rpt.lblRechnung_UID.Text = If(KD_RG.UstIdKz, "") & " " & If(KD_RG.UstIdNr, "").ToString.Trim Else rpt.lblRechnung_Steuernummer.Text = "" diff --git a/SDL/Fakturierung/rptRechnungDruck.Designer.vb b/SDL/Fakturierung/rptRechnungDruck.Designer.vb index 4941635e..e1f30281 100644 --- a/SDL/Fakturierung/rptRechnungDruck.Designer.vb +++ b/SDL/Fakturierung/rptRechnungDruck.Designer.vb @@ -1682,7 +1682,6 @@ Partial Public Class rptRechnungDruck Public WithEvents Line5 As GrapeCity.ActiveReports.SectionReportModel.Line Public WithEvents Line7 As GrapeCity.ActiveReports.SectionReportModel.Line Public WithEvents Line14 As GrapeCity.ActiveReports.SectionReportModel.Line - Private WithEvents Line15 As GrapeCity.ActiveReports.SectionReportModel.Line Public WithEvents lblFirma As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Line17 As GrapeCity.ActiveReports.SectionReportModel.Line Public WithEvents txtHandlingATA As GrapeCity.ActiveReports.SectionReportModel.TextBox @@ -1696,4 +1695,5 @@ Partial Public Class rptRechnungDruck Public WithEvents lblLKWIdUebeschrift As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblZollbelegNr As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents txtBeförderungsmittelUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents Line15 As GrapeCity.ActiveReports.SectionReportModel.Line End Class diff --git a/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb similarity index 78% rename from SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.Designer.vb rename to SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb index c71eea64..2302fdc3 100644 --- a/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb @@ -22,11 +22,11 @@ Partial Class usrCntlQualitaetskontrolle 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Label46 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.Label40 = New System.Windows.Forms.Label() @@ -58,12 +58,17 @@ Partial Class usrCntlQualitaetskontrolle Me.txtFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label30 = New System.Windows.Forms.Label() Me.dgvPositionen = New System.Windows.Forms.DataGridView() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.pos = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.anZ_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.art_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.erzeugnis = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.txtPackAdresse2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPackAdresse1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPackFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label2 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() - Me.MyTextBox4 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPackHerrFrau = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label3 = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() @@ -73,7 +78,7 @@ Partial Class usrCntlQualitaetskontrolle Me.Label8 = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label() Me.Label11 = New System.Windows.Forms.Label() - Me.cbxEinf = New System.Windows.Forms.ComboBox() + Me.cbxEinf = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxTyp = New System.Windows.Forms.ComboBox() Me.Label12 = New System.Windows.Forms.Label() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -81,13 +86,13 @@ Partial Class usrCntlQualitaetskontrolle Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.pos = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.anZ_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.art_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.erzeugnis = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.cbxUrsprungslang = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxBestimmungsland = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.txtLRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Button4 = New System.Windows.Forms.Button() + Me.cboZollstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label15 = New System.Windows.Forms.Label() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvPositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -126,7 +131,7 @@ Partial Class usrCntlQualitaetskontrolle 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(838, 663) + Me.Label7.Location = New System.Drawing.Point(838, 648) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(49, 13) Me.Label7.TabIndex = 97 @@ -135,7 +140,7 @@ Partial Class usrCntlQualitaetskontrolle 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(692, 660) + Me.Label9.Location = New System.Drawing.Point(692, 645) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(61, 13) Me.Label9.TabIndex = 93 @@ -302,7 +307,7 @@ Partial Class usrCntlQualitaetskontrolle Me.txtBeschauDat._WaehrungZeichen = True Me.txtBeschauDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtBeschauDat.ForeColor = System.Drawing.Color.Black - Me.txtBeschauDat.Location = New System.Drawing.Point(312, 4) + Me.txtBeschauDat.Location = New System.Drawing.Point(311, 4) Me.txtBeschauDat.MaxLength = 10 Me.txtBeschauDat.MaxLineLength = -1 Me.txtBeschauDat.MaxLines_Warning = "" @@ -372,7 +377,7 @@ Partial Class usrCntlQualitaetskontrolle Me.txtGewicht._Waehrung = False Me.txtGewicht._WaehrungZeichen = True Me.txtGewicht.ForeColor = System.Drawing.Color.Black - Me.txtGewicht.Location = New System.Drawing.Point(893, 657) + Me.txtGewicht.Location = New System.Drawing.Point(893, 642) Me.txtGewicht.MaxLineLength = -1 Me.txtGewicht.MaxLines_Warning = "" Me.txtGewicht.MaxLines_Warning_Label = Nothing @@ -395,7 +400,7 @@ Partial Class usrCntlQualitaetskontrolle Me.txtAnzVerp._Waehrung = False Me.txtAnzVerp._WaehrungZeichen = True Me.txtAnzVerp.ForeColor = System.Drawing.Color.Black - Me.txtAnzVerp.Location = New System.Drawing.Point(759, 657) + Me.txtAnzVerp.Location = New System.Drawing.Point(759, 642) Me.txtAnzVerp.MaxLineLength = -1 Me.txtAnzVerp.MaxLines_Warning = "" Me.txtAnzVerp.MaxLines_Warning_Label = Nothing @@ -522,7 +527,7 @@ Partial Class usrCntlQualitaetskontrolle ' Me.Label30.AutoSize = True Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label30.Location = New System.Drawing.Point(52, 306) + Me.Label30.Location = New System.Drawing.Point(52, 291) Me.Label30.Name = "Label30" Me.Label30.Size = New System.Drawing.Size(105, 13) Me.Label30.TabIndex = 146 @@ -534,79 +539,118 @@ Partial Class usrCntlQualitaetskontrolle Me.dgvPositionen.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable Me.dgvPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.pos, Me.anZ_pkgstk, Me.art_pkgstk, Me.erzeugnis, Me.gewicht}) - Me.dgvPositionen.Location = New System.Drawing.Point(180, 306) + Me.dgvPositionen.Location = New System.Drawing.Point(180, 291) Me.dgvPositionen.Name = "dgvPositionen" Me.dgvPositionen.Size = New System.Drawing.Size(791, 345) Me.dgvPositionen.TabIndex = 156 ' - 'MyTextBox1 + 'pos ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = False - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._numbersOnlyTrennzeichen = True - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._TimeOnly_Seconds = False - Me.MyTextBox1._value = Nothing - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(262, 169) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(709, 20) - Me.MyTextBox1.TabIndex = 168 + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle1.Format = "N0" + DataGridViewCellStyle1.NullValue = Nothing + Me.pos.DefaultCellStyle = DataGridViewCellStyle1 + Me.pos.Frozen = True + Me.pos.HeaderText = "Position" + Me.pos.MaxInputLength = 3 + Me.pos.Name = "pos" + Me.pos.ReadOnly = True + Me.pos.Width = 50 ' - 'MyTextBox2 + 'anZ_pkgstk ' - Me.MyTextBox2._DateTimeOnly = False - Me.MyTextBox2._numbersOnly = False - Me.MyTextBox2._numbersOnlyKommastellen = "" - Me.MyTextBox2._numbersOnlyTrennzeichen = True - Me.MyTextBox2._Prozent = False - Me.MyTextBox2._ShortDateNew = False - Me.MyTextBox2._ShortDateOnly = False - Me.MyTextBox2._TimeOnly = False - Me.MyTextBox2._TimeOnly_Seconds = False - Me.MyTextBox2._value = Nothing - Me.MyTextBox2._Waehrung = False - Me.MyTextBox2._WaehrungZeichen = True - Me.MyTextBox2.ForeColor = System.Drawing.Color.Black - Me.MyTextBox2.Location = New System.Drawing.Point(262, 150) - Me.MyTextBox2.MaxLineLength = -1 - Me.MyTextBox2.MaxLines_Warning = "" - Me.MyTextBox2.MaxLines_Warning_Label = Nothing - Me.MyTextBox2.Name = "MyTextBox2" - Me.MyTextBox2.Size = New System.Drawing.Size(709, 20) - Me.MyTextBox2.TabIndex = 167 + Me.anZ_pkgstk.HeaderText = "Anz-Packs." + Me.anZ_pkgstk.Name = "anZ_pkgstk" ' - 'MyTextBox3 + 'art_pkgstk ' - Me.MyTextBox3._DateTimeOnly = False - Me.MyTextBox3._numbersOnly = False - Me.MyTextBox3._numbersOnlyKommastellen = "" - Me.MyTextBox3._numbersOnlyTrennzeichen = True - Me.MyTextBox3._Prozent = False - Me.MyTextBox3._ShortDateNew = False - Me.MyTextBox3._ShortDateOnly = False - Me.MyTextBox3._TimeOnly = False - Me.MyTextBox3._TimeOnly_Seconds = False - Me.MyTextBox3._value = Nothing - Me.MyTextBox3._Waehrung = False - Me.MyTextBox3._WaehrungZeichen = True - Me.MyTextBox3.ForeColor = System.Drawing.Color.Black - Me.MyTextBox3.Location = New System.Drawing.Point(262, 131) - Me.MyTextBox3.MaxLineLength = -1 - Me.MyTextBox3.MaxLines_Warning = "" - Me.MyTextBox3.MaxLines_Warning_Label = Nothing - Me.MyTextBox3.Name = "MyTextBox3" - Me.MyTextBox3.Size = New System.Drawing.Size(684, 20) - Me.MyTextBox3.TabIndex = 163 + Me.art_pkgstk.HeaderText = "Art-Packs" + Me.art_pkgstk.Name = "art_pkgstk" + ' + 'erzeugnis + ' + Me.erzeugnis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.erzeugnis.HeaderText = "Art des Erzeugnisses" + Me.erzeugnis.Name = "erzeugnis" + ' + 'gewicht + ' + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle2.Format = "N2" + DataGridViewCellStyle2.NullValue = Nothing + Me.gewicht.DefaultCellStyle = DataGridViewCellStyle2 + Me.gewicht.HeaderText = "Gewicht" + Me.gewicht.MaxInputLength = 100 + Me.gewicht.Name = "gewicht" + ' + 'txtPackAdresse2 + ' + Me.txtPackAdresse2._DateTimeOnly = False + Me.txtPackAdresse2._numbersOnly = False + Me.txtPackAdresse2._numbersOnlyKommastellen = "" + Me.txtPackAdresse2._numbersOnlyTrennzeichen = True + Me.txtPackAdresse2._Prozent = False + Me.txtPackAdresse2._ShortDateNew = False + Me.txtPackAdresse2._ShortDateOnly = False + Me.txtPackAdresse2._TimeOnly = False + Me.txtPackAdresse2._TimeOnly_Seconds = False + Me.txtPackAdresse2._value = Nothing + Me.txtPackAdresse2._Waehrung = False + Me.txtPackAdresse2._WaehrungZeichen = True + Me.txtPackAdresse2.ForeColor = System.Drawing.Color.Black + Me.txtPackAdresse2.Location = New System.Drawing.Point(262, 169) + Me.txtPackAdresse2.MaxLineLength = -1 + Me.txtPackAdresse2.MaxLines_Warning = "" + Me.txtPackAdresse2.MaxLines_Warning_Label = Nothing + Me.txtPackAdresse2.Name = "txtPackAdresse2" + Me.txtPackAdresse2.Size = New System.Drawing.Size(709, 20) + Me.txtPackAdresse2.TabIndex = 168 + ' + 'txtPackAdresse1 + ' + Me.txtPackAdresse1._DateTimeOnly = False + Me.txtPackAdresse1._numbersOnly = False + Me.txtPackAdresse1._numbersOnlyKommastellen = "" + Me.txtPackAdresse1._numbersOnlyTrennzeichen = True + Me.txtPackAdresse1._Prozent = False + Me.txtPackAdresse1._ShortDateNew = False + Me.txtPackAdresse1._ShortDateOnly = False + Me.txtPackAdresse1._TimeOnly = False + Me.txtPackAdresse1._TimeOnly_Seconds = False + Me.txtPackAdresse1._value = Nothing + Me.txtPackAdresse1._Waehrung = False + Me.txtPackAdresse1._WaehrungZeichen = True + Me.txtPackAdresse1.ForeColor = System.Drawing.Color.Black + Me.txtPackAdresse1.Location = New System.Drawing.Point(262, 150) + Me.txtPackAdresse1.MaxLineLength = -1 + Me.txtPackAdresse1.MaxLines_Warning = "" + Me.txtPackAdresse1.MaxLines_Warning_Label = Nothing + Me.txtPackAdresse1.Name = "txtPackAdresse1" + Me.txtPackAdresse1.Size = New System.Drawing.Size(709, 20) + Me.txtPackAdresse1.TabIndex = 167 + ' + 'txtPackFirma + ' + Me.txtPackFirma._DateTimeOnly = False + Me.txtPackFirma._numbersOnly = False + Me.txtPackFirma._numbersOnlyKommastellen = "" + Me.txtPackFirma._numbersOnlyTrennzeichen = True + Me.txtPackFirma._Prozent = False + Me.txtPackFirma._ShortDateNew = False + Me.txtPackFirma._ShortDateOnly = False + Me.txtPackFirma._TimeOnly = False + Me.txtPackFirma._TimeOnly_Seconds = False + Me.txtPackFirma._value = Nothing + Me.txtPackFirma._Waehrung = False + Me.txtPackFirma._WaehrungZeichen = True + Me.txtPackFirma.ForeColor = System.Drawing.Color.Black + Me.txtPackFirma.Location = New System.Drawing.Point(262, 131) + Me.txtPackFirma.MaxLineLength = -1 + Me.txtPackFirma.MaxLines_Warning = "" + Me.txtPackFirma.MaxLines_Warning_Label = Nothing + Me.txtPackFirma.Name = "txtPackFirma" + Me.txtPackFirma.Size = New System.Drawing.Size(684, 20) + Me.txtPackFirma.TabIndex = 163 ' 'Label2 ' @@ -630,28 +674,28 @@ Partial Class usrCntlQualitaetskontrolle Me.Button1.UseVisualStyleBackColor = True Me.Button1.Visible = False ' - 'MyTextBox4 + 'txtPackHerrFrau ' - Me.MyTextBox4._DateTimeOnly = False - Me.MyTextBox4._numbersOnly = False - Me.MyTextBox4._numbersOnlyKommastellen = "" - Me.MyTextBox4._numbersOnlyTrennzeichen = True - Me.MyTextBox4._Prozent = False - Me.MyTextBox4._ShortDateNew = False - Me.MyTextBox4._ShortDateOnly = False - Me.MyTextBox4._TimeOnly = False - Me.MyTextBox4._TimeOnly_Seconds = False - Me.MyTextBox4._value = Nothing - Me.MyTextBox4._Waehrung = False - Me.MyTextBox4._WaehrungZeichen = True - Me.MyTextBox4.ForeColor = System.Drawing.Color.Black - Me.MyTextBox4.Location = New System.Drawing.Point(262, 112) - Me.MyTextBox4.MaxLineLength = -1 - Me.MyTextBox4.MaxLines_Warning = "" - Me.MyTextBox4.MaxLines_Warning_Label = Nothing - Me.MyTextBox4.Name = "MyTextBox4" - Me.MyTextBox4.Size = New System.Drawing.Size(684, 20) - Me.MyTextBox4.TabIndex = 161 + Me.txtPackHerrFrau._DateTimeOnly = False + Me.txtPackHerrFrau._numbersOnly = False + Me.txtPackHerrFrau._numbersOnlyKommastellen = "" + Me.txtPackHerrFrau._numbersOnlyTrennzeichen = True + Me.txtPackHerrFrau._Prozent = False + Me.txtPackHerrFrau._ShortDateNew = False + Me.txtPackHerrFrau._ShortDateOnly = False + Me.txtPackHerrFrau._TimeOnly = False + Me.txtPackHerrFrau._TimeOnly_Seconds = False + Me.txtPackHerrFrau._value = Nothing + Me.txtPackHerrFrau._Waehrung = False + Me.txtPackHerrFrau._WaehrungZeichen = True + Me.txtPackHerrFrau.ForeColor = System.Drawing.Color.Black + Me.txtPackHerrFrau.Location = New System.Drawing.Point(262, 112) + Me.txtPackHerrFrau.MaxLineLength = -1 + Me.txtPackHerrFrau.MaxLines_Warning = "" + Me.txtPackHerrFrau.MaxLines_Warning_Label = Nothing + Me.txtPackHerrFrau.Name = "txtPackHerrFrau" + Me.txtPackHerrFrau.Size = New System.Drawing.Size(684, 20) + Me.txtPackHerrFrau.TabIndex = 161 ' 'Label3 ' @@ -706,7 +750,7 @@ Partial Class usrCntlQualitaetskontrolle Me.txtPos._Waehrung = False Me.txtPos._WaehrungZeichen = True Me.txtPos.ForeColor = System.Drawing.Color.Black - Me.txtPos.Location = New System.Drawing.Point(629, 656) + Me.txtPos.Location = New System.Drawing.Point(629, 641) Me.txtPos.MaxLineLength = -1 Me.txtPos.MaxLines_Warning = "" Me.txtPos.MaxLines_Warning_Label = Nothing @@ -717,7 +761,7 @@ Partial Class usrCntlQualitaetskontrolle 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(557, 659) + Me.Label6.Location = New System.Drawing.Point(557, 644) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(57, 13) Me.Label6.TabIndex = 170 @@ -752,6 +796,9 @@ Partial Class usrCntlQualitaetskontrolle ' 'cbxEinf ' + Me.cbxEinf._allowedValuesFreiText = Nothing + Me.cbxEinf._allowFreiText = False + Me.cbxEinf._value = "" Me.cbxEinf.FormattingEnabled = True Me.cbxEinf.Location = New System.Drawing.Point(668, 201) Me.cbxEinf.Name = "cbxEinf" @@ -777,10 +824,10 @@ Partial Class usrCntlQualitaetskontrolle ' 'DataGridViewTextBoxColumn1 ' - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle13.Format = "N0" - DataGridViewCellStyle13.NullValue = Nothing - Me.DataGridViewTextBoxColumn1.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle3.Format = "N0" + DataGridViewCellStyle3.NullValue = Nothing + Me.DataGridViewTextBoxColumn1.DefaultCellStyle = DataGridViewCellStyle3 Me.DataGridViewTextBoxColumn1.Frozen = True Me.DataGridViewTextBoxColumn1.HeaderText = "Position" Me.DataGridViewTextBoxColumn1.MaxInputLength = 3 @@ -802,63 +849,24 @@ Partial Class usrCntlQualitaetskontrolle 'DataGridViewTextBoxColumn4 ' Me.DataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle14.Format = "N2" - DataGridViewCellStyle14.NullValue = Nothing - Me.DataGridViewTextBoxColumn4.DefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle4.Format = "N2" + DataGridViewCellStyle4.NullValue = Nothing + Me.DataGridViewTextBoxColumn4.DefaultCellStyle = DataGridViewCellStyle4 Me.DataGridViewTextBoxColumn4.HeaderText = "Gewicht" Me.DataGridViewTextBoxColumn4.MaxInputLength = 100 Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" ' 'DataGridViewTextBoxColumn5 ' - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle15.Format = "N2" - DataGridViewCellStyle15.NullValue = Nothing - Me.DataGridViewTextBoxColumn5.DefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle5.Format = "N2" + DataGridViewCellStyle5.NullValue = Nothing + Me.DataGridViewTextBoxColumn5.DefaultCellStyle = DataGridViewCellStyle5 Me.DataGridViewTextBoxColumn5.HeaderText = "Gewicht" Me.DataGridViewTextBoxColumn5.MaxInputLength = 100 Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" ' - 'pos - ' - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle11.Format = "N0" - DataGridViewCellStyle11.NullValue = Nothing - Me.pos.DefaultCellStyle = DataGridViewCellStyle11 - Me.pos.Frozen = True - Me.pos.HeaderText = "Position" - Me.pos.MaxInputLength = 3 - Me.pos.Name = "pos" - Me.pos.ReadOnly = True - Me.pos.Width = 50 - ' - 'anZ_pkgstk - ' - Me.anZ_pkgstk.HeaderText = "Anz-Packs." - Me.anZ_pkgstk.Name = "anZ_pkgstk" - ' - 'art_pkgstk - ' - Me.art_pkgstk.HeaderText = "Art-Packs" - Me.art_pkgstk.Name = "art_pkgstk" - ' - 'erzeugnis - ' - Me.erzeugnis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.erzeugnis.HeaderText = "Art des Erzeugnisses" - Me.erzeugnis.Name = "erzeugnis" - ' - 'gewicht - ' - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle12.Format = "N2" - DataGridViewCellStyle12.NullValue = Nothing - Me.gewicht.DefaultCellStyle = DataGridViewCellStyle12 - Me.gewicht.HeaderText = "Gewicht" - Me.gewicht.MaxInputLength = 100 - Me.gewicht.Name = "gewicht" - ' 'cbxUrsprungslang ' Me.cbxUrsprungslang._allowedValuesFreiText = Nothing @@ -881,12 +889,79 @@ Partial Class usrCntlQualitaetskontrolle Me.cbxBestimmungsland.Size = New System.Drawing.Size(84, 21) Me.cbxBestimmungsland.TabIndex = 181 ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Location = New System.Drawing.Point(646, 9) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(78, 13) + Me.Label13.TabIndex = 182 + Me.Label13.Text = "Mit LRN laden:" + ' + 'txtLRN + ' + Me.txtLRN._DateTimeOnly = False + Me.txtLRN._numbersOnly = False + Me.txtLRN._numbersOnlyKommastellen = "" + Me.txtLRN._numbersOnlyTrennzeichen = True + Me.txtLRN._Prozent = False + Me.txtLRN._ShortDateNew = False + Me.txtLRN._ShortDateOnly = False + Me.txtLRN._TimeOnly = False + Me.txtLRN._TimeOnly_Seconds = False + Me.txtLRN._value = Nothing + Me.txtLRN._Waehrung = False + Me.txtLRN._WaehrungZeichen = True + Me.txtLRN.ForeColor = System.Drawing.Color.Black + Me.txtLRN.Location = New System.Drawing.Point(730, 6) + Me.txtLRN.MaxLineLength = -1 + Me.txtLRN.MaxLines_Warning = "" + Me.txtLRN.MaxLines_Warning_Label = Nothing + Me.txtLRN.Name = "txtLRN" + Me.txtLRN.Size = New System.Drawing.Size(165, 20) + Me.txtLRN.TabIndex = 183 + ' + 'Button4 + ' + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.Location = New System.Drawing.Point(896, 4) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(75, 23) + Me.Button4.TabIndex = 184 + Me.Button4.Text = "Laden" + Me.Button4.UseVisualStyleBackColor = True + ' + 'cboZollstelle + ' + Me.cboZollstelle._allowedValuesFreiText = Nothing + Me.cboZollstelle._allowFreiText = False + Me.cboZollstelle._value = "" + Me.cboZollstelle.FormattingEnabled = True + Me.cboZollstelle.Location = New System.Drawing.Point(262, 252) + Me.cboZollstelle.Name = "cboZollstelle" + Me.cboZollstelle.Size = New System.Drawing.Size(310, 21) + Me.cboZollstelle.TabIndex = 186 + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Location = New System.Drawing.Point(176, 255) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(51, 13) + Me.Label15.TabIndex = 185 + Me.Label15.Text = "Zollstelle:" + ' 'usrCntlQualitaetskontrolle ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.cboZollstelle) + Me.Controls.Add(Me.Label15) + Me.Controls.Add(Me.Button4) + Me.Controls.Add(Me.txtLRN) + Me.Controls.Add(Me.Label13) Me.Controls.Add(Me.cbxBestimmungsland) Me.Controls.Add(Me.cbxUrsprungslang) Me.Controls.Add(Me.cbxTyp) @@ -897,12 +972,12 @@ Partial Class usrCntlQualitaetskontrolle Me.Controls.Add(Me.Label8) Me.Controls.Add(Me.txtPos) Me.Controls.Add(Me.Label6) - Me.Controls.Add(Me.MyTextBox1) - Me.Controls.Add(Me.MyTextBox2) - Me.Controls.Add(Me.MyTextBox3) + Me.Controls.Add(Me.txtPackAdresse2) + Me.Controls.Add(Me.txtPackAdresse1) + Me.Controls.Add(Me.txtPackFirma) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.MyTextBox4) + Me.Controls.Add(Me.txtPackHerrFrau) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.Button3) Me.Controls.Add(Me.Label4) @@ -977,12 +1052,12 @@ Partial Class usrCntlQualitaetskontrolle Friend WithEvents Label19 As Label Friend WithEvents Label30 As Label Friend WithEvents dgvPositionen As DataGridView - Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents MyTextBox2 As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents MyTextBox3 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtPackAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtPackAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtPackFirma As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label2 As Label Friend WithEvents Button1 As Button - Friend WithEvents MyTextBox4 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtPackHerrFrau As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label3 As Label Friend WithEvents Button3 As Button Friend WithEvents Label4 As Label @@ -992,7 +1067,7 @@ Partial Class usrCntlQualitaetskontrolle Friend WithEvents Label8 As Label Friend WithEvents Label10 As Label Friend WithEvents Label11 As Label - Friend WithEvents cbxEinf As ComboBox + Friend WithEvents cbxEinf As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxTyp As ComboBox Friend WithEvents Label12 As Label Friend WithEvents pos As DataGridViewTextBoxColumn @@ -1007,4 +1082,9 @@ Partial Class usrCntlQualitaetskontrolle Friend WithEvents DataGridViewTextBoxColumn5 As DataGridViewTextBoxColumn Friend WithEvents cbxUrsprungslang As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxBestimmungsland As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label13 As Label + Friend WithEvents txtLRN As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Button4 As Button + Friend WithEvents cboZollstelle As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label15 As Label End Class diff --git a/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.resx b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.resx similarity index 100% rename from SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.resx rename to SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.resx diff --git a/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb similarity index 56% rename from SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.vb rename to SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb index 225e81e4..f92c018e 100644 --- a/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb @@ -1,4 +1,6 @@ -Imports VERAG_PROG_ALLGEMEIN +Imports DAKOSY_Worker.DEXPSD +Imports DocumentFormat.OpenXml.Drawing.Diagrams +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlQualitaetskontrolle Implements FormualrInterface @@ -14,9 +16,10 @@ Public Class usrCntlQualitaetskontrolle Public SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing Public AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing Public EZA_Nr As String + Public CRN As String Dim packstueckeZOLL_TMP As String = "" - + Dim EZOLL_SQL = "EZOLL" Sub New() ' Dieser Aufruf ist für den Designer erforderlich. @@ -83,7 +86,14 @@ Public Class usrCntlQualitaetskontrolle txtFilialNr.Text = SENDUNG.FilialenNr.ToString txtAbfNr.Text = SENDUNG.AbfertigungsNr.ToString txtGewicht.Text &= " kg" - + If SENDUNG.tblSnd_AbsenderKdNr > 0 Then + Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(SENDUNG.tblSnd_AbsenderKdNr) + txtPackFirma.Text = If(ADRESSE.Name_1, "") & If(If(ADRESSE.Name_2, "") <> "", " " & ADRESSE.Name_2, "") + txtPackAdresse1.Text = If(ADRESSE.Straße, "") + txtPackAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim + Else + txtPackFirma.Text = SENDUNG.tblSnd_Absender + End If End If If AVISO IsNot Nothing Then txtLKWKennz.Text = If(AVISO.LKW_Nr, "") @@ -122,18 +132,32 @@ Public Class usrCntlQualitaetskontrolle Private Sub usrCntlZollbeschau_Load(sender As Object, e As EventArgs) Handles Me.Load + + + EZOLL_SQL = "EZOLL" + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "UNISPED" : EZOLL_SQL = "EZOLL_UNISPED" + End Select + + initControlsHandler() 'txtAnsprechpartnerVERAG.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME txtBeschauDat.Text = Date.Today.ToString("dd.MM.yyyy") cbxEinf.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Einfuhr", "E")) cbxEinf.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "A")) - + cbxEinf.changeItem("E") cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Obst und Gemüse", "O")) cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Bananen", "B")) cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Eier und Gefl.", "E")) + cboZollstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZA Österreich / Zst Nickelsdorf", "NKD")) + cboZollstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZA Österreich / Zst Spielfeld", "SFD")) + ' cboZollstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZA Österreich / Zst Salzburg", "SBG")) + ' cboZollstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZA Österreich / Zst Suben", "SUB")) + cboZollstelle.changeItem("NKD") + cbxUrsprungslang.fillWithSQL("SELECT [Länderverzeichnis für die Außenhandelsstatistik].LandKz, [Länderverzeichnis für die Außenhandelsstatistik].LandBez FROM [Länderverzeichnis für die Außenhandelsstatistik] ORDER BY [Länderverzeichnis für die Außenhandelsstatistik].LandKz; ", True, "VERAG", True) cbxBestimmungsland.Items.AddRange(cbxUrsprungslang.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) @@ -196,49 +220,98 @@ Public Class usrCntlQualitaetskontrolle 'EZA_Nr = "4/23208/15" Try - + txtLRN.Text = EZA_Nr Dim dEZOLL As DataTable = KDSQL.loadDgvBySql("SELECT LizenzNr, OperatorID, VorgangID, AnmID, GeaendertAm, GeaendertVon, CRN, LRN" & " FROM zsAnmRefs" & " WHERE (VorgangID = 'EF') AND (LRN = '" & EZA_Nr & "')" & - " ORDER BY GeaendertAm DESC", "EZOLL") + " ORDER BY GeaendertAm DESC", EZOLL_SQL) If dEZOLL Is Nothing Then MsgBox("Keine Daten im EZOLL vorhanden, Daten können nicht geladen werden!") : Exit Sub If dEZOLL.Rows.Count = 0 Then MsgBox("Keine Daten im EZOLL vorhanden, Daten können nicht geladen werden!") : Exit Sub Dim DR_zsAnmRefs As DataRow = dEZOLL.Rows(0) notFound = False - + If DR_zsAnmRefs.Item("CRN") IsNot DBNull.Value Then CRN = DR_zsAnmRefs.Item("CRN") Dim DTzsAnmTransp As DataTable = KDSQL.loadDgvBySql("SELECT DepIdnt, DepNat, CrossIdntNat" & " FROM zsAnmTransp" & - " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", "EZOLL") + " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL) - If DTzsAnmTransp.Rows().Count > 0 Then + If DTzsAnmTransp IsNot Nothing AndAlso DTzsAnmTransp.Rows().Count > 0 Then If Not IsNull(DTzsAnmTransp.Rows(0).Item("DepIdnt")) Then txtLKWKennz.Text = Strings.Left(DTzsAnmTransp.Rows(0).Item("DepIdnt"), 25) If Not IsNull(DTzsAnmTransp.Rows(0).Item("DepNat")) Then cbxBestimmungsland.changeItem(DTzsAnmTransp.Rows(0).Item("DepNat")) - If Not IsNull(DTzsAnmTransp.Rows(0).Item("CrossIdntNat")) Then cbxUrsprungslang.changeItem(DTzsAnmTransp.Rows(0).Item("CrossIdntNat")) + ' If Not IsNull(DTzsAnmTransp.Rows(0).Item("CrossIdntNat")) Then cbxUrsprungslang.changeItem(DTzsAnmTransp.Rows(0).Item("CrossIdntNat")) End If + ' Tabelle zsAnmConorTra lesen. + Dim DTzsAnmConorTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty,Strt, Ctry" & + " FROM zsAnmConorTra" & + " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL) + + If DTzsAnmConorTra IsNot Nothing AndAlso DTzsAnmConorTra.Rows().Count > 0 Then + If SENDUNG Is Nothing OrElse SENDUNG.tblSnd_AbsenderKdNr <= 0 Then + If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Na")) Then txtPackFirma.Text = Strings.Left(DTzsAnmConorTra.Rows(0).Item("Na"), 50) + If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Pst")) Then + txtPackAdresse1.Text = "" + txtPackAdresse2.Text = "" + If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Strt")) Then txtPackAdresse1.Text &= Strings.Left(DTzsAnmConorTra.Rows(0).Item("Strt"), 50) & " " + If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Ctry")) Then txtPackAdresse2.Text &= Strings.Left(DTzsAnmConorTra.Rows(0).Item("Ctry"), 50) & " " + If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Pst")) Then txtPackAdresse2.Text &= Strings.Left(DTzsAnmConorTra.Rows(0).Item("Pst"), 50) & " " + If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Cty")) Then txtPackAdresse2.Text &= Strings.Left(DTzsAnmConorTra.Rows(0).Item("Cty"), 50) & " " + End If + End If + If Not IsNull(DTzsAnmConorTra.Rows(0).Item("Ctry")) Then cbxUrsprungslang.changeItem(DTzsAnmConorTra.Rows(0).Item("Ctry")) + End If + + + + ' Tabelle zsAnmConeeTra lesen. + Dim DTzsAnmConeeTra As DataTable = KDSQL.loadDgvBySql("SELECT Na, Pst, Cty,Strt, Ctry" & + " FROM zsAnmConeeTra" & + " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL) + + If DTzsAnmConeeTra IsNot Nothing AndAlso DTzsAnmConeeTra.Rows().Count > 0 Then + If SENDUNG Is Nothing OrElse SENDUNG.tblSnd_EmpfaengerKdNr <= 0 Then + If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Na")) Then txtFirma.Text = Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Na"), 50) + If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Pst")) Then + txtAdresse1.Text = "" + txtAdresse2.Text = "" + If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Strt")) Then txtAdresse1.Text &= Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Strt"), 50) & " " + If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Ctry")) Then txtAdresse2.Text &= Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Ctry"), 50) & " " + If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Pst")) Then txtAdresse2.Text &= Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Pst"), 50) & " " + If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Cty")) Then txtAdresse2.Text &= Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Cty"), 50) & " " + End If + End If + 'If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Na")) Then SPEDITIONSBUCH.Empfänger = Strings.Left(DTzsAnmConeeTra.Rows(0).Item("Na"), 50) + 'If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Ctry")) Then SPEDITIONSBUCH.Empfänger = Strings.Left(SPEDITIONSBUCH.Empfänger & ", " & DTzsAnmConeeTra.Rows(0).Item("Ctry"), 50) + 'If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Pst")) Then SPEDITIONSBUCH.Empfänger = Strings.Left(SPEDITIONSBUCH.Empfänger & ", " & DTzsAnmConeeTra.Rows(0).Item("Pst"), 50) + 'If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Cty")) Then SPEDITIONSBUCH.Empfänger = Strings.Left(SPEDITIONSBUCH.Empfänger & ", " & DTzsAnmConeeTra.Rows(0).Item("Cty"), 50) + If Not IsNull(DTzsAnmConeeTra.Rows(0).Item("Ctry")) Then cbxBestimmungsland.changeItem(DTzsAnmConeeTra.Rows(0).Item("Ctry")) + End If + + ' Tabelle zsAnmHea lesen. Dim DTzsAnmHea As DataTable = KDSQL.loadDgvBySql("SELECT TotItem, TotPack, TotGross" & " FROM zsAnmHea" & - " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", "EZOLL") + " WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & ")", EZOLL_SQL) - If DTzsAnmHea.Rows().Count > 0 Then + If DTzsAnmHea IsNot Nothing AndAlso DTzsAnmHea.Rows().Count > 0 Then If Not IsNull(DTzsAnmHea.Rows(0).Item("TotPack")) Then txtAnzVerp.Text = DTzsAnmHea.Rows(0).Item("TotPack") 'Gesamt packstücke If Not IsNull(DTzsAnmHea.Rows(0).Item("TotGross")) Then txtGewicht.Text = DTzsAnmHea.Rows(0).Item("TotGross") ' Gesamtbruttogewicht If Not IsNull(DTzsAnmHea.Rows(0).Item("TotItem")) Then txtPos.Text = DTzsAnmHea.Rows(0).Item("TotItem") ' Anzahl Pos End If - ' Tabelle zsAnmGdsitem lesen. - Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT item.ItNr ,item.GdsDes, item.Net, pack.Kind, pack.Nr, item.Orig" & -" FROM zsAnmGdsitem as item" & -" INNER JOIN -as pack ON item.LizenzNr = pack.LizenzNr And item.OperatorID = pack.OperatorID and item.VorgangID = pack.VorgangID and pack.AnmID = item.AnmID" & -" WHERE (item.LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (item.OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (item.VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (item.AnmID = " & DR_zsAnmRefs.Item("AnmID") & " and item.GdsItemID = pack.GdsItemID)" & - " ORDER BY item.GdsItemID", "EZOLL") + berechneDGVSum() - If DTzsAnmGdsitem.Rows().Count > 0 Then + ' Tabelle zsAnmGdsitem lesen. + Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT item.ItNr ,item.GdsDes , item.Net, pack.Kind, pack.Nr, item.Orig" & + " FROM zsAnmGdsitem as item" & + " INNER JOIN zsAnmGdsItemPack as pack ON item.LizenzNr = pack.LizenzNr And item.OperatorID = pack.OperatorID and item.VorgangID = pack.VorgangID and pack.AnmID = item.AnmID" & + " WHERE (item.LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (item.OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (item.VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (item.AnmID = " & DR_zsAnmRefs.Item("AnmID") & " and item.GdsItemID = pack.GdsItemID)" & + " ORDER BY item.GdsItemID", EZOLL_SQL) + + + If DTzsAnmGdsitem IsNot Nothing AndAlso DTzsAnmGdsitem.Rows().Count > 0 Then loadDGV(DTzsAnmGdsitem) End If @@ -258,6 +331,21 @@ as pack ON item.LizenzNr = pack.LizenzNr And item.OperatorID = pack.OperatorID a Catch : End Try Return False End Function + Function berechneDGVSum() As Boolean + Dim sumPk As Integer = 0 + Dim sumKg As Double = 0 + Dim sumPos As Integer = 0 + + For Each r As DataGridViewRow In dgvPositionen.Rows + sumPos += 1 + If IsNumeric(r.Cells(1).Value) Then sumPk += r.Cells(1).Value + If IsNumeric(r.Cells(4).Value) Then sumKg += r.Cells(4).Value + Next + txtAnzVerp.Text = sumPk + txtGewicht.Text = sumKg + txtPos.Text = sumPos - 1 + + End Function Private Sub dgvPositionen_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvPositionen.CellValueChanged Dim gewicht As Double = 0 @@ -280,4 +368,20 @@ as pack ON item.LizenzNr = pack.LizenzNr And item.OperatorID = pack.OperatorID a txtGewicht.Text = gewicht & " kg" txtAnzVerp.Text = colli End Sub + + Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click + dgvPositionen.Rows.Clear() + + If txtLRN.Text <> "" Then + loadEZollData(txtLRN.Text) + End If + End Sub + + Private Sub dgvPositionen_RowsAdded(sender As Object, e As DataGridViewRowsAddedEventArgs) Handles dgvPositionen.RowsAdded + berechneDGVSum() + End Sub + + Private Sub dgvPositionen_RowsRemoved(sender As Object, e As DataGridViewRowsRemovedEventArgs) Handles dgvPositionen.RowsRemoved + berechneDGVSum() + End Sub End Class diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index a3574de2..ccd3d480 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1387,7 +1387,7 @@ Public Class FormularManagerNEU Case GetType(usrcntlVerzollungsunterlagen_Verbringsungsnachweis).ToString striList = FormularManagerNEU.Verzollungsunterlagen_Verbringungsnachweis(c, listMail) Case GetType(usrCntlQualitaetskontrolle).ToString - retStr = FormularManagerNEU.Qualitaetskontrolle(c) + striList = FormularManagerNEU.Qualitaetskontrolle(c) Case GetType(usrcntlQS_UeDok).ToString retStr = FormularManagerNEU.QS_UeDok(c) @@ -4183,123 +4183,137 @@ Public Class FormularManagerNEU End Function - Shared Function Qualitaetskontrolle(usrCntl As usrCntlQualitaetskontrolle) As String + Shared Function Qualitaetskontrolle(usrCntl As usrCntlQualitaetskontrolle) As List(Of String) + Dim QUALIlist As New List(Of String) + Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager - - Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) - Dim list As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem) - If usrCntl.dtpBeschauDat IsNot Nothing AndAlso IsDate((usrCntl.dtpBeschauDat.Value)) Then - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Datum", usrCntl.dtpBeschauDat.Value.ToString)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Datum_2_030_a", usrCntl.dtpBeschauDat.Value.ToString)) + End If - 'list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Teilnehmer", usrCntl.bb_Teilnehmer.ToString)) - 'list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Geschäftsführer", BB.bb_Geschaeftsfuehrer.ToString)) + If usrCntl.cbxTyp.SelectedItem IsNot Nothing Then + Select Case usrCntl.cbxTyp.SelectedItem.value + Case "O" + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Checkbox11", "1")) + Case "B" + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Checkbox12", "2")) + Case "E" + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Checkbox13", "3")) + End Select + End If - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ansprechpartner", BB.bb_Anpsprechpartner.ToString)) - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firma", txtFirma.Text)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Umatz", BB.bb_Umsatz)) 'ACHTUNG -> im Formular wurde das Feld "Umatz" benannt, nicht korrigieren! - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Telefon", BB.bb_Telefon.ToString)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mail", BB.bb_Mail.ToString)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("LKWEigentum", BB.bb_FuhrparkEigentum.ToString)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("LKWLeasing", BB.bb_FuhrparkLeasing.ToString)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftraggeber", BB.bb_Auftraggeber.ToString)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TransportRouten", BB.bb_Route.ToString)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DerzeitigerAnbieter", BB.bb_DerzeitigerLieferant.ToString)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Bericht", BB.bb_Vermerk.ToString)) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Garentie", BB.bb_Garantie)) 'ACHTUNG -> im Formular wurde das Feld "Garentie" benannt, nicht korrigieren! - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Plane", IIf(BB.bb_LKW_Plane = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kühltransporte", IIf(BB.bb_LKW_Kuehltranporte = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sondertransporte", IIf(BB.bb_LKW_Sondertransporte = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sprinter", IIf(BB.bb_LKW_Sprinter = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SiloTank", IIf(BB.bb_LKW_SiloTank = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Zollabfertigung", IIf(BB.bb_Interesse_Zollabfertigung = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Brexit", IIf(BB.bb_Interesse_Brexit = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Parkplatz", IIf(BB.bb_Interesse_Parkplatz = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("LagerUmladung", IIf(BB.bb_Interesse_LagerUmschlag = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rola", IIf(BB.bb_Interesse_Rola = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("YesMoney", IIf(BB.bb_Interesse_YesMoney = True, "On", "Off"))) - - 'List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ferry", IIf(BB.bb_Interesse_Ferry = True, "On", "Off"))) + If usrCntl.cbxEinf.SelectedItem IsNot Nothing Then + Select Case usrCntl.cbxEinf._value + Case "A" + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Checkbox21", "2")) + Case "E" + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Checkbox21", "1")) + End Select + End If - Select Case usrCntl.cbxTyp.SelectedItem.value + Dim Haendler = "" + If usrCntl.txtFirma.Text <> "" Then Haendler &= usrCntl.txtFirma.Text & vbNewLine + If usrCntl.txtHerrFrau.Text <> "" Then Haendler &= usrCntl.txtHerrFrau.Text & vbNewLine + If usrCntl.txtAdresse1.Text <> "" Then Haendler &= usrCntl.txtAdresse1.Text & vbNewLine + If usrCntl.txtAdresse2.Text <> "" Then Haendler &= usrCntl.txtAdresse2.Text + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text10", Haendler.Trim)) - Case "O" - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("persönlich", "On")) - Case "B" - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("persönlich", "On")) + Dim Packbetrieb = "" + If usrCntl.txtPackFirma.Text <> "" Then Packbetrieb &= usrCntl.txtPackFirma.Text & vbNewLine + If usrCntl.txtPackHerrFrau.Text <> "" Then Packbetrieb &= usrCntl.txtPackHerrFrau.Text & vbNewLine + If usrCntl.txtPackAdresse1.Text <> "" Then Packbetrieb &= usrCntl.txtPackAdresse1.Text & vbNewLine + If usrCntl.txtPackAdresse2.Text <> "" Then Packbetrieb &= usrCntl.txtPackAdresse2.Text + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text14", Packbetrieb.Trim)) - Case "E" - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("persönlich", "On")) + ' list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text14", usrCntl.txtAbfNr.Text.Trim)) - End Select + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text18", usrCntl.txtLKWKennz.Text.Trim)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text19", usrCntl.cbxUrsprungslang._value.Trim)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text20", usrCntl.cbxBestimmungsland._value.Trim)) - Select Case usrCntl.cbxEinf.SelectedItem.value + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Checkbox24a", "2")) 'NETTO - Case "A" - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("persönlich", "On")) - Case "E" - list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("persönlich", "On")) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text15", usrCntl.cboZollstelle.Text)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text16", usrCntl.cboZollstelle.Text)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kontrollstelle", usrCntl.cboZollstelle.Text)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CRN", usrCntl.crn)) - End Select + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text17", Now.ToShortDateString)) 'Datum Eintreffen - - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.cbxUrsprungslang.SelectedItem.Text, 61, 85, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.cbxBestimmungsland.SelectedItem.Text, 115, 85, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - - '---------------------- - - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 25, 98, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text, 25, 105, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Datum_2_030_a", usrCntl.dtpBeschauDat.Value.ToShortDateString)) - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtOrt.Text, 25, 198, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 25, 208, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.MyTextBox2.Text, 25, 218, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLand.Text, 25, 188, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPLZ.Text, 45, 188, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + Dim SumKG As Double = 0 + Dim SumPK As Double = 0 - 'fm.fillPDF("Qualitatskontrolle", Nothing, list, , , , , , ) + 'Seitenanzahl ermitteln: + Dim pages = Fix((usrCntl.dgvPositionen.Rows.Count - 1) / 10) ' FIX=ABrunden auf ganze Zahl + If (usrCntl.dgvPositionen.Rows.Count - 1) Mod 10 > 0 Then pages += 1 - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Qualitatskontrolle", listTowrite) + If pages = 0 Then 'Keine Pos! + Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("VERAG Pos-Nr.: " & usrCntl.txtLRN.Text, 20, 5, 150, 6, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT)) + Dim qualiForm = fm.fillPDF_Editierbar("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Qualitatskontrolle", list, listTowrite,,,,,, False) + If qualiForm <> "" Then QUALIlist.Add(qualiForm) + Else + 'POS>0 + For i As Integer = 1 To pages + Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("VERAG Pos-Nr.: " & usrCntl.txtLRN.Text, 20, 5, 150, 6, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("Seite " & i & "/" & pages, 160, 5, 40, 6, "bold", 14, , iTextSharp.text.Element.ALIGN_RIGHT)) + Dim dgvVon = (i - 1) * 10 ' Start der Seite in der DGV + Dim listPos As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem) - Return "" + If i = 1 Then + 'BisherigeFelder in listPOSladen: + For Each p In list + listPos.Add(p) + Next + End If + + For ii As Integer = 0 To 9 + 'Wenn DGV Ende --> Abbruch: + If (dgvVon + ii) >= (usrCntl.dgvPositionen.Rows.Count - 1) Then Exit For + 'DGV Befüllen: + listPos.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text25." & (ii), usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(0).Value & ". " & usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(1).Value & " " & usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(2).Value)) + listPos.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text25a." & (ii), usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(3).Value)) + 'listPos.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text25b." & (ii), usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(3).Value)) + listPos.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text25c." & (ii), usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(4).Value)) + ' list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Text25a." & (ii), usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(5).Value)) + SumPK += usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(1).Value + SumKG += usrCntl.dgvPositionen.Rows(dgvVon + ii).Cells(4).Value + Next + + If i = pages Then + listPos.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SumPkUeberschrift", "Summe Packstücke:")) + listPos.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SumKgUeberschrift", "Summe Gewicht:")) + listPos.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SumPk", CInt(SumPK) & " Pk")) + listPos.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SumKg", CDbl(SumKG).ToString("N2") & " kg")) + + End If + + Dim qualiForm = fm.fillPDF_Editierbar("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Qualitatskontrolle", listPos, listTowrite,,,,,, False) + If qualiForm <> "" Then QUALIlist.Add(qualiForm) + + Next + + End If + + Return QUALIlist End Function diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index d24fd22c..8f304254 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 7040de85..c6b4d0fb 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -595,6 +595,12 @@ UserControl + + usrCntlQualitaetskontrolle.vb + + + UserControl + usrcntlVollmacht_DE_indirekt.vb @@ -637,12 +643,6 @@ Form - - usrCntlQualitaetskontrolle.vb - - - UserControl - rptFrachtkostenberechnung.vb @@ -3083,6 +3083,9 @@ usrcntlEORI_Antrag.vb + + usrCntlQualitaetskontrolle.vb + usrcntlVollmacht_DE_indirekt.vb @@ -3105,9 +3108,6 @@ frmPOSTerminal.vb - - usrCntlQualitaetskontrolle.vb - rptFrachtkostenberechnung.vb diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 58a748cf..4dad9da8 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -22,7 +22,6 @@ Partial Class usrCntlKundenuebersicht 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -36,7 +35,7 @@ Partial Class usrCntlKundenuebersicht Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip() Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() Me.lblInaktiv = New System.Windows.Forms.Label() @@ -103,7 +102,7 @@ Partial Class usrCntlKundenuebersicht Me.Label33 = New System.Windows.Forms.Label() Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label29 = New System.Windows.Forms.Label() - Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) + Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox() Me.lblFisk = New System.Windows.Forms.Label() Me.txtAbf_ErsteAbfertigung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label41 = New System.Windows.Forms.Label() @@ -227,25 +226,25 @@ Partial Class usrCntlKundenuebersicht Me.lblUid = New System.Windows.Forms.TextBox() Me.lblEORI = New System.Windows.Forms.TextBox() Me.lblEORINr = New System.Windows.Forms.Label() - Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip() Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.lblFirma = New System.Windows.Forms.Label() - Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip() Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() @@ -1439,6 +1438,7 @@ Partial Class usrCntlKundenuebersicht ' Me.PictureBox6.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBox6.Location = New System.Drawing.Point(639, 4) Me.PictureBox6.Name = "PictureBox6" Me.PictureBox6.Size = New System.Drawing.Size(18, 19) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb index 6c732554..9a407fa8 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb @@ -24,13 +24,17 @@ Public Class cRechnungsnummern Case 3 VonRechnungsNr = Now.ToString("yy") & "300001" BisRechnungsNr = Now.ToString("yy") & "399999" + Case 4 'VERAG AG (DE) + VonRechnungsNr = Now.ToString("yy") & "800001" + BisRechnungsNr = Now.ToString("yy") & "899999" + Case 7 VonRechnungsNr = Now.ToString("yy") & "700001" BisRechnungsNr = Now.ToString("yy") & "799999" Case 11 VonRechnungsNr = Now.ToString("yy") & "900001" BisRechnungsNr = Now.ToString("yy") & "999999" - Case 15 + Case 15, 19 'VERAG 360 VonRechnungsNr = Now.ToString("yy") & "200001" BisRechnungsNr = Now.ToString("yy") & "299999" Case 20 diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index f642b6c8..a22112dc 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -823,110 +823,129 @@ Public Class cFormularManager - Public Sub fillPDF(vorlagenname As String, list As List(Of VERAG_PROG_ALLGEMEIN.MyListItem), listToWrite As List(Of cPDFWriteValues), Optional editierbar As Boolean = True, Optional autoDruck As Boolean = False, Optional printerName As String = "", Optional barcode As Image = Nothing, Optional barcodeLKW As Image = Nothing, Optional uo2 As String = "") - Dim DS As New cDATENSERVER("DOKUMENTE", "VORLAGEN", "", uo2, "", vorlagenname) - If Not DS.hasITEMS Then Exit Sub - Dim path_src = DS.OPEN_SINGLE(False) - If path_src = "" Then Exit Sub + Public Function fillPDF(vorlagenname As String, list As List(Of VERAG_PROG_ALLGEMEIN.MyListItem), listToWrite As List(Of cPDFWriteValues), Optional editierbar As Boolean = True, Optional autoDruck As Boolean = False, Optional printerName As String = "", Optional barcode As Image = Nothing, Optional barcodeLKW As Image = Nothing, Optional uo2 As String = "", Optional openfile As Boolean = True) As String - Dim fi As New IO.DirectoryInfo(path_src) - Dim destPath = DATENVERVER_OPTIONS.getTMPPath(fi.Name, fi.Extension, True, False) - Dim pdf As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(path_src) - Using fw As New FileStream(destPath, FileMode.OpenOrCreate) + Return fillPDF_Editierbar("DOKUMENTE", "VORLAGEN", "", uo2, "", vorlagenname, list, listToWrite, editierbar, autoDruck, printerName, barcode, barcodeLKW) - Dim stamper = New PdfStamper(pdf, fw) - If True Then - Try - Dim f = stamper.AcroFields - f.GenerateAppearances = True - For Each i In list - f.SetField(i.Text, i.Value) - Next - Catch ex As Exception + End Function - End Try + Public Function fillPDF_Editierbar(da_kategorie As String, da_ordner As String, da_uOrdner1 As String, da_uOrdner2 As String, da_uOrdner3 As String, da_name As String, list As List(Of VERAG_PROG_ALLGEMEIN.MyListItem), listToWrite As List(Of cPDFWriteValues), Optional editierbar As Boolean = True, Optional autoDruck As Boolean = False, Optional printerName As String = "", Optional barcode As Image = Nothing, Optional barcodeLKW As Image = Nothing, Optional openfile As Boolean = True) As String + Try + Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name) + If Not DS.hasITEMS Then Return "" + Dim path_src = DS.OPEN_SINGLE(False) + If path_src = "" Then Return "" - If listToWrite IsNot Nothing Then - Dim overStr As PdfContentByte = stamper.GetOverContent(1) - For Each i In listToWrite - If i.Text <> "" Then write(overStr, i, pdf.GetPageSize(1).Height) - Next + Dim fi As New IO.DirectoryInfo(path_src) + Dim destPath = DATENVERVER_OPTIONS.getTMPPath(fi.Name, fi.Extension, True, False) + Dim pdf As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(path_src) + Using fw As New FileStream(destPath, FileMode.OpenOrCreate) + + Dim stamper = New PdfStamper(pdf, fw) + If True Then + Try + Dim f = stamper.AcroFields + f.GenerateAppearances = True + For Each i In list + f.SetField(i.Text, i.Value) + Next + Catch ex As Exception + + End Try + + If listToWrite IsNot Nothing Then + Dim overStr As PdfContentByte = stamper.GetOverContent(1) + For Each i In listToWrite + If i.Text <> "" Then write(overStr, i, pdf.GetPageSize(1).Height) + Next + + End If End If + If barcode IsNot Nothing Then + Try - End If - If barcode IsNot Nothing Then - Try + Dim n = pdf.NumberOfPages + Dim pagesize As iTextSharp.text.Rectangle + For cnt = 1 To pdf.NumberOfPages - Dim n = pdf.NumberOfPages - Dim pagesize As iTextSharp.text.Rectangle - For cnt = 1 To pdf.NumberOfPages + Dim over As PdfContentByte = stamper.GetOverContent(cnt) + pagesize = pdf.GetPageSize(cnt) + Dim x As Double = 15 'pagesize.Left + 10 + Dim y As Double = pagesize.Height / 2 - 100 'pagesize.Top - 50 + ' barcode = btnScale_Click2(barcode, 40) + barcode.RotateFlip(RotateFlipType.Rotate270FlipNone) + 'MsgBox(mm(pagesize.Height)) + Dim image As iTextSharp.text.Image = iTextSharp.text.Image.GetInstance(barcode, System.Drawing.Imaging.ImageFormat.Png) + ' Dim image As iTextSharp.text.Image = iTextSharp.text.Image.GetInstance(New Bitmap(80, 80), System.Drawing.Imaging.ImageFormat.Bmp) + image.SetAbsolutePosition(x, y) - Dim over As PdfContentByte = stamper.GetOverContent(cnt) - pagesize = pdf.GetPageSize(cnt) - Dim x As Double = 15 'pagesize.Left + 10 - Dim y As Double = pagesize.Height / 2 - 100 'pagesize.Top - 50 - ' barcode = btnScale_Click2(barcode, 40) - barcode.RotateFlip(RotateFlipType.Rotate270FlipNone) - 'MsgBox(mm(pagesize.Height)) - Dim image As iTextSharp.text.Image = iTextSharp.text.Image.GetInstance(barcode, System.Drawing.Imaging.ImageFormat.Png) - ' Dim image As iTextSharp.text.Image = iTextSharp.text.Image.GetInstance(New Bitmap(80, 80), System.Drawing.Imaging.ImageFormat.Bmp) - image.SetAbsolutePosition(x, y) - - 'Dim r As iTextSharp.text.Image = iTextSharp.text.Rectangle + 'Dim r As iTextSharp.text.Image = iTextSharp.text.Rectangle - 'image.Width = 35 - over.AddImage(image) - Next + 'image.Width = 35 + over.AddImage(image) + Next - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try - End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End If - If barcodeLKW IsNot Nothing Then - Try + If barcodeLKW IsNot Nothing Then + Try - Dim n = pdf.NumberOfPages - Dim pagesize As iTextSharp.text.Rectangle - For cnt = 1 To pdf.NumberOfPages + Dim n = pdf.NumberOfPages + Dim pagesize As iTextSharp.text.Rectangle + For cnt = 1 To pdf.NumberOfPages - Dim over As PdfContentByte = stamper.GetOverContent(cnt) - pagesize = pdf.GetPageSize(cnt) - Dim x As Double = 40 'pagesize.Left + 10 - Dim y As Double = pagesize.Top - 80 + Dim over As PdfContentByte = stamper.GetOverContent(cnt) + pagesize = pdf.GetPageSize(cnt) + Dim x As Double = 40 'pagesize.Left + 10 + Dim y As Double = pagesize.Top - 80 - Dim image As iTextSharp.text.Image = iTextSharp.text.Image.GetInstance(barcodeLKW, System.Drawing.Imaging.ImageFormat.Png) - image.SetAbsolutePosition(x, y) + Dim image As iTextSharp.text.Image = iTextSharp.text.Image.GetInstance(barcodeLKW, System.Drawing.Imaging.ImageFormat.Png) + image.SetAbsolutePosition(x, y) - over.AddImage(image) - Next + over.AddImage(image) + Next - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try - End If + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + End If - stamper.FormFlattening = Not editierbar - stamper.Close() + stamper.FormFlattening = Not editierbar + stamper.Close() - If autoDruck Then - PrintViaGS(destPath, printerName) - 'If Not PrintFile(destPath, printerName) Then Process.Start(destPath) ' Druck! Wenn Problem, wird das PDF geöffnet - Else - Process.Start(destPath) - End If - fw.Close() - End Using - pdf.Close() + If openfile Then - End Sub + If autoDruck Then + PrintViaGS(destPath, printerName) + 'If Not PrintFile(destPath, printerName) Then Process.Start(destPath) ' Druck! Wenn Problem, wird das PDF geöffnet + Else + Process.Start(destPath) + End If + Else + 'weiter zu return + End If + fw.Close() + + End Using + pdf.Close() + Return destPath + + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function Public Function fillPDFVorhandenesLokalesPDF_Path(path As String, listToWrite As List(Of cPDFWriteValues), Optional editierbar As Boolean = True, Optional autoDruck As Boolean = False, Optional printerName As String = "", Optional genNewPath As Boolean = True, Optional barcode As List(Of barcodeToPdf) = Nothing) As String Return fillPDF("", "", "", "", "", "", listToWrite, editierbar, autoDruck, printerName, genNewPath, path, barcode)