From 413bac9c940bafa08ef2b5be8018546fbb3532be Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 12 Sep 2023 16:53:49 +0200 Subject: [PATCH] Digicust --- Aviso/frmDigicust.Designer.vb | 385 +++++++++++++++++++-------------- Aviso/frmDigicust.vb | 114 +++++----- Aviso/frmSendungsdetailsNEU.vb | 4 +- 3 files changed, 271 insertions(+), 232 deletions(-) diff --git a/Aviso/frmDigicust.Designer.vb b/Aviso/frmDigicust.Designer.vb index b858e53..1467d71 100644 --- a/Aviso/frmDigicust.Designer.vb +++ b/Aviso/frmDigicust.Designer.vb @@ -26,25 +26,26 @@ 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.Button2 = New System.Windows.Forms.Button() - Me.btnCreateToken = New System.Windows.Forms.Button() - Me.Label2 = New System.Windows.Forms.Label() - Me.rtfToken = New System.Windows.Forms.RichTextBox() 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_Carrier = 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.pnlHead.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -57,7 +58,7 @@ Partial Class frmDigicust Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.Button1.Location = New System.Drawing.Point(154, 716) + Me.Button1.Location = New System.Drawing.Point(244, 713) Me.Button1.Margin = New System.Windows.Forms.Padding(2) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(159, 42) @@ -69,16 +70,17 @@ Partial Class frmDigicust ' Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnlHead.BackColor = System.Drawing.Color.White - Me.pnlHead.Controls.Add(Me.Button2) - Me.pnlHead.Controls.Add(Me.btnCreateToken) - Me.pnlHead.Controls.Add(Me.Label2) - Me.pnlHead.Controls.Add(Me.rtfToken) + Me.pnlHead.Controls.Add(Me.txtVorpapierT) + Me.pnlHead.Controls.Add(Me.txtLWKLand) + Me.pnlHead.Controls.Add(Me.UsrCntl_Consignee) + Me.pnlHead.Controls.Add(Me.txtVorpapier) + Me.pnlHead.Controls.Add(Me.lblVorpapier) Me.pnlHead.Controls.Add(Me.lblInfo) Me.pnlHead.Controls.Add(Me.Label6) Me.pnlHead.Controls.Add(Me.Label8) Me.pnlHead.Controls.Add(Me.cboStammreferenz) Me.pnlHead.Controls.Add(Me.txtLKWId) - Me.pnlHead.Controls.Add(Me.usrCntl_Carrier) + Me.pnlHead.Controls.Add(Me.usrCntl_consignor) Me.pnlHead.Controls.Add(Me.Label4) Me.pnlHead.Controls.Add(Me.sbBestimmungsZollstelle) Me.pnlHead.Controls.Add(Me.Label3) @@ -89,60 +91,21 @@ Partial Class frmDigicust Me.pnlHead.Controls.Add(Me.lblBezugsnummer) Me.pnlHead.Location = New System.Drawing.Point(3, 2) Me.pnlHead.Name = "pnlHead" - Me.pnlHead.Size = New System.Drawing.Size(478, 706) + Me.pnlHead.Size = New System.Drawing.Size(606, 706) Me.pnlHead.TabIndex = 112 ' - 'Button2 - ' - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(70, 105) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(115, 25) - Me.Button2.TabIndex = 152 - Me.Button2.Text = "Clear Token" - Me.Button2.UseVisualStyleBackColor = True - ' - 'btnCreateToken - ' - Me.btnCreateToken.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCreateToken.Location = New System.Drawing.Point(274, 105) - Me.btnCreateToken.Name = "btnCreateToken" - Me.btnCreateToken.Size = New System.Drawing.Size(115, 25) - Me.btnCreateToken.TabIndex = 151 - Me.btnCreateToken.Text = "Create Token" - Me.btnCreateToken.UseVisualStyleBackColor = True - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Label2.Location = New System.Drawing.Point(68, 41) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(98, 13) - Me.Label2.TabIndex = 150 - Me.Label2.Text = "Token (valid 24hrs)" - Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' - 'rtfToken - ' - Me.rtfToken.Location = New System.Drawing.Point(70, 57) - Me.rtfToken.Name = "rtfToken" - Me.rtfToken.Size = New System.Drawing.Size(319, 42) - Me.rtfToken.TabIndex = 149 - Me.rtfToken.Text = "" - ' '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(10, 27) + 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, 373) + 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 @@ -152,124 +115,29 @@ Partial Class frmDigicust ' 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(283, 156) + 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 - Me.cboStammreferenz._allowFreiText = False - Me.cboStammreferenz._value = "" - Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboStammreferenz.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboStammreferenz.FormattingEnabled = True - Me.cboStammreferenz.Location = New System.Drawing.Point(341, 153) - Me.cboStammreferenz.Name = "cboStammreferenz" - Me.cboStammreferenz.Size = New System.Drawing.Size(129, 21) - Me.cboStammreferenz.TabIndex = 145 - ' - 'txtLKWId - ' - Me.txtLKWId._DateTimeOnly = False - Me.txtLKWId._numbersOnly = False - Me.txtLKWId._numbersOnlyKommastellen = "" - Me.txtLKWId._numbersOnlyTrennzeichen = True - Me.txtLKWId._Prozent = False - Me.txtLKWId._ShortDateNew = False - Me.txtLKWId._ShortDateOnly = False - Me.txtLKWId._TimeOnly = False - Me.txtLKWId._TimeOnly_Seconds = False - Me.txtLKWId._value = "" - Me.txtLKWId._Waehrung = False - Me.txtLKWId._WaehrungZeichen = True - Me.txtLKWId.ForeColor = System.Drawing.Color.Black - Me.txtLKWId.Location = New System.Drawing.Point(151, 154) - Me.txtLKWId.MaxLineLength = -1 - Me.txtLKWId.MaxLines_Warning = "" - Me.txtLKWId.MaxLines_Warning_Label = Nothing - Me.txtLKWId.Name = "txtLKWId" - Me.txtLKWId.Size = New System.Drawing.Size(100, 20) - Me.txtLKWId.TabIndex = 144 - ' - 'usrCntl_Carrier - ' - Me.usrCntl_Carrier._Titel = "Frächter:" - Me.usrCntl_Carrier.BackColor = System.Drawing.Color.White - Me.usrCntl_Carrier.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.usrCntl_Carrier.Location = New System.Drawing.Point(13, 217) - Me.usrCntl_Carrier.Name = "usrCntl_Carrier" - Me.usrCntl_Carrier.Size = New System.Drawing.Size(408, 132) - Me.usrCntl_Carrier.TabIndex = 143 - ' 'Label4 ' - Me.Label4.Location = New System.Drawing.Point(10, 180) + Me.Label4.Location = New System.Drawing.Point(14, 85) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(121, 17) + Me.Label4.Size = New System.Drawing.Size(78, 20) Me.Label4.TabIndex = 114 - Me.Label4.Text = "Bestimmungs-Zollstelle:" - ' - 'sbBestimmungsZollstelle - ' - Me.sbBestimmungsZollstelle._allowFreitext = False - Me.sbBestimmungsZollstelle._AllowSetValue = False - Me.sbBestimmungsZollstelle._allowSpaceAsSplitter = False - Me.sbBestimmungsZollstelle._autoSizeGross = False - Me.sbBestimmungsZollstelle._hideIfListEmpty = True - Me.sbBestimmungsZollstelle._value = "" - Me.sbBestimmungsZollstelle.conn_art = "FMZOLL" - Me.sbBestimmungsZollstelle.dgvpos = "LEFT" - Me.sbBestimmungsZollstelle.DISPLAY_PARAM = Nothing - Me.sbBestimmungsZollstelle.INVISIBLE_COLUMNS = Nothing - Me.sbBestimmungsZollstelle.key_visible = False - Me.sbBestimmungsZollstelle.KEYPARAM = Nothing - Me.sbBestimmungsZollstelle.Location = New System.Drawing.Point(151, 180) - Me.sbBestimmungsZollstelle.Name = "sbBestimmungsZollstelle" - Me.sbBestimmungsZollstelle.searchActive = True - Me.sbBestimmungsZollstelle.Size = New System.Drawing.Size(196, 20) - Me.sbBestimmungsZollstelle.SQL_ORDER_BY = Nothing - Me.sbBestimmungsZollstelle.SQL_SELECT = Nothing - Me.sbBestimmungsZollstelle.SQL_WHERE = Nothing - Me.sbBestimmungsZollstelle.SQL_WhereParamList = Nothing - Me.sbBestimmungsZollstelle.TabIndex = 115 - Me.sbBestimmungsZollstelle.usrcntl = Nothing + Me.Label4.Text = "Bes-Zollstelle:" ' 'Label3 ' - Me.Label3.Location = New System.Drawing.Point(10, 157) + Me.Label3.Location = New System.Drawing.Point(319, 61) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(103, 17) + Me.Label3.Size = New System.Drawing.Size(50, 15) Me.Label3.TabIndex = 113 Me.Label3.Text = "LKW-KZ:" ' - 'dgvAnhaenge - ' - Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvAnhaenge.AllowUserToAddRows = False - Me.dgvAnhaenge.AllowUserToDeleteRows = False - Me.dgvAnhaenge.AllowUserToResizeColumns = False - Me.dgvAnhaenge.AllowUserToResizeRows = False - Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White - Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName}) - Me.dgvAnhaenge.Location = New System.Drawing.Point(13, 401) - Me.dgvAnhaenge.Name = "dgvAnhaenge" - Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAnhaenge.Size = New System.Drawing.Size(463, 299) - Me.dgvAnhaenge.TabIndex = 112 - ' - 'columnName - ' - Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.columnName.HeaderText = "Name" - Me.columnName.Name = "columnName" - Me.columnName.ReadOnly = True - ' 'txtDyMandant ' Me.txtDyMandant.BackColor = System.Drawing.Color.White @@ -285,7 +153,7 @@ Partial Class frmDigicust 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(190, 2) + 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 @@ -305,19 +173,201 @@ Partial Class frmDigicust 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(278, 2) + 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" + ' + 'UsrCntl_Consignee + ' + Me.UsrCntl_Consignee._Titel = "Empfänger:" + Me.UsrCntl_Consignee.BackColor = System.Drawing.Color.White + Me.UsrCntl_Consignee.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntl_Consignee.Location = New System.Drawing.Point(303, 158) + Me.UsrCntl_Consignee.Name = "UsrCntl_Consignee" + Me.UsrCntl_Consignee.Size = New System.Drawing.Size(284, 132) + Me.UsrCntl_Consignee.TabIndex = 151 + ' + 'txtVorpapier + ' + Me.txtVorpapier._DateTimeOnly = False + Me.txtVorpapier._numbersOnly = False + Me.txtVorpapier._numbersOnlyKommastellen = "" + Me.txtVorpapier._numbersOnlyTrennzeichen = True + Me.txtVorpapier._Prozent = False + Me.txtVorpapier._ShortDateNew = False + Me.txtVorpapier._ShortDateOnly = False + Me.txtVorpapier._TimeOnly = False + Me.txtVorpapier._TimeOnly_Seconds = False + Me.txtVorpapier._value = "" + Me.txtVorpapier._Waehrung = False + Me.txtVorpapier._WaehrungZeichen = True + Me.txtVorpapier.ForeColor = System.Drawing.Color.Black + Me.txtVorpapier.Location = New System.Drawing.Point(449, 86) + Me.txtVorpapier.MaxLineLength = -1 + Me.txtVorpapier.MaxLines_Warning = "" + Me.txtVorpapier.MaxLines_Warning_Label = Nothing + Me.txtVorpapier.Name = "txtVorpapier" + Me.txtVorpapier.Size = New System.Drawing.Size(121, 20) + Me.txtVorpapier.TabIndex = 150 + ' + 'cboStammreferenz + ' + Me.cboStammreferenz._allowedValuesFreiText = Nothing + Me.cboStammreferenz._allowFreiText = False + Me.cboStammreferenz._value = "" + Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboStammreferenz.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboStammreferenz.FormattingEnabled = True + Me.cboStammreferenz.Location = New System.Drawing.Point(77, 55) + Me.cboStammreferenz.Name = "cboStammreferenz" + Me.cboStammreferenz.Size = New System.Drawing.Size(154, 21) + Me.cboStammreferenz.TabIndex = 145 + ' + 'txtLKWId + ' + Me.txtLKWId._DateTimeOnly = False + Me.txtLKWId._numbersOnly = False + Me.txtLKWId._numbersOnlyKommastellen = "" + Me.txtLKWId._numbersOnlyTrennzeichen = True + Me.txtLKWId._Prozent = False + Me.txtLKWId._ShortDateNew = False + Me.txtLKWId._ShortDateOnly = False + Me.txtLKWId._TimeOnly = False + Me.txtLKWId._TimeOnly_Seconds = False + Me.txtLKWId._value = "" + Me.txtLKWId._Waehrung = False + Me.txtLKWId._WaehrungZeichen = True + Me.txtLKWId.ForeColor = System.Drawing.Color.Black + Me.txtLKWId.Location = New System.Drawing.Point(409, 58) + Me.txtLKWId.MaxLineLength = -1 + Me.txtLKWId.MaxLines_Warning = "" + Me.txtLKWId.MaxLines_Warning_Label = Nothing + Me.txtLKWId.Name = "txtLKWId" + Me.txtLKWId.Size = New System.Drawing.Size(115, 20) + Me.txtLKWId.TabIndex = 144 + ' + 'usrCntl_consignor + ' + Me.usrCntl_consignor._Titel = "Absender" + Me.usrCntl_consignor.BackColor = System.Drawing.Color.White + Me.usrCntl_consignor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.usrCntl_consignor.Location = New System.Drawing.Point(5, 158) + Me.usrCntl_consignor.Name = "usrCntl_consignor" + Me.usrCntl_consignor.Size = New System.Drawing.Size(284, 132) + Me.usrCntl_consignor.TabIndex = 143 + ' + 'sbBestimmungsZollstelle + ' + Me.sbBestimmungsZollstelle._allowFreitext = False + Me.sbBestimmungsZollstelle._AllowSetValue = False + Me.sbBestimmungsZollstelle._allowSpaceAsSplitter = False + Me.sbBestimmungsZollstelle._autoSizeGross = False + Me.sbBestimmungsZollstelle._hideIfListEmpty = True + Me.sbBestimmungsZollstelle._value = "" + Me.sbBestimmungsZollstelle.conn_art = "FMZOLL" + Me.sbBestimmungsZollstelle.dgvpos = "LEFT" + Me.sbBestimmungsZollstelle.DISPLAY_PARAM = Nothing + Me.sbBestimmungsZollstelle.INVISIBLE_COLUMNS = Nothing + Me.sbBestimmungsZollstelle.key_visible = False + Me.sbBestimmungsZollstelle.KEYPARAM = Nothing + Me.sbBestimmungsZollstelle.Location = New System.Drawing.Point(102, 82) + Me.sbBestimmungsZollstelle.Name = "sbBestimmungsZollstelle" + Me.sbBestimmungsZollstelle.searchActive = True + Me.sbBestimmungsZollstelle.Size = New System.Drawing.Size(129, 20) + Me.sbBestimmungsZollstelle.SQL_ORDER_BY = Nothing + Me.sbBestimmungsZollstelle.SQL_SELECT = Nothing + Me.sbBestimmungsZollstelle.SQL_WHERE = Nothing + Me.sbBestimmungsZollstelle.SQL_WhereParamList = Nothing + Me.sbBestimmungsZollstelle.TabIndex = 115 + Me.sbBestimmungsZollstelle.usrcntl = Nothing + ' + 'dgvAnhaenge + ' + Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvAnhaenge.AllowUserToAddRows = False + Me.dgvAnhaenge.AllowUserToDeleteRows = False + Me.dgvAnhaenge.AllowUserToResizeColumns = False + Me.dgvAnhaenge.AllowUserToResizeRows = False + Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White + Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName}) + Me.dgvAnhaenge.Location = New System.Drawing.Point(13, 353) + Me.dgvAnhaenge.Name = "dgvAnhaenge" + Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvAnhaenge.Size = New System.Drawing.Size(590, 347) + Me.dgvAnhaenge.TabIndex = 112 + ' + 'columnName + ' + Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.columnName.HeaderText = "Name" + Me.columnName.Name = "columnName" + Me.columnName.ReadOnly = True + ' + 'txtLWKLand + ' + 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 + ' + 'txtVorpapierT + ' + 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 + ' 'frmDigicust ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(484, 769) + Me.ClientSize = New System.Drawing.Size(621, 769) Me.Controls.Add(Me.pnlHead) Me.Controls.Add(Me.Button1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -337,7 +387,7 @@ Partial Class frmDigicust Friend WithEvents Label8 As Label Friend WithEvents cboStammreferenz As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents txtLKWId As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents usrCntl_Carrier As SDL.usrCntlAdresse + Friend WithEvents usrCntl_consignor As SDL.usrCntlAdresse Friend WithEvents Label4 As Label Friend WithEvents sbBestimmungsZollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox Friend WithEvents Label3 As Label @@ -347,8 +397,9 @@ Partial Class frmDigicust Friend WithEvents Label1 As Label Friend WithEvents txtDyNiederlassung As Label Friend WithEvents lblBezugsnummer As Label - Friend WithEvents Button2 As Button - Friend WithEvents btnCreateToken As Button - Friend WithEvents Label2 As Label - Friend WithEvents rtfToken As RichTextBox + Friend WithEvents UsrCntl_Consignee As SDL.usrCntlAdresse + Friend WithEvents txtVorpapier As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents lblVorpapier As Label + Friend WithEvents txtVorpapierT As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtLWKLand As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/Aviso/frmDigicust.vb b/Aviso/frmDigicust.vb index ca41f38..9d283e4 100644 --- a/Aviso/frmDigicust.vb +++ b/Aviso/frmDigicust.vb @@ -1,4 +1,5 @@ Imports DAKOSY_Worker.DEERRE +Imports DAKOSY_Worker.eZollTypes Imports DocumentFormat.OpenXml.Vml.Presentation Imports GrapeCity.ActiveReports.Design.DdrDesigner.Designers Imports GrapeCity.ActiveReports.ReportsCore.Tools @@ -79,10 +80,6 @@ Public Class frmDigicust Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Try - 'If atez_data.status = "Sent" Then - - 'End If - If Not checkAttachment() Then Exit Sub @@ -102,27 +99,24 @@ Public Class frmDigicust With dig_sendung .avisoId = AVISO.AvisoID - ' .SendungsId = SENDUNG.tblSnd_SendungID .reference = lblBezugsnummer.Text - ' ' .LicensePlateContainerNo = txtLKWId.Text - ' ' .DAKOSY_TemplateCode = cboStammreferenz._value - ' ' .DAKOSY_IOPartner = txtDyMandant.Text - ' ' .DAKOSY_Division3 = txtDyNiederlassung.Text - ' ' .DestinationCustomsOffice = sbBestimmungsZollstelle._value - ' ' .Carrier_Name = usrCntl_Carrier.kdFirma.Text - ' ' .Carrier_Adress_City = usrCntl_Carrier.txtOrt.Text - ' ' .Carrier_Adress_Country = usrCntl_Carrier.sbLand._value - ' ' .Carrier_Adress_Postcode = usrCntl_Carrier.txtPlz.Text - ' ' .Carrier_Adress_Street = usrCntl_Carrier.txtStrasse.Text - ' ' .Carrier_EORI = usrCntl_Carrier.txtEORI.Text - ' ' .Guarantee_GRN = "" 'leer + .consignor_eori = usrCntl_consignor.txtEORI.Text + .consignor_name = usrCntl_consignor.kdFirma.Text + .consignor_address = usrCntl_consignor.txtStrasse.Text + .consignor_city_name = usrCntl_consignor.txtOrt.Text + .consignor_country_id = usrCntl_consignor.sbLand._value + .consignor_postcode = usrCntl_consignor.txtPlz.Text + .consignee_eori = UsrCntl_Consignee.txtEORI.Text + .consignee_name = UsrCntl_Consignee.kdFirma.Text + .consignee_address = UsrCntl_Consignee.txtStrasse.Text + .consignee_city_name = UsrCntl_Consignee.txtOrt.Text + .consignee_country_id = UsrCntl_Consignee.sbLand._value + .consignee_postcode = UsrCntl_Consignee.txtPlz.Text + .prepaper = txtVorpapier.Text + .prepaper_code = txtVorpapierT.Text + .licencePlate = txtLKWId.Text + .lkwCountryId = txtLWKLand.Text - ' '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) - ' ' If isSelected Then - ' ' .selectedDocuments &= doc.Cells("anh_docId").Value & ", " - ' ' End If - ' 'Next '.SAVE() @@ -146,17 +140,16 @@ Public Class frmDigicust Dim failreDesc As String - Dim authResp = api.authenticate(rtfToken.Text) + Dim authResp = api.authenticate("") If authResp <> "200" Then failreDesc = "Authentifizierung fehlgeschlagen - " & authResp & vbNewLine & "Vorgang abgebrochen!" lblInfo.Text = failreDesc Exit Sub End If - Dim token = rtfToken.Text - If api.uploadingCase(dig, settings, dgvAnhaenge) Then dig.SAVE() + Me.Close() End If 'If Not atez.setJson(atezData) Then MsgBox("Fehler beim Erstellen der Daten" & vbNewLine & "Vorgang abgebrochen!") @@ -244,6 +237,7 @@ Public Class frmDigicust End Select initAttachment() + initSeachboxes() cboStammreferenz.fillWithSQL("SELECT [id],[description] FROM [tblDigicust_Settings] WHERE companyId = " & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID & " and valid =1", False, "FMZOLL", True) cboStammreferenz.changeItem("") @@ -302,34 +296,28 @@ Public Class frmDigicust ' End If Else - ' atez_data = New cATEZ_NCTS_DATA() - ' Button1.Text = "An ATEZ senden -->" - ' pnlHead.Enabled = True - getBezugsnr(BezugsNr) txtLKWId.Text = AVISO.LKW_Nr + txtLWKLand.Text = AVISO.LKW_Nationalitaet - ' cbxTemperatur.Checked = IIf(AVISO.TransportTemperatur <> "", True, False) - ' txtTransporttemp.Text = AVISO.TransportTemperatur - If AVISO.Frächter_KdNr IsNot Nothing AndAlso IsNumeric(AVISO.Frächter_KdNr) AndAlso AVISO.Frächter_KdNr > 0 Then - usrCntl_Carrier.kdFirma.initKdBox(Me) - usrCntl_Carrier.kdFirma.KdNr = AVISO.Frächter_KdNr + If If(SENDUNG.tblSnd_Vorpapier, "") <> "" Then + txtVorpapier.Text = SENDUNG.tblSnd_Vorpapier + txtVorpapierT.Text = cDy_ART End If - 'If AVISO.Grenzstelle.Replace("???", "") = "" Then - ' sbAbgangZollstelle.SET_VALUE(AVISO.Zollstelle) - 'Else + If SENDUNG.tblSnd_EmpfaengerKdNr > -1 Then + UsrCntl_Consignee.kdFirma.initKdBox(Me) + UsrCntl_Consignee.kdFirma.KdNr = SENDUNG.tblSnd_EmpfaengerKdNr + End If - ' Dim GRZ As New VERAG_PROG_ALLGEMEIN.cGrenzstelle(AVISO.Grenzstelle) - ' If GRZ IsNot Nothing AndAlso GRZ.hasEntry Then - ' If GRZ.grz_ZollamtDST IsNot Nothing Then - ' sbAbgangZollstelle.SET_VALUE(GRZ.grz_ZollamtDST) - ' End If - ' End If - ' End If + + If SENDUNG.tblSnd_AbsenderKdNr > -1 Then + usrCntl_consignor.kdFirma.initKdBox(Me) + usrCntl_consignor.kdFirma.KdNr = SENDUNG.tblSnd_AbsenderKdNr + End If End If @@ -365,7 +353,7 @@ Public Class frmDigicust Dim col As DataColumn col = dt.Columns.Add("anh_selekt", GetType(Boolean)) col.SetOrdinal(0) - + dgvAnhaenge.Columns.Clear() dgvAnhaenge.DataSource = dt If dgvAnhaenge.RowCount = 0 Then dgvAnhaenge.Columns.Clear() : Exit Sub @@ -384,15 +372,15 @@ Public Class frmDigicust .Columns("anh_selekt").HeaderText = "ausgewählt" .Columns("anh_selekt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter - .Columns("anh_Datum").MinimumWidth = 50 - .Columns("anh_Datum").HeaderText = "Datum" - .Columns("anh_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter - - .Columns("anh_Name").MinimumWidth = 150 .Columns("anh_Name").HeaderText = "Name" .Columns("anh_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + .Columns("anh_Datum").MinimumWidth = 50 + .Columns("anh_Datum").HeaderText = "Datum" + .Columns("anh_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("anh_Art").MinimumWidth = 50 .Columns("anh_Art").HeaderText = "Art" .Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter @@ -442,20 +430,20 @@ Public Class frmDigicust End Function + Public Sub initSeachboxes() - - - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click - rtfToken.Text = "" + sbBestimmungsZollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"}) End Sub - Private Sub btnCreateToken_Click(sender As Object, e As EventArgs) Handles btnCreateToken.Click - Label2.Text = "Status: " & api.authenticate(rtfToken.Text) - If rtfToken.Text <> "" Then - Label1.Text = "Token (valid 1h) until: " & Now().AddHours(1) - Else - Label1.Text = "Token (valid 1h)" - End If - End Sub + + 'Private Sub btnCreateToken_Click(sender As Object, e As EventArgs) + ' Label2.Text = "Status: " & api.authenticate(rtfToken.Text) + ' If rtfToken.Text <> "" Then + ' Label1.Text = "Token (valid 1h) until: " & Now().AddHours(1) + ' Else + ' Label1.Text = "Token (valid 1h)" + ' End If + + 'End Sub End Class \ No newline at end of file diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 78e5e63..fbae950 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -6444,7 +6444,7 @@ Public Class frmSendungsdetailsNEU With dgvDigicust .Columns.Clear() .ReadOnly = False - .DataSource = SQL.loadDgvBySql("select * FROM [tblDigicust_Sendungen] WHERE AvisoId='" & AvisoId & "'", "FMZOLL") + .DataSource = SQL.loadDgvBySql("select Id, AvisoId, reference, digicustId, status, createdAt, modifiedAt, uploadedDocuments, companyId, projectId FROM [tblDigicust_Sendungen] WHERE AvisoId='" & AvisoId & "'", "FMZOLL") If .Columns.Count <= 0 Then Exit Sub 'Ä.Columns("txtStatus").ReadOnly = False .Columns("Id").Visible = False @@ -6464,7 +6464,7 @@ Public Class frmSendungsdetailsNEU .Columns("createdAt").DefaultCellStyle.Format = "dd.MM.yy HH:mm" .Columns("createdAt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter - .Columns("modifiedAt").HeaderText = "Geändert" + .Columns("modifiedAt").HeaderText = "Status abgefragt" .Columns("modifiedAt").Width = 150 .Columns("modifiedAt").DefaultCellStyle.Format = "dd.MM.yy HH:mm" .Columns("modifiedAt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter