From 2bf8cf0beaa2e4591800ec5094001af44f0990a2 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 1 Sep 2023 14:30:57 +0200 Subject: [PATCH 1/5] Fehlerhandling verbessert, AMBAR CMR --- SDL/Formulare/CMR/usrcntlCMR.Designer.vb | 254 +++++++++++------- SDL/Formulare/CMR/usrcntlCMR.vb | 13 + SDL/SDL.vbproj | 2 +- .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 38 ++- 4 files changed, 197 insertions(+), 110 deletions(-) diff --git a/SDL/Formulare/CMR/usrcntlCMR.Designer.vb b/SDL/Formulare/CMR/usrcntlCMR.Designer.vb index feb6c002..9278e6e1 100644 --- a/SDL/Formulare/CMR/usrcntlCMR.Designer.vb +++ b/SDL/Formulare/CMR/usrcntlCMR.Designer.vb @@ -23,15 +23,26 @@ Partial Class usrcntlCMR _ 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() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Panel3 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.LinkLabel7 = New System.Windows.Forms.LinkLabel() Me.LinkLabel6 = New System.Windows.Forms.LinkLabel() Me.lbl_errCMR_1 = New System.Windows.Forms.Label() Me.txtAbsender = New VERAG_PROG_ALLGEMEIN.MyRichTextBox() Me.dgvLadungenKurz = New System.Windows.Forms.DataGridView() + Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.dgvLadungen = New System.Windows.Forms.DataGridView() + Me.ZeNr = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.anz = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.art = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.bez = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.statNr = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.umfang = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.cbxKurz = New System.Windows.Forms.CheckBox() Me.lblKurz = New System.Windows.Forms.Label() Me.LinkLabel4 = New System.Windows.Forms.LinkLabel() @@ -76,17 +87,8 @@ Partial Class usrcntlCMR Me.txtAuslieferungsort = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtFrachtführer = New VERAG_PROG_ALLGEMEIN.MyRichTextBox() Me.pic = New System.Windows.Forms.PictureBox() - Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.ZeNr = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.anz = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.art = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.bez = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.statNr = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.umfang = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.LinkLabel8 = New System.Windows.Forms.LinkLabel() + Me.LinkLabel9 = New System.Windows.Forms.LinkLabel() Me.Panel3.SuspendLayout() CType(Me.dgvLadungenKurz, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvLadungen, System.ComponentModel.ISupportInitialize).BeginInit() @@ -101,6 +103,8 @@ Partial Class usrcntlCMR ' Me.Panel3.AutoScroll = True Me.Panel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.Panel3.Controls.Add(Me.LinkLabel9) + Me.Panel3.Controls.Add(Me.LinkLabel8) Me.Panel3.Controls.Add(Me.LinkLabel7) Me.Panel3.Controls.Add(Me.LinkLabel6) Me.Panel3.Controls.Add(Me.lbl_errCMR_1) @@ -213,14 +217,14 @@ Partial Class usrcntlCMR Me.dgvLadungenKurz.BackgroundColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) Me.dgvLadungenKurz.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLadungenKurz.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn4, Me.DataGridViewTextBoxColumn6}) - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLadungenKurz.DefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLadungenKurz.DefaultCellStyle = DataGridViewCellStyle3 Me.dgvLadungenKurz.GridColor = System.Drawing.Color.Gray Me.dgvLadungenKurz.Location = New System.Drawing.Point(32, 519) Me.dgvLadungenKurz.Name = "dgvLadungenKurz" @@ -228,6 +232,34 @@ Partial Class usrcntlCMR Me.dgvLadungenKurz.Size = New System.Drawing.Size(796, 165) Me.dgvLadungenKurz.TabIndex = 490 ' + 'DataGridViewTextBoxColumn2 + ' + Me.DataGridViewTextBoxColumn2.HeaderText = "Anzahl" + Me.DataGridViewTextBoxColumn2.MaxInputLength = 50 + Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" + Me.DataGridViewTextBoxColumn2.Width = 50 + ' + 'DataGridViewTextBoxColumn3 + ' + Me.DataGridViewTextBoxColumn3.HeaderText = "Art der Verpack." + Me.DataGridViewTextBoxColumn3.MaxInputLength = 50 + Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" + Me.DataGridViewTextBoxColumn3.Width = 110 + ' + 'DataGridViewTextBoxColumn4 + ' + Me.DataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.DataGridViewTextBoxColumn4.HeaderText = "Bezeichnung" + Me.DataGridViewTextBoxColumn4.MaxInputLength = 80 + Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" + ' + 'DataGridViewTextBoxColumn6 + ' + Me.DataGridViewTextBoxColumn6.HeaderText = "Brutto Gewicht" + Me.DataGridViewTextBoxColumn6.MaxInputLength = 53 + Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6" + Me.DataGridViewTextBoxColumn6.Width = 274 + ' 'dgvLadungen ' Me.dgvLadungen.AllowUserToAddRows = False @@ -236,14 +268,14 @@ Partial Class usrcntlCMR Me.dgvLadungen.BackgroundColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) Me.dgvLadungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLadungen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.ZeNr, Me.anz, Me.art, Me.bez, Me.statNr, Me.gewicht, Me.umfang}) - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLadungen.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLadungen.DefaultCellStyle = DataGridViewCellStyle4 Me.dgvLadungen.GridColor = System.Drawing.Color.Gray Me.dgvLadungen.Location = New System.Drawing.Point(32, 519) Me.dgvLadungen.Name = "dgvLadungen" @@ -252,6 +284,53 @@ Partial Class usrcntlCMR Me.dgvLadungen.TabIndex = 17 Me.dgvLadungen.Visible = False ' + 'ZeNr + ' + Me.ZeNr.HeaderText = "Zeichen/Nr." + Me.ZeNr.MaxInputLength = 50 + Me.ZeNr.Name = "ZeNr" + Me.ZeNr.Width = 75 + ' + 'anz + ' + Me.anz.HeaderText = "Anzahl" + Me.anz.MaxInputLength = 50 + Me.anz.Name = "anz" + Me.anz.Width = 50 + ' + 'art + ' + Me.art.HeaderText = "Art der Verpack." + Me.art.Name = "art" + Me.art.Width = 107 + ' + 'bez + ' + Me.bez.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.bez.HeaderText = "Bezeichnung" + Me.bez.MaxInputLength = 80 + Me.bez.Name = "bez" + ' + 'statNr + ' + Me.statNr.HeaderText = "Statistik Nr." + Me.statNr.MaxInputLength = 10 + Me.statNr.Name = "statNr" + Me.statNr.Width = 84 + ' + 'gewicht + ' + Me.gewicht.HeaderText = "Brutto Gewicht" + Me.gewicht.MaxInputLength = 53 + Me.gewicht.Name = "gewicht" + ' + 'umfang + ' + Me.umfang.HeaderText = "Umfang" + Me.umfang.MaxInputLength = 53 + Me.umfang.Name = "umfang" + Me.umfang.Width = 90 + ' 'cbxKurz ' Me.cbxKurz.AutoSize = True @@ -424,10 +503,12 @@ Partial Class usrcntlCMR Me.txtAusgefertigtAm._DateTimeOnly = False Me.txtAusgefertigtAm._numbersOnly = False Me.txtAusgefertigtAm._numbersOnlyKommastellen = "" + Me.txtAusgefertigtAm._numbersOnlyTrennzeichen = True Me.txtAusgefertigtAm._Prozent = False Me.txtAusgefertigtAm._ShortDateNew = True Me.txtAusgefertigtAm._ShortDateOnly = False Me.txtAusgefertigtAm._TimeOnly = False + Me.txtAusgefertigtAm._TimeOnly_Seconds = False Me.txtAusgefertigtAm._value = "" Me.txtAusgefertigtAm._Waehrung = False Me.txtAusgefertigtAm._WaehrungZeichen = True @@ -552,10 +633,12 @@ Partial Class usrcntlCMR Me.txtAnhängerKg._DateTimeOnly = False Me.txtAnhängerKg._numbersOnly = True Me.txtAnhängerKg._numbersOnlyKommastellen = "" + Me.txtAnhängerKg._numbersOnlyTrennzeichen = True Me.txtAnhängerKg._Prozent = False Me.txtAnhängerKg._ShortDateNew = False Me.txtAnhängerKg._ShortDateOnly = False Me.txtAnhängerKg._TimeOnly = False + Me.txtAnhängerKg._TimeOnly_Seconds = False Me.txtAnhängerKg._value = "" Me.txtAnhängerKg._Waehrung = False Me.txtAnhängerKg._WaehrungZeichen = True @@ -576,10 +659,12 @@ Partial Class usrcntlCMR Me.txtKfzKg._DateTimeOnly = False Me.txtKfzKg._numbersOnly = True Me.txtKfzKg._numbersOnlyKommastellen = "" + Me.txtKfzKg._numbersOnlyTrennzeichen = True Me.txtKfzKg._Prozent = False Me.txtKfzKg._ShortDateNew = False Me.txtKfzKg._ShortDateOnly = False Me.txtKfzKg._TimeOnly = False + Me.txtKfzKg._TimeOnly_Seconds = False Me.txtKfzKg._value = "" Me.txtKfzKg._Waehrung = False Me.txtKfzKg._WaehrungZeichen = True @@ -600,10 +685,12 @@ Partial Class usrcntlCMR Me.txtAnhänger._DateTimeOnly = False Me.txtAnhänger._numbersOnly = False Me.txtAnhänger._numbersOnlyKommastellen = "" + Me.txtAnhänger._numbersOnlyTrennzeichen = True Me.txtAnhänger._Prozent = False Me.txtAnhänger._ShortDateNew = False Me.txtAnhänger._ShortDateOnly = False Me.txtAnhänger._TimeOnly = False + Me.txtAnhänger._TimeOnly_Seconds = False Me.txtAnhänger._value = Nothing Me.txtAnhänger._Waehrung = False Me.txtAnhänger._WaehrungZeichen = True @@ -624,10 +711,12 @@ Partial Class usrcntlCMR Me.txtDatum._DateTimeOnly = False Me.txtDatum._numbersOnly = False Me.txtDatum._numbersOnlyKommastellen = "" + Me.txtDatum._numbersOnlyTrennzeichen = True Me.txtDatum._Prozent = False Me.txtDatum._ShortDateNew = True Me.txtDatum._ShortDateOnly = False Me.txtDatum._TimeOnly = False + Me.txtDatum._TimeOnly_Seconds = False Me.txtDatum._value = "" Me.txtDatum._Waehrung = False Me.txtDatum._WaehrungZeichen = True @@ -647,10 +736,12 @@ Partial Class usrcntlCMR Me.txtKfz._DateTimeOnly = False Me.txtKfz._numbersOnly = False Me.txtKfz._numbersOnlyKommastellen = "" + Me.txtKfz._numbersOnlyTrennzeichen = True Me.txtKfz._Prozent = False Me.txtKfz._ShortDateNew = False Me.txtKfz._ShortDateOnly = False Me.txtKfz._TimeOnly = False + Me.txtKfz._TimeOnly_Seconds = False Me.txtKfz._value = Nothing Me.txtKfz._Waehrung = False Me.txtKfz._WaehrungZeichen = True @@ -671,10 +762,12 @@ Partial Class usrcntlCMR Me.txtAusgefertigtIn._DateTimeOnly = False Me.txtAusgefertigtIn._numbersOnly = False Me.txtAusgefertigtIn._numbersOnlyKommastellen = "" + Me.txtAusgefertigtIn._numbersOnlyTrennzeichen = True Me.txtAusgefertigtIn._Prozent = False Me.txtAusgefertigtIn._ShortDateNew = False Me.txtAusgefertigtIn._ShortDateOnly = False Me.txtAusgefertigtIn._TimeOnly = False + Me.txtAusgefertigtIn._TimeOnly_Seconds = False Me.txtAusgefertigtIn._value = Nothing Me.txtAusgefertigtIn._Waehrung = False Me.txtAusgefertigtIn._WaehrungZeichen = True @@ -694,10 +787,12 @@ Partial Class usrcntlCMR Me.txtLand._DateTimeOnly = False Me.txtLand._numbersOnly = False Me.txtLand._numbersOnlyKommastellen = "" + Me.txtLand._numbersOnlyTrennzeichen = True Me.txtLand._Prozent = False Me.txtLand._ShortDateNew = False Me.txtLand._ShortDateOnly = False Me.txtLand._TimeOnly = False + Me.txtLand._TimeOnly_Seconds = False Me.txtLand._value = Nothing Me.txtLand._Waehrung = False Me.txtLand._WaehrungZeichen = True @@ -717,10 +812,12 @@ Partial Class usrcntlCMR Me.txtOrt._DateTimeOnly = False Me.txtOrt._numbersOnly = False Me.txtOrt._numbersOnlyKommastellen = "" + Me.txtOrt._numbersOnlyTrennzeichen = True Me.txtOrt._Prozent = False Me.txtOrt._ShortDateNew = False Me.txtOrt._ShortDateOnly = False Me.txtOrt._TimeOnly = False + Me.txtOrt._TimeOnly_Seconds = False Me.txtOrt._value = Nothing Me.txtOrt._Waehrung = False Me.txtOrt._WaehrungZeichen = True @@ -753,10 +850,12 @@ Partial Class usrcntlCMR Me.txtAnweisungenDesAbsenders._DateTimeOnly = False Me.txtAnweisungenDesAbsenders._numbersOnly = False Me.txtAnweisungenDesAbsenders._numbersOnlyKommastellen = "" + Me.txtAnweisungenDesAbsenders._numbersOnlyTrennzeichen = True Me.txtAnweisungenDesAbsenders._Prozent = False Me.txtAnweisungenDesAbsenders._ShortDateNew = False Me.txtAnweisungenDesAbsenders._ShortDateOnly = False Me.txtAnweisungenDesAbsenders._TimeOnly = False + Me.txtAnweisungenDesAbsenders._TimeOnly_Seconds = False Me.txtAnweisungenDesAbsenders._value = Nothing Me.txtAnweisungenDesAbsenders._Waehrung = False Me.txtAnweisungenDesAbsenders._WaehrungZeichen = True @@ -802,10 +901,12 @@ Partial Class usrcntlCMR Me.txtBesondereVereinbarungen._DateTimeOnly = False Me.txtBesondereVereinbarungen._numbersOnly = False Me.txtBesondereVereinbarungen._numbersOnlyKommastellen = "" + Me.txtBesondereVereinbarungen._numbersOnlyTrennzeichen = True Me.txtBesondereVereinbarungen._Prozent = False Me.txtBesondereVereinbarungen._ShortDateNew = False Me.txtBesondereVereinbarungen._ShortDateOnly = False Me.txtBesondereVereinbarungen._TimeOnly = False + Me.txtBesondereVereinbarungen._TimeOnly_Seconds = False Me.txtBesondereVereinbarungen._value = Nothing Me.txtBesondereVereinbarungen._Waehrung = False Me.txtBesondereVereinbarungen._WaehrungZeichen = True @@ -852,10 +953,12 @@ Partial Class usrcntlCMR Me.txtAuslieferungsLand._DateTimeOnly = False Me.txtAuslieferungsLand._numbersOnly = False Me.txtAuslieferungsLand._numbersOnlyKommastellen = "" + Me.txtAuslieferungsLand._numbersOnlyTrennzeichen = True Me.txtAuslieferungsLand._Prozent = False Me.txtAuslieferungsLand._ShortDateNew = False Me.txtAuslieferungsLand._ShortDateOnly = False Me.txtAuslieferungsLand._TimeOnly = False + Me.txtAuslieferungsLand._TimeOnly_Seconds = False Me.txtAuslieferungsLand._value = Nothing Me.txtAuslieferungsLand._Waehrung = False Me.txtAuslieferungsLand._WaehrungZeichen = True @@ -875,10 +978,12 @@ Partial Class usrcntlCMR Me.txtAuslieferungsort._DateTimeOnly = False Me.txtAuslieferungsort._numbersOnly = False Me.txtAuslieferungsort._numbersOnlyKommastellen = "" + Me.txtAuslieferungsort._numbersOnlyTrennzeichen = True Me.txtAuslieferungsort._Prozent = False Me.txtAuslieferungsort._ShortDateNew = False Me.txtAuslieferungsort._ShortDateOnly = False Me.txtAuslieferungsort._TimeOnly = False + Me.txtAuslieferungsort._TimeOnly_Seconds = False Me.txtAuslieferungsort._value = Nothing Me.txtAuslieferungsort._Waehrung = False Me.txtAuslieferungsort._WaehrungZeichen = True @@ -918,80 +1023,27 @@ Partial Class usrcntlCMR Me.pic.TabIndex = 3 Me.pic.TabStop = False ' - 'DataGridViewTextBoxColumn2 + 'LinkLabel8 ' - Me.DataGridViewTextBoxColumn2.HeaderText = "Anzahl" - Me.DataGridViewTextBoxColumn2.MaxInputLength = 50 - Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" - Me.DataGridViewTextBoxColumn2.Width = 50 + Me.LinkLabel8.AutoSize = True + Me.LinkLabel8.BackColor = System.Drawing.Color.White + Me.LinkLabel8.Location = New System.Drawing.Point(200, 1024) + Me.LinkLabel8.Name = "LinkLabel8" + Me.LinkLabel8.Size = New System.Drawing.Size(45, 13) + Me.LinkLabel8.TabIndex = 497 + Me.LinkLabel8.TabStop = True + Me.LinkLabel8.Text = "AMBAR" ' - 'DataGridViewTextBoxColumn3 + 'LinkLabel9 ' - Me.DataGridViewTextBoxColumn3.HeaderText = "Art der Verpack." - Me.DataGridViewTextBoxColumn3.MaxInputLength = 50 - Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" - Me.DataGridViewTextBoxColumn3.Width = 110 - ' - 'DataGridViewTextBoxColumn4 - ' - Me.DataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.DataGridViewTextBoxColumn4.HeaderText = "Bezeichnung" - Me.DataGridViewTextBoxColumn4.MaxInputLength = 80 - Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" - ' - 'DataGridViewTextBoxColumn6 - ' - Me.DataGridViewTextBoxColumn6.HeaderText = "Brutto Gewicht" - Me.DataGridViewTextBoxColumn6.MaxInputLength = 53 - Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6" - Me.DataGridViewTextBoxColumn6.Width = 274 - ' - 'ZeNr - ' - Me.ZeNr.HeaderText = "Zeichen/Nr." - Me.ZeNr.MaxInputLength = 50 - Me.ZeNr.Name = "ZeNr" - Me.ZeNr.Width = 75 - ' - 'anz - ' - Me.anz.HeaderText = "Anzahl" - Me.anz.MaxInputLength = 50 - Me.anz.Name = "anz" - Me.anz.Width = 50 - ' - 'art - ' - Me.art.HeaderText = "Art der Verpack." - Me.art.Name = "art" - Me.art.Width = 107 - ' - 'bez - ' - Me.bez.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.bez.HeaderText = "Bezeichnung" - Me.bez.MaxInputLength = 80 - Me.bez.Name = "bez" - ' - 'statNr - ' - Me.statNr.HeaderText = "Statistik Nr." - Me.statNr.MaxInputLength = 10 - Me.statNr.Name = "statNr" - Me.statNr.Width = 84 - ' - 'gewicht - ' - Me.gewicht.HeaderText = "Brutto Gewicht" - Me.gewicht.MaxInputLength = 53 - Me.gewicht.Name = "gewicht" - ' - 'umfang - ' - Me.umfang.HeaderText = "Umfang" - Me.umfang.MaxInputLength = 53 - Me.umfang.Name = "umfang" - Me.umfang.Width = 90 + Me.LinkLabel9.AutoSize = True + Me.LinkLabel9.BackColor = System.Drawing.Color.White + Me.LinkLabel9.Location = New System.Drawing.Point(492, 1024) + Me.LinkLabel9.Name = "LinkLabel9" + Me.LinkLabel9.Size = New System.Drawing.Size(45, 13) + Me.LinkLabel9.TabIndex = 498 + Me.LinkLabel9.TabStop = True + Me.LinkLabel9.Text = "AMBAR" ' 'usrcntlCMR ' @@ -1074,4 +1126,6 @@ Partial Class usrcntlCMR Friend WithEvents statNr As DataGridViewTextBoxColumn Friend WithEvents gewicht As DataGridViewTextBoxColumn Friend WithEvents umfang As DataGridViewTextBoxColumn + Friend WithEvents LinkLabel9 As LinkLabel + Friend WithEvents LinkLabel8 As LinkLabel End Class diff --git a/SDL/Formulare/CMR/usrcntlCMR.vb b/SDL/Formulare/CMR/usrcntlCMR.vb index a9ccd1e5..9a57f8ab 100644 --- a/SDL/Formulare/CMR/usrcntlCMR.vb +++ b/SDL/Formulare/CMR/usrcntlCMR.vb @@ -12,6 +12,9 @@ dgvLadungen.Rows.Add("", "", "", "", "", "", "") dgvLadungenKurz.Rows.Add("", "", "", "", "", "", "") Next + + txtUnterschriftAbsender.Text = getverag(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + End Sub Public Sub init() @@ -75,6 +78,8 @@ Return "ATILLA Spedition GmbH" & Environment.NewLine & "A 4975 Suben, Nr. 15" Case "IMEX" Return "IMEX Customs Service GmbH" & Environment.NewLine & "A 4975 Suben, Nr. 15" + Case "AMBAR" + Return "AMBAR Logistic Services GmbH" & Environment.NewLine & "DE 83435 Bad Reichenhall, Reichenhallerstrasse 62" End Select Return "" @@ -112,4 +117,12 @@ Private Sub LinkLabel7_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel7.LinkClicked txtUnterschriftFrachtführer.Text = getverag("IMEX") End Sub + + Private Sub LinkLabel8_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel8.LinkClicked + txtUnterschriftAbsender.Text = getverag("AMBAR") + End Sub + + Private Sub LinkLabel9_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel9.LinkClicked + txtUnterschriftFrachtführer.Text = getverag("AMBAR") + End Sub End Class diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 0652e838..32b8a51e 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -90,7 +90,7 @@ false - SDL_TemporaryKey.pfx + Test.pfx diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 630da711..21616f6e 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -20,7 +20,7 @@ Public Class cATEZ_NCTS_DATA Public Property DAKOSY_Division1 As String Public Property DAKOSY_Division2 As String Public Property DAKOSY_Division3 As String - Public Property status As Object = 0 + Public Property status As String = "0" Property erstellung As DateTime = Now Public Property Route_Country As String Public Property Carrier_Name As String @@ -36,6 +36,7 @@ Public Class cATEZ_NCTS_DATA Public Property json As String Public Property dakosy_ref As String Public Property selectedDocuments As String + Public Property fehlerbeschreibung As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -71,6 +72,7 @@ Public Class cATEZ_NCTS_DATA list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("json", json)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("dakosy_ref", dakosy_ref)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("selectedDocuments", selectedDocuments)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fehlerbeschreibung", fehlerbeschreibung)) Return list End Function @@ -565,7 +567,7 @@ Public Class cATEZ_NCTS_IN Dim sbRequestBody As New Chilkat.StringBuilder jsonData.EmitSb(sbRequestBody) - Debug.WriteLine(sbRequestBody) + 'Debug.WriteLine(sbRequestBody) Dim sbResponseBody As New Chilkat.StringBuilder success = rest.FullRequestSb("POST", "/api/integrations/verag", sbRequestBody, sbResponseBody) @@ -577,11 +579,21 @@ Public Class cATEZ_NCTS_IN Else If (rest.ResponseStatusCode <> 200) Then - failureDesc = rest.ResponseStatusCode & "-" & rest.ResponseStatusText - Return failureDesc + If rest.ResponseStatusCode = 500 Then + Dim jsonResultFailure As New Chilkat.JsonObject + jsonResultFailure.LoadSb(sbResponseBody) + jsonResultFailure.Emit() + failureDesc = jsonResultFailure.StringOf("code") & "-" & jsonResultFailure.StringOf("message") + Return failureDesc + Else + + failureDesc = rest.ResponseStatusCode & "-" & rest.ResponseStatusText + Return failureDesc + End If + Else - Dim jsonResult As New Chilkat.JsonObject + Dim jsonResult As New Chilkat.JsonObject success = jsonResult.LoadSb(sbResponseBody) jsonResult.Emit() Return jsonResult.StringOf("atezId") @@ -596,7 +608,7 @@ Public Class cATEZ_NCTS_IN End Try End Function - Shared Function setJson(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) + Shared Function setJson(ncts As cATEZ_NCTS_DATA) Dim success As Boolean @@ -638,7 +650,17 @@ Public Class cATEZ_NCTS_IN i = i + 1 Next + ncts.json = jsonData.Emit() + + Return success + + End Function + + Public Function setJsonPDF(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) + + Dim success As Boolean + Dim i As Integer = 0 For Each r As DataGridViewRow In dgv.Rows Dim isSelected = IIf(DBNull.Value Is r.Cells("anh_selekt").Value, False, r.Cells("anh_selekt").Value) i = 0 @@ -652,10 +674,8 @@ Public Class cATEZ_NCTS_IN success = jsonData.UpdateString("Attachments.Attachment[" & i & "].base64BinaryStream", bd.GetEncoded("base64")) i = i + 1 End If - Next - ncts.json = jsonData.Emit() - + jsonData.Emit() Return success From 14f48af13778a94ca3f397b9e971196d08359091 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 1 Sep 2023 14:55:11 +0200 Subject: [PATCH 2/5] neues Feld (ATEZ) --- .../Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 14289d2a..b25eca24 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -38,6 +38,8 @@ Public Class cATEZ_NCTS_DATA Public Property dakosy_ref As String Public Property selectedDocuments As String + Public Property fehlerbeschreibung As String + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Public hasEntry As Boolean @@ -73,6 +75,7 @@ Public Class cATEZ_NCTS_DATA list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("json", json)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("dakosy_ref", dakosy_ref)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("selectedDocuments", selectedDocuments)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fehlerbeschreibung", fehlerbeschreibung)) Return list End Function @@ -641,6 +644,7 @@ Public Class cATEZ_NCTS_IN i = i + 1 Next + ncts.json = jsonData.Emit() For Each r As DataGridViewRow In dgv.Rows Dim isSelected = IIf(DBNull.Value Is r.Cells("anh_selekt").Value, False, r.Cells("anh_selekt").Value) @@ -657,7 +661,7 @@ Public Class cATEZ_NCTS_IN End If Next - ncts.json = jsonData.Emit() + jsonData.Emit() Return success From 1309d507cb094e874578a6059aa4f889da46b616 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 1 Sep 2023 17:00:00 +0200 Subject: [PATCH 3/5] ATEZ -> umgebaut --- .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index b25eca24..04277a92 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -37,7 +37,6 @@ Public Class cATEZ_NCTS_DATA Public Property json As String Public Property dakosy_ref As String Public Property selectedDocuments As String - Public Property fehlerbeschreibung As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -570,7 +569,7 @@ Public Class cATEZ_NCTS_IN Dim sbRequestBody As New Chilkat.StringBuilder jsonData.EmitSb(sbRequestBody) - Debug.WriteLine(sbRequestBody) + 'Debug.WriteLine(sbRequestBody) Dim sbResponseBody As New Chilkat.StringBuilder success = rest.FullRequestSb("POST", "/api/integrations/verag", sbRequestBody, sbResponseBody) @@ -582,8 +581,18 @@ Public Class cATEZ_NCTS_IN Else If (rest.ResponseStatusCode <> 200) Then - failureDesc = rest.ResponseStatusCode & "-" & rest.ResponseStatusText - Return failureDesc + If rest.ResponseStatusCode = 500 Then + Dim jsonResultFailure As New Chilkat.JsonObject + jsonResultFailure.LoadSb(sbResponseBody) + jsonResultFailure.Emit() + failureDesc = jsonResultFailure.StringOf("code") & "-" & jsonResultFailure.StringOf("message") + Return failureDesc + Else + + failureDesc = rest.ResponseStatusCode & "-" & rest.ResponseStatusText + Return failureDesc + End If + Else Dim jsonResult As New Chilkat.JsonObject @@ -601,7 +610,7 @@ Public Class cATEZ_NCTS_IN End Try End Function - Shared Function setJson(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) + Shared Function setJson(ncts As cATEZ_NCTS_DATA) Dim success As Boolean @@ -646,6 +655,15 @@ Public Class cATEZ_NCTS_IN ncts.json = jsonData.Emit() + + Return success + + End Function + + Public Function setJsonPDF(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) + + Dim success As Boolean + Dim i As Integer = 0 For Each r As DataGridViewRow In dgv.Rows Dim isSelected = IIf(DBNull.Value Is r.Cells("anh_selekt").Value, False, r.Cells("anh_selekt").Value) i = 0 @@ -659,11 +677,9 @@ Public Class cATEZ_NCTS_IN success = jsonData.UpdateString("Attachments.Attachment[" & i & "].base64BinaryStream", bd.GetEncoded("base64")) i = i + 1 End If - Next jsonData.Emit() - Return success End Function From 8414fb80bf168fd98c295222f0ebc8db0f975cde Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 4 Sep 2023 08:07:40 +0200 Subject: [PATCH 4/5] debugmodus deaktiviert. --- .../Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 04277a92..016aba99 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -571,6 +571,9 @@ Public Class cATEZ_NCTS_IN jsonData.EmitSb(sbRequestBody) 'Debug.WriteLine(sbRequestBody) + 'DEBUG-Mode -> no request will be sent! + 'rest.DebugMode = True + Dim sbResponseBody As New Chilkat.StringBuilder success = rest.FullRequestSb("POST", "/api/integrations/verag", sbRequestBody, sbResponseBody) From eaaa59fef644cb00d3c94004ce7d1ca8493be40b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 4 Sep 2023 08:32:07 +0200 Subject: [PATCH 5/5] timas-verbesserungen --- .../Schnittstellen/TIMAS/cTimasAPI.vb | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index 44314af2..cf045186 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -267,6 +267,7 @@ Public Class cTimasAPI success = rest.FullRequestSb("POST", "/rest/web-api/employees", sbRequestBody, sbResponseBody) If (success <> True) Then Debug.WriteLine(rest.LastErrorText) + info = rest.LastErrorText Return timasEmployeeCreated End If @@ -556,15 +557,15 @@ Public Class cTimasAPI Return "Array Failure" End If - If dt IsNot Nothing And Not dt.Columns.Contains("id") Then - dt.Columns.Add("id", GetType(Integer)) - dt.Columns.Add("externid", GetType(String)) - dt.Columns.Add("pnr1", GetType(String)) - dt.Columns.Add("firstname", GetType(String)) - dt.Columns.Add("lastname", GetType(String)) - dt.Columns.Add("gender", GetType(String)) - dt.Columns.Add("card", GetType(Integer)) - dt.Columns.Add("info", GetType(String)) + If dt IsNot Nothing And Not dt.Columns.Contains("Id") Then + dt.Columns.Add("Id", GetType(Integer)) + 'dt.Columns.Add("externid", GetType(String)) + dt.Columns.Add("Personal-Nr (Lohn)", GetType(String)) + dt.Columns.Add("Vorname", GetType(String)) + dt.Columns.Add("Nachname", GetType(String)) + dt.Columns.Add("Geschlecht", GetType(String)) + dt.Columns.Add("Ausweis-Nr", GetType(Integer)) + dt.Columns.Add("Info", GetType(String)) @@ -574,14 +575,14 @@ Public Class cTimasAPI Dim employee As Chilkat.JsonObject = jsonArray.ObjectAt(j) Dim R As DataRow = dt.NewRow - R("id") = employee.IntOf("id") - R("externid") = employee.StringOf("externid") - R("pnr1") = employee.StringOf("pnr1") - R("firstname") = employee.StringOf("firstname") - R("lastname") = employee.StringOf("lastname") - R("gender") = employee.StringOf("gender") - R("card") = employee.IntOf("card") - R("info") = employee.StringOf("info") + R("Id") = employee.IntOf("id") + '("externid") = employee.StringOf("externid") + R("Personal-Nr (Lohn)") = employee.StringOf("pnr1") + R("Vorname") = employee.StringOf("firstname") + R("Nachname") = employee.StringOf("lastname") + R("Geschlecht") = employee.StringOf("gender") + R("Ausweis-Nr") = employee.IntOf("card") + R("Info") = employee.StringOf("info") dt.Rows.Add(R) j = j + 1 End While