diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb index 1f31f5b..1a6b694 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -116,6 +116,7 @@ Public Class frmATEZ_NCTS .Carrier_Adress_Street = usrCntl_Carrier.txtStrasse.Text .Carrier_EORI = usrCntl_Carrier.txtEORI.Text .Guarantee_GRN = "" 'leer + .erstellerId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID 'For Each doc As DataGridViewRow In dgvAnhaenge.Rows ' Dim isSelected = IIf(DBNull.Value Is doc.Cells("anh_selekt").Value, False, doc.Cells("anh_selekt").Value) @@ -155,7 +156,7 @@ Public Class frmATEZ_NCTS Dim authResp = atez.authenticate() If authResp <> "200" Then - failreDesc = "Authentifizierung fehlgeschlagen - " & authResp & vbNewLine & "Vorgang abgebrochen!" + failreDesc = "Authentifizierung fehlgeschlagen - " & authResp & vbNewLine & "Vorgang abgebrochen/wiederholen!" lblInfo.Text = failreDesc Return False End If @@ -189,13 +190,11 @@ Public Class frmATEZ_NCTS lblInfo.Text = "Fehler in der API " Else - If azetId = -1 Then - atezData.fehlerbeschreibung = "Request has been sent, but not header received!" - End If + If azetId = -1 Then atezData.fehlerbeschreibung = "Request has been sent, but no header received!" atezData.status = "Sent" - atezData.atezId = IIf(azetId IsNot Nothing, azetId, "") - Return atezData.SAVE() + atezData.atezId = IIf(azetId IsNot Nothing, azetId, "") + Return atezData.SAVE() End If diff --git a/Aviso/frmDigicust.Designer.vb b/Aviso/frmDigicust.Designer.vb index 1467d71..89d603f 100644 --- a/Aviso/frmDigicust.Designer.vb +++ b/Aviso/frmDigicust.Designer.vb @@ -26,26 +26,27 @@ Partial Class frmDigicust Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDigicust)) Me.Button1 = New System.Windows.Forms.Button() Me.pnlHead = New System.Windows.Forms.Panel() + Me.txtVorpapierT = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtLWKLand = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.UsrCntl_Consignee = New SDL.usrCntlAdresse() + Me.txtVorpapier = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblVorpapier = New System.Windows.Forms.Label() Me.lblInfo = New System.Windows.Forms.Label() Me.Label6 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() + Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtLKWId = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.usrCntl_consignor = New SDL.usrCntlAdresse() Me.Label4 = New System.Windows.Forms.Label() + Me.sbBestimmungsZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label3 = New System.Windows.Forms.Label() + Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.txtDyMandant = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.txtDyNiederlassung = New System.Windows.Forms.Label() Me.lblBezugsnummer = New System.Windows.Forms.Label() - Me.lblVorpapier = New System.Windows.Forms.Label() - Me.UsrCntl_Consignee = New SDL.usrCntlAdresse() - Me.txtVorpapier = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtLKWId = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.usrCntl_consignor = New SDL.usrCntlAdresse() - Me.sbBestimmungsZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.txtLWKLand = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtVorpapierT = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxAviso = New System.Windows.Forms.CheckBox() Me.pnlHead.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -70,6 +71,7 @@ Partial Class frmDigicust ' Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnlHead.BackColor = System.Drawing.Color.White + Me.pnlHead.Controls.Add(Me.cbxAviso) Me.pnlHead.Controls.Add(Me.txtVorpapierT) Me.pnlHead.Controls.Add(Me.txtLWKLand) Me.pnlHead.Controls.Add(Me.UsrCntl_Consignee) @@ -94,99 +96,51 @@ Partial Class frmDigicust Me.pnlHead.Size = New System.Drawing.Size(606, 706) Me.pnlHead.TabIndex = 112 ' - 'lblInfo + 'txtVorpapierT ' - Me.lblInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblInfo.ForeColor = System.Drawing.Color.Red - Me.lblInfo.Location = New System.Drawing.Point(64, 310) - Me.lblInfo.Name = "lblInfo" - Me.lblInfo.Size = New System.Drawing.Size(460, 27) - Me.lblInfo.TabIndex = 148 + Me.txtVorpapierT._DateTimeOnly = False + Me.txtVorpapierT._numbersOnly = False + Me.txtVorpapierT._numbersOnlyKommastellen = "" + Me.txtVorpapierT._numbersOnlyTrennzeichen = True + Me.txtVorpapierT._Prozent = False + Me.txtVorpapierT._ShortDateNew = False + Me.txtVorpapierT._ShortDateOnly = False + Me.txtVorpapierT._TimeOnly = False + Me.txtVorpapierT._TimeOnly_Seconds = False + Me.txtVorpapierT._value = "" + Me.txtVorpapierT._Waehrung = False + Me.txtVorpapierT._WaehrungZeichen = True + Me.txtVorpapierT.ForeColor = System.Drawing.Color.Black + Me.txtVorpapierT.Location = New System.Drawing.Point(410, 86) + Me.txtVorpapierT.MaxLineLength = -1 + Me.txtVorpapierT.MaxLines_Warning = "" + Me.txtVorpapierT.MaxLines_Warning_Label = Nothing + Me.txtVorpapierT.Name = "txtVorpapierT" + Me.txtVorpapierT.Size = New System.Drawing.Size(33, 20) + Me.txtVorpapierT.TabIndex = 155 ' - 'Label6 + 'txtLWKLand ' - Me.Label6.Location = New System.Drawing.Point(10, 337) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(135, 13) - Me.Label6.TabIndex = 147 - Me.Label6.Text = "Dokumente:" - ' - 'Label8 - ' - Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(14, 58) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(57, 13) - Me.Label8.TabIndex = 146 - Me.Label8.Text = "Stammref.:" - Me.Label8.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'Label4 - ' - Me.Label4.Location = New System.Drawing.Point(14, 85) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(78, 20) - Me.Label4.TabIndex = 114 - Me.Label4.Text = "Bes-Zollstelle:" - ' - 'Label3 - ' - Me.Label3.Location = New System.Drawing.Point(319, 61) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(50, 15) - Me.Label3.TabIndex = 113 - Me.Label3.Text = "LKW-KZ:" - ' - 'txtDyMandant - ' - Me.txtDyMandant.BackColor = System.Drawing.Color.White - Me.txtDyMandant.Location = New System.Drawing.Point(2, 2) - Me.txtDyMandant.Name = "txtDyMandant" - Me.txtDyMandant.Size = New System.Drawing.Size(44, 13) - Me.txtDyMandant.TabIndex = 109 - Me.txtDyMandant.Text = "VERG" - Me.txtDyMandant.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'Label1 - ' - Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label1.AutoSize = True - Me.Label1.BackColor = System.Drawing.Color.White - Me.Label1.Location = New System.Drawing.Point(318, 2) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(82, 13) - Me.Label1.TabIndex = 106 - Me.Label1.Text = "Bezugsnummer:" - ' - 'txtDyNiederlassung - ' - Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White - Me.txtDyNiederlassung.Location = New System.Drawing.Point(52, 3) - Me.txtDyNiederlassung.Name = "txtDyNiederlassung" - Me.txtDyNiederlassung.Size = New System.Drawing.Size(45, 12) - Me.txtDyNiederlassung.TabIndex = 108 - Me.txtDyNiederlassung.Text = "SUB" - ' - 'lblBezugsnummer - ' - Me.lblBezugsnummer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblBezugsnummer.BackColor = System.Drawing.Color.White - Me.lblBezugsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBezugsnummer.Location = New System.Drawing.Point(406, 2) - Me.lblBezugsnummer.Name = "lblBezugsnummer" - Me.lblBezugsnummer.Size = New System.Drawing.Size(193, 23) - Me.lblBezugsnummer.TabIndex = 107 - Me.lblBezugsnummer.Text = "4800/000000/17 AAA" - Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight - ' - 'lblVorpapier - ' - Me.lblVorpapier.Location = New System.Drawing.Point(319, 89) - Me.lblVorpapier.Name = "lblVorpapier" - Me.lblVorpapier.Size = New System.Drawing.Size(67, 13) - Me.lblVorpapier.TabIndex = 149 - Me.lblVorpapier.Text = "Vorpapier" + Me.txtLWKLand._DateTimeOnly = False + Me.txtLWKLand._numbersOnly = False + Me.txtLWKLand._numbersOnlyKommastellen = "" + Me.txtLWKLand._numbersOnlyTrennzeichen = True + Me.txtLWKLand._Prozent = False + Me.txtLWKLand._ShortDateNew = False + Me.txtLWKLand._ShortDateOnly = False + Me.txtLWKLand._TimeOnly = False + Me.txtLWKLand._TimeOnly_Seconds = False + Me.txtLWKLand._value = "" + Me.txtLWKLand._Waehrung = False + Me.txtLWKLand._WaehrungZeichen = True + Me.txtLWKLand.ForeColor = System.Drawing.Color.Black + Me.txtLWKLand.Location = New System.Drawing.Point(533, 58) + Me.txtLWKLand.MaxLineLength = -1 + Me.txtLWKLand.MaxLines_Warning = "" + Me.txtLWKLand.MaxLines_Warning_Label = Nothing + Me.txtLWKLand.Name = "txtLWKLand" + Me.txtLWKLand.Size = New System.Drawing.Size(37, 20) + Me.txtLWKLand.TabIndex = 154 ' 'UsrCntl_Consignee ' @@ -221,6 +175,42 @@ Partial Class frmDigicust Me.txtVorpapier.Size = New System.Drawing.Size(121, 20) Me.txtVorpapier.TabIndex = 150 ' + 'lblVorpapier + ' + Me.lblVorpapier.Location = New System.Drawing.Point(319, 89) + Me.lblVorpapier.Name = "lblVorpapier" + Me.lblVorpapier.Size = New System.Drawing.Size(67, 13) + Me.lblVorpapier.TabIndex = 149 + Me.lblVorpapier.Text = "Vorpapier" + ' + 'lblInfo + ' + Me.lblInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblInfo.ForeColor = System.Drawing.Color.Red + Me.lblInfo.Location = New System.Drawing.Point(64, 310) + Me.lblInfo.Name = "lblInfo" + Me.lblInfo.Size = New System.Drawing.Size(460, 27) + Me.lblInfo.TabIndex = 148 + ' + 'Label6 + ' + Me.Label6.Location = New System.Drawing.Point(10, 337) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(135, 13) + Me.Label6.TabIndex = 147 + Me.Label6.Text = "Dokumente:" + ' + 'Label8 + ' + Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(14, 58) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(57, 13) + Me.Label8.TabIndex = 146 + Me.Label8.Text = "Stammref.:" + Me.Label8.TextAlign = System.Drawing.ContentAlignment.TopRight + ' 'cboStammreferenz ' Me.cboStammreferenz._allowedValuesFreiText = Nothing @@ -268,6 +258,14 @@ Partial Class frmDigicust Me.usrCntl_consignor.Size = New System.Drawing.Size(284, 132) Me.usrCntl_consignor.TabIndex = 143 ' + 'Label4 + ' + Me.Label4.Location = New System.Drawing.Point(14, 85) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(78, 20) + Me.Label4.TabIndex = 114 + Me.Label4.Text = "Bes-Zollstelle:" + ' 'sbBestimmungsZollstelle ' Me.sbBestimmungsZollstelle._allowFreitext = False @@ -293,6 +291,14 @@ Partial Class frmDigicust Me.sbBestimmungsZollstelle.TabIndex = 115 Me.sbBestimmungsZollstelle.usrcntl = Nothing ' + 'Label3 + ' + Me.Label3.Location = New System.Drawing.Point(319, 61) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(50, 15) + Me.Label3.TabIndex = 113 + Me.Label3.Text = "LKW-KZ:" + ' 'dgvAnhaenge ' Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1 @@ -316,51 +322,59 @@ Partial Class frmDigicust Me.columnName.Name = "columnName" Me.columnName.ReadOnly = True ' - 'txtLWKLand + 'txtDyMandant ' - Me.txtLWKLand._DateTimeOnly = False - Me.txtLWKLand._numbersOnly = False - Me.txtLWKLand._numbersOnlyKommastellen = "" - Me.txtLWKLand._numbersOnlyTrennzeichen = True - Me.txtLWKLand._Prozent = False - Me.txtLWKLand._ShortDateNew = False - Me.txtLWKLand._ShortDateOnly = False - Me.txtLWKLand._TimeOnly = False - Me.txtLWKLand._TimeOnly_Seconds = False - Me.txtLWKLand._value = "" - Me.txtLWKLand._Waehrung = False - Me.txtLWKLand._WaehrungZeichen = True - Me.txtLWKLand.ForeColor = System.Drawing.Color.Black - Me.txtLWKLand.Location = New System.Drawing.Point(533, 58) - Me.txtLWKLand.MaxLineLength = -1 - Me.txtLWKLand.MaxLines_Warning = "" - Me.txtLWKLand.MaxLines_Warning_Label = Nothing - Me.txtLWKLand.Name = "txtLWKLand" - Me.txtLWKLand.Size = New System.Drawing.Size(37, 20) - Me.txtLWKLand.TabIndex = 154 + Me.txtDyMandant.BackColor = System.Drawing.Color.White + Me.txtDyMandant.Location = New System.Drawing.Point(2, 2) + Me.txtDyMandant.Name = "txtDyMandant" + Me.txtDyMandant.Size = New System.Drawing.Size(44, 13) + Me.txtDyMandant.TabIndex = 109 + Me.txtDyMandant.Text = "VERG" + Me.txtDyMandant.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'txtVorpapierT + 'Label1 ' - Me.txtVorpapierT._DateTimeOnly = False - Me.txtVorpapierT._numbersOnly = False - Me.txtVorpapierT._numbersOnlyKommastellen = "" - Me.txtVorpapierT._numbersOnlyTrennzeichen = True - Me.txtVorpapierT._Prozent = False - Me.txtVorpapierT._ShortDateNew = False - Me.txtVorpapierT._ShortDateOnly = False - Me.txtVorpapierT._TimeOnly = False - Me.txtVorpapierT._TimeOnly_Seconds = False - Me.txtVorpapierT._value = "" - Me.txtVorpapierT._Waehrung = False - Me.txtVorpapierT._WaehrungZeichen = True - Me.txtVorpapierT.ForeColor = System.Drawing.Color.Black - Me.txtVorpapierT.Location = New System.Drawing.Point(410, 86) - Me.txtVorpapierT.MaxLineLength = -1 - Me.txtVorpapierT.MaxLines_Warning = "" - Me.txtVorpapierT.MaxLines_Warning_Label = Nothing - Me.txtVorpapierT.Name = "txtVorpapierT" - Me.txtVorpapierT.Size = New System.Drawing.Size(33, 20) - Me.txtVorpapierT.TabIndex = 155 + Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label1.AutoSize = True + Me.Label1.BackColor = System.Drawing.Color.White + Me.Label1.Location = New System.Drawing.Point(318, 2) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(82, 13) + Me.Label1.TabIndex = 106 + Me.Label1.Text = "Bezugsnummer:" + ' + 'txtDyNiederlassung + ' + Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White + Me.txtDyNiederlassung.Location = New System.Drawing.Point(52, 3) + Me.txtDyNiederlassung.Name = "txtDyNiederlassung" + Me.txtDyNiederlassung.Size = New System.Drawing.Size(45, 12) + Me.txtDyNiederlassung.TabIndex = 108 + Me.txtDyNiederlassung.Text = "SUB" + ' + 'lblBezugsnummer + ' + Me.lblBezugsnummer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblBezugsnummer.BackColor = System.Drawing.Color.White + Me.lblBezugsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblBezugsnummer.Location = New System.Drawing.Point(406, 2) + Me.lblBezugsnummer.Name = "lblBezugsnummer" + Me.lblBezugsnummer.Size = New System.Drawing.Size(193, 23) + Me.lblBezugsnummer.TabIndex = 107 + Me.lblBezugsnummer.Text = "4800/000000/17 AAA" + Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight + ' + 'cbxAviso + ' + Me.cbxAviso.AutoSize = True + Me.cbxAviso.Checked = True + Me.cbxAviso.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxAviso.Location = New System.Drawing.Point(409, 35) + Me.cbxAviso.Name = "cbxAviso" + Me.cbxAviso.Size = New System.Drawing.Size(150, 17) + Me.cbxAviso.TabIndex = 156 + Me.cbxAviso.Text = "Daten aus Aviso schicken" + Me.cbxAviso.UseVisualStyleBackColor = True ' 'frmDigicust ' @@ -402,4 +416,5 @@ Partial Class frmDigicust Friend WithEvents lblVorpapier As Label Friend WithEvents txtVorpapierT As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtLWKLand As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents cbxAviso As CheckBox End Class diff --git a/Aviso/frmDigicust.vb b/Aviso/frmDigicust.vb index 9d283e4..eb05af9 100644 --- a/Aviso/frmDigicust.vb +++ b/Aviso/frmDigicust.vb @@ -124,7 +124,7 @@ Public Class frmDigicust - sendDigicustData(dig_sendung, api, settings) + sendDigicustData(dig_sendung, api, settings, cbxAviso.Checked) Me.Cursor = Cursors.Default @@ -136,7 +136,7 @@ Public Class frmDigicust End Sub - Private Sub sendDigicustData(dig As cDigicustSendungen, api As cDigicustAPI, settings As cDigicustSettings) + Private Sub sendDigicustData(dig As cDigicustSendungen, api As cDigicustAPI, settings As cDigicustSettings, withAvisoData As Boolean) Dim failreDesc As String @@ -147,7 +147,7 @@ Public Class frmDigicust Exit Sub End If - If api.uploadingCase(dig, settings, dgvAnhaenge) Then + If api.uploadingCase(dig, settings, dgvAnhaenge, withAvisoData) Then dig.SAVE() Me.Close() End If