diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index c510e00..fc4e1e0 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -80,10 +80,10 @@ My Project\app.manifest - 5A6BD29D23A7643243CD6EFA1FEF21BAF955E653 + 3BC7E5117746E4022D08199F835BF4B0F8F3E7D0 - AL20210908.pfx + Aviso_1_TemporaryKey.pfx true @@ -108,7 +108,7 @@ x64 - Aviso_TemporaryKey.pfx + LME.pfx @@ -1402,6 +1402,7 @@ + Component diff --git a/Aviso/frmATEZ_NCTS.Designer.vb b/Aviso/frmATEZ_NCTS.Designer.vb index 54514fb..1ba9c57 100644 --- a/Aviso/frmATEZ_NCTS.Designer.vb +++ b/Aviso/frmATEZ_NCTS.Designer.vb @@ -26,6 +26,8 @@ Partial Class frmATEZ_NCTS Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmATEZ_NCTS)) Me.Button1 = New System.Windows.Forms.Button() Me.pnlHead = New System.Windows.Forms.Panel() + Me.Label2 = New System.Windows.Forms.Label() + Me.cboProzedur = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblInfo = New System.Windows.Forms.Label() Me.Label6 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() @@ -70,8 +72,6 @@ Partial Class frmATEZ_NCTS Me.Label1 = New System.Windows.Forms.Label() Me.txtDyNiederlassung = New System.Windows.Forms.Label() Me.lblBezugsnummer = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.cboProzedur = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.pnlHead.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -84,7 +84,7 @@ Partial Class frmATEZ_NCTS 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(154, 757) Me.Button1.Margin = New System.Windows.Forms.Padding(2) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(159, 42) @@ -143,21 +143,46 @@ Partial Class frmATEZ_NCTS 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(478, 750) Me.pnlHead.TabIndex = 112 ' + 'Label2 + ' + Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(10, 47) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(52, 13) + Me.Label2.TabIndex = 150 + Me.Label2.Text = "Prozedur:" + Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'cboProzedur + ' + Me.cboProzedur._allowedValuesFreiText = Nothing + Me.cboProzedur._allowFreiText = False + Me.cboProzedur._value = "" + Me.cboProzedur.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cboProzedur.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboProzedur.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboProzedur.FormattingEnabled = True + Me.cboProzedur.Location = New System.Drawing.Point(151, 44) + Me.cboProzedur.Name = "cboProzedur" + Me.cboProzedur.Size = New System.Drawing.Size(100, 21) + Me.cboProzedur.TabIndex = 149 + ' '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(3, 20) Me.lblInfo.Name = "lblInfo" - Me.lblInfo.Size = New System.Drawing.Size(460, 27) + Me.lblInfo.Size = New System.Drawing.Size(460, 21) Me.lblInfo.TabIndex = 148 ' 'Label6 ' - Me.Label6.Location = New System.Drawing.Point(10, 562) + Me.Label6.Location = New System.Drawing.Point(10, 573) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(135, 13) Me.Label6.TabIndex = 147 @@ -167,7 +192,7 @@ Partial Class frmATEZ_NCTS ' 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, 65) + Me.Label8.Location = New System.Drawing.Point(283, 76) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(57, 13) Me.Label8.TabIndex = 146 @@ -183,7 +208,7 @@ Partial Class frmATEZ_NCTS 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, 62) + Me.cboStammreferenz.Location = New System.Drawing.Point(341, 73) Me.cboStammreferenz.Name = "cboStammreferenz" Me.cboStammreferenz.Size = New System.Drawing.Size(129, 21) Me.cboStammreferenz.TabIndex = 145 @@ -203,7 +228,7 @@ Partial Class frmATEZ_NCTS Me.txtLKWId._Waehrung = False Me.txtLKWId._WaehrungZeichen = True Me.txtLKWId.ForeColor = System.Drawing.Color.Black - Me.txtLKWId.Location = New System.Drawing.Point(151, 63) + Me.txtLKWId.Location = New System.Drawing.Point(151, 74) Me.txtLKWId.MaxLineLength = -1 Me.txtLKWId.MaxLines_Warning = "" Me.txtLKWId.MaxLines_Warning_Label = Nothing @@ -216,7 +241,7 @@ Partial Class frmATEZ_NCTS 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, 218) + Me.usrCntl_Carrier.Location = New System.Drawing.Point(13, 229) Me.usrCntl_Carrier.Name = "usrCntl_Carrier" Me.usrCntl_Carrier.Size = New System.Drawing.Size(408, 132) Me.usrCntl_Carrier.TabIndex = 143 @@ -237,7 +262,7 @@ Partial Class frmATEZ_NCTS Me.txtDat._WaehrungZeichen = True Me.txtDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.txtDat.ForeColor = System.Drawing.Color.Black - Me.txtDat.Location = New System.Drawing.Point(151, 137) + Me.txtDat.Location = New System.Drawing.Point(151, 148) Me.txtDat.MaxLength = 10 Me.txtDat.MaxLineLength = -1 Me.txtDat.MaxLines_Warning = "" @@ -252,7 +277,7 @@ Partial Class frmATEZ_NCTS Me.dtpDat.CustomFormat = "''" Me.dtpDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dtpDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpDat.Location = New System.Drawing.Point(151, 137) + Me.dtpDat.Location = New System.Drawing.Point(151, 148) Me.dtpDat.Margin = New System.Windows.Forms.Padding(0) Me.dtpDat.Name = "dtpDat" Me.dtpDat.Size = New System.Drawing.Size(110, 24) @@ -260,7 +285,7 @@ Partial Class frmATEZ_NCTS ' 'Label7 ' - Me.Label7.Location = New System.Drawing.Point(10, 137) + Me.Label7.Location = New System.Drawing.Point(10, 148) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(103, 17) Me.Label7.TabIndex = 140 @@ -269,7 +294,7 @@ Partial Class frmATEZ_NCTS 'lblC ' Me.lblC.AutoSize = True - Me.lblC.Location = New System.Drawing.Point(251, 168) + Me.lblC.Location = New System.Drawing.Point(251, 179) Me.lblC.Name = "lblC" Me.lblC.Size = New System.Drawing.Size(18, 13) Me.lblC.TabIndex = 139 @@ -290,7 +315,7 @@ Partial Class frmATEZ_NCTS Me.txtTransporttemp._Waehrung = False Me.txtTransporttemp._WaehrungZeichen = True Me.txtTransporttemp.ForeColor = System.Drawing.Color.Black - Me.txtTransporttemp.Location = New System.Drawing.Point(151, 164) + Me.txtTransporttemp.Location = New System.Drawing.Point(151, 175) Me.txtTransporttemp.MaxLineLength = -1 Me.txtTransporttemp.MaxLines_Warning = "" Me.txtTransporttemp.MaxLines_Warning_Label = Nothing @@ -302,7 +327,7 @@ Partial Class frmATEZ_NCTS ' Me.cbxTemperatur.AutoSize = True Me.cbxTemperatur.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxTemperatur.Location = New System.Drawing.Point(13, 164) + Me.cbxTemperatur.Location = New System.Drawing.Point(13, 175) Me.cbxTemperatur.Name = "cbxTemperatur" Me.cbxTemperatur.Size = New System.Drawing.Size(131, 17) Me.cbxTemperatur.TabIndex = 137 @@ -324,7 +349,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle5.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle5.key_visible = False Me.sbDurchgangszollstelle5.KEYPARAM = Nothing - Me.sbDurchgangszollstelle5.Location = New System.Drawing.Point(166, 418) + Me.sbDurchgangszollstelle5.Location = New System.Drawing.Point(166, 429) Me.sbDurchgangszollstelle5.Name = "sbDurchgangszollstelle5" Me.sbDurchgangszollstelle5.searchActive = True Me.sbDurchgangszollstelle5.Size = New System.Drawing.Size(154, 20) @@ -349,7 +374,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle9.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle9.key_visible = False Me.sbDurchgangszollstelle9.KEYPARAM = Nothing - Me.sbDurchgangszollstelle9.Location = New System.Drawing.Point(319, 437) + Me.sbDurchgangszollstelle9.Location = New System.Drawing.Point(319, 448) Me.sbDurchgangszollstelle9.Name = "sbDurchgangszollstelle9" Me.sbDurchgangszollstelle9.searchActive = True Me.sbDurchgangszollstelle9.Size = New System.Drawing.Size(154, 20) @@ -374,7 +399,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle8.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle8.key_visible = False Me.sbDurchgangszollstelle8.KEYPARAM = Nothing - Me.sbDurchgangszollstelle8.Location = New System.Drawing.Point(166, 437) + Me.sbDurchgangszollstelle8.Location = New System.Drawing.Point(166, 448) Me.sbDurchgangszollstelle8.Name = "sbDurchgangszollstelle8" Me.sbDurchgangszollstelle8.searchActive = True Me.sbDurchgangszollstelle8.Size = New System.Drawing.Size(154, 20) @@ -399,7 +424,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle7.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle7.key_visible = False Me.sbDurchgangszollstelle7.KEYPARAM = Nothing - Me.sbDurchgangszollstelle7.Location = New System.Drawing.Point(13, 437) + Me.sbDurchgangszollstelle7.Location = New System.Drawing.Point(13, 448) Me.sbDurchgangszollstelle7.Name = "sbDurchgangszollstelle7" Me.sbDurchgangszollstelle7.searchActive = True Me.sbDurchgangszollstelle7.Size = New System.Drawing.Size(154, 20) @@ -424,7 +449,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle6.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle6.key_visible = False Me.sbDurchgangszollstelle6.KEYPARAM = Nothing - Me.sbDurchgangszollstelle6.Location = New System.Drawing.Point(319, 418) + Me.sbDurchgangszollstelle6.Location = New System.Drawing.Point(319, 429) Me.sbDurchgangszollstelle6.Name = "sbDurchgangszollstelle6" Me.sbDurchgangszollstelle6.searchActive = True Me.sbDurchgangszollstelle6.Size = New System.Drawing.Size(154, 20) @@ -449,7 +474,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle4.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle4.key_visible = False Me.sbDurchgangszollstelle4.KEYPARAM = Nothing - Me.sbDurchgangszollstelle4.Location = New System.Drawing.Point(13, 418) + Me.sbDurchgangszollstelle4.Location = New System.Drawing.Point(13, 429) Me.sbDurchgangszollstelle4.Name = "sbDurchgangszollstelle4" Me.sbDurchgangszollstelle4.searchActive = True Me.sbDurchgangszollstelle4.Size = New System.Drawing.Size(154, 20) @@ -474,7 +499,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle3.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle3.key_visible = False Me.sbDurchgangszollstelle3.KEYPARAM = Nothing - Me.sbDurchgangszollstelle3.Location = New System.Drawing.Point(319, 399) + Me.sbDurchgangszollstelle3.Location = New System.Drawing.Point(319, 410) Me.sbDurchgangszollstelle3.Name = "sbDurchgangszollstelle3" Me.sbDurchgangszollstelle3.searchActive = True Me.sbDurchgangszollstelle3.Size = New System.Drawing.Size(154, 20) @@ -499,7 +524,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle2.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle2.key_visible = False Me.sbDurchgangszollstelle2.KEYPARAM = Nothing - Me.sbDurchgangszollstelle2.Location = New System.Drawing.Point(166, 399) + Me.sbDurchgangszollstelle2.Location = New System.Drawing.Point(166, 410) Me.sbDurchgangszollstelle2.Name = "sbDurchgangszollstelle2" Me.sbDurchgangszollstelle2.searchActive = True Me.sbDurchgangszollstelle2.Size = New System.Drawing.Size(154, 20) @@ -524,7 +549,7 @@ Partial Class frmATEZ_NCTS Me.sbDurchgangszollstelle1.INVISIBLE_COLUMNS = Nothing Me.sbDurchgangszollstelle1.key_visible = False Me.sbDurchgangszollstelle1.KEYPARAM = Nothing - Me.sbDurchgangszollstelle1.Location = New System.Drawing.Point(13, 399) + Me.sbDurchgangszollstelle1.Location = New System.Drawing.Point(13, 410) Me.sbDurchgangszollstelle1.Name = "sbDurchgangszollstelle1" Me.sbDurchgangszollstelle1.searchActive = True Me.sbDurchgangszollstelle1.Size = New System.Drawing.Size(154, 20) @@ -537,7 +562,7 @@ Partial Class frmATEZ_NCTS ' 'Label5 ' - Me.Label5.Location = New System.Drawing.Point(10, 383) + Me.Label5.Location = New System.Drawing.Point(10, 394) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(135, 13) Me.Label5.TabIndex = 127 @@ -547,7 +572,7 @@ Partial Class frmATEZ_NCTS ' Me.lklRoutenauswahl.AutoSize = True Me.lklRoutenauswahl.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.lklRoutenauswahl.Location = New System.Drawing.Point(392, 478) + Me.lklRoutenauswahl.Location = New System.Drawing.Point(392, 489) Me.lklRoutenauswahl.Name = "lklRoutenauswahl" Me.lklRoutenauswahl.Size = New System.Drawing.Size(81, 13) Me.lklRoutenauswahl.TabIndex = 117 @@ -568,7 +593,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute5.INVISIBLE_COLUMNS = Nothing Me.sbRoute5.key_visible = False Me.sbRoute5.KEYPARAM = Nothing - Me.sbRoute5.Location = New System.Drawing.Point(166, 513) + Me.sbRoute5.Location = New System.Drawing.Point(166, 524) Me.sbRoute5.Name = "sbRoute5" Me.sbRoute5.searchActive = True Me.sbRoute5.Size = New System.Drawing.Size(154, 20) @@ -593,7 +618,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute9.INVISIBLE_COLUMNS = Nothing Me.sbRoute9.key_visible = False Me.sbRoute9.KEYPARAM = Nothing - Me.sbRoute9.Location = New System.Drawing.Point(319, 532) + Me.sbRoute9.Location = New System.Drawing.Point(319, 543) Me.sbRoute9.Name = "sbRoute9" Me.sbRoute9.searchActive = True Me.sbRoute9.Size = New System.Drawing.Size(154, 20) @@ -618,7 +643,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute8.INVISIBLE_COLUMNS = Nothing Me.sbRoute8.key_visible = False Me.sbRoute8.KEYPARAM = Nothing - Me.sbRoute8.Location = New System.Drawing.Point(166, 532) + Me.sbRoute8.Location = New System.Drawing.Point(166, 543) Me.sbRoute8.Name = "sbRoute8" Me.sbRoute8.searchActive = True Me.sbRoute8.Size = New System.Drawing.Size(154, 20) @@ -643,7 +668,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute7.INVISIBLE_COLUMNS = Nothing Me.sbRoute7.key_visible = False Me.sbRoute7.KEYPARAM = Nothing - Me.sbRoute7.Location = New System.Drawing.Point(13, 532) + Me.sbRoute7.Location = New System.Drawing.Point(13, 543) Me.sbRoute7.Name = "sbRoute7" Me.sbRoute7.searchActive = True Me.sbRoute7.Size = New System.Drawing.Size(154, 20) @@ -668,7 +693,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute6.INVISIBLE_COLUMNS = Nothing Me.sbRoute6.key_visible = False Me.sbRoute6.KEYPARAM = Nothing - Me.sbRoute6.Location = New System.Drawing.Point(319, 513) + Me.sbRoute6.Location = New System.Drawing.Point(319, 524) Me.sbRoute6.Name = "sbRoute6" Me.sbRoute6.searchActive = True Me.sbRoute6.Size = New System.Drawing.Size(154, 20) @@ -693,7 +718,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute4.INVISIBLE_COLUMNS = Nothing Me.sbRoute4.key_visible = False Me.sbRoute4.KEYPARAM = Nothing - Me.sbRoute4.Location = New System.Drawing.Point(13, 513) + Me.sbRoute4.Location = New System.Drawing.Point(13, 524) Me.sbRoute4.Name = "sbRoute4" Me.sbRoute4.searchActive = True Me.sbRoute4.Size = New System.Drawing.Size(154, 20) @@ -718,7 +743,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute3.INVISIBLE_COLUMNS = Nothing Me.sbRoute3.key_visible = False Me.sbRoute3.KEYPARAM = Nothing - Me.sbRoute3.Location = New System.Drawing.Point(319, 494) + Me.sbRoute3.Location = New System.Drawing.Point(319, 505) Me.sbRoute3.Name = "sbRoute3" Me.sbRoute3.searchActive = True Me.sbRoute3.Size = New System.Drawing.Size(154, 20) @@ -743,7 +768,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute2.INVISIBLE_COLUMNS = Nothing Me.sbRoute2.key_visible = False Me.sbRoute2.KEYPARAM = Nothing - Me.sbRoute2.Location = New System.Drawing.Point(166, 494) + Me.sbRoute2.Location = New System.Drawing.Point(166, 505) Me.sbRoute2.Name = "sbRoute2" Me.sbRoute2.searchActive = True Me.sbRoute2.Size = New System.Drawing.Size(154, 20) @@ -768,7 +793,7 @@ Partial Class frmATEZ_NCTS Me.sbRoute1.INVISIBLE_COLUMNS = Nothing Me.sbRoute1.key_visible = False Me.sbRoute1.KEYPARAM = Nothing - Me.sbRoute1.Location = New System.Drawing.Point(13, 494) + Me.sbRoute1.Location = New System.Drawing.Point(13, 505) Me.sbRoute1.Name = "sbRoute1" Me.sbRoute1.searchActive = True Me.sbRoute1.Size = New System.Drawing.Size(154, 20) @@ -781,7 +806,7 @@ Partial Class frmATEZ_NCTS ' 'Label14 ' - Me.Label14.Location = New System.Drawing.Point(10, 478) + Me.Label14.Location = New System.Drawing.Point(10, 489) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(135, 13) Me.Label14.TabIndex = 116 @@ -789,7 +814,7 @@ Partial Class frmATEZ_NCTS ' 'Label4 ' - Me.Label4.Location = New System.Drawing.Point(10, 115) + Me.Label4.Location = New System.Drawing.Point(10, 126) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(121, 17) Me.Label4.TabIndex = 114 @@ -809,7 +834,7 @@ Partial Class frmATEZ_NCTS Me.sbBestimmungsZollstelle.INVISIBLE_COLUMNS = Nothing Me.sbBestimmungsZollstelle.key_visible = False Me.sbBestimmungsZollstelle.KEYPARAM = Nothing - Me.sbBestimmungsZollstelle.Location = New System.Drawing.Point(151, 115) + Me.sbBestimmungsZollstelle.Location = New System.Drawing.Point(151, 126) Me.sbBestimmungsZollstelle.Name = "sbBestimmungsZollstelle" Me.sbBestimmungsZollstelle.searchActive = True Me.sbBestimmungsZollstelle.Size = New System.Drawing.Size(196, 20) @@ -822,7 +847,7 @@ Partial Class frmATEZ_NCTS ' 'Label3 ' - Me.Label3.Location = New System.Drawing.Point(10, 66) + Me.Label3.Location = New System.Drawing.Point(10, 77) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(103, 17) Me.Label3.TabIndex = 113 @@ -838,10 +863,10 @@ Partial Class frmATEZ_NCTS 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, 578) + Me.dgvAnhaenge.Location = New System.Drawing.Point(13, 589) Me.dgvAnhaenge.Name = "dgvAnhaenge" Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAnhaenge.Size = New System.Drawing.Size(463, 122) + Me.dgvAnhaenge.Size = New System.Drawing.Size(463, 158) Me.dgvAnhaenge.TabIndex = 112 ' 'columnName @@ -853,7 +878,7 @@ Partial Class frmATEZ_NCTS ' 'Label9 ' - Me.Label9.Location = New System.Drawing.Point(10, 92) + Me.Label9.Location = New System.Drawing.Point(10, 103) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(103, 17) Me.Label9.TabIndex = 110 @@ -873,7 +898,7 @@ Partial Class frmATEZ_NCTS Me.sbAbgangZollstelle.INVISIBLE_COLUMNS = Nothing Me.sbAbgangZollstelle.key_visible = False Me.sbAbgangZollstelle.KEYPARAM = Nothing - Me.sbAbgangZollstelle.Location = New System.Drawing.Point(151, 89) + Me.sbAbgangZollstelle.Location = New System.Drawing.Point(151, 100) Me.sbAbgangZollstelle.Name = "sbAbgangZollstelle" Me.sbAbgangZollstelle.searchActive = True Me.sbAbgangZollstelle.Size = New System.Drawing.Size(196, 20) @@ -926,37 +951,12 @@ Partial Class frmATEZ_NCTS Me.lblBezugsnummer.Text = "4800/000000/17 AAA" Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' - 'Label2 - ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(10, 36) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(52, 13) - Me.Label2.TabIndex = 150 - Me.Label2.Text = "Prozedur:" - Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'cboProzedur - ' - Me.cboProzedur._allowedValuesFreiText = Nothing - Me.cboProzedur._allowFreiText = False - Me.cboProzedur._value = "" - Me.cboProzedur.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.cboProzedur.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboProzedur.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboProzedur.FormattingEnabled = True - Me.cboProzedur.Location = New System.Drawing.Point(151, 33) - Me.cboProzedur.Name = "cboProzedur" - Me.cboProzedur.Size = New System.Drawing.Size(100, 21) - Me.cboProzedur.TabIndex = 149 - ' 'frmATEZ_NCTS ' 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(484, 810) Me.Controls.Add(Me.pnlHead) Me.Controls.Add(Me.Button1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb index 315a92c..418d9ab 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -78,7 +78,6 @@ Public Class frmATEZ_NCTS Try If atez_data.status = "Sent" Then - MsgBox(IIf(atez_data.json <> "", atez_data.json, "")) Exit Sub End If @@ -190,7 +189,6 @@ Public Class frmATEZ_NCTS atezData.status = "Sent" atezData.atezId = IIf(azetId IsNot Nothing, azetId, "") Return atezData.SAVE() - Me.Close() End If End Function @@ -357,7 +355,6 @@ Public Class frmATEZ_NCTS End If - End Sub Sub initAttachment() diff --git a/Aviso/frmDigicust.Designer.vb b/Aviso/frmDigicust.Designer.vb index 5bed4b0..b858e53 100644 --- a/Aviso/frmDigicust.Designer.vb +++ b/Aviso/frmDigicust.Designer.vb @@ -26,44 +26,25 @@ 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.txtDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.dtpDat = New System.Windows.Forms.DateTimePicker() - Me.Label7 = New System.Windows.Forms.Label() - Me.lblC = New System.Windows.Forms.Label() - Me.txtTransporttemp = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxTemperatur = New System.Windows.Forms.CheckBox() - Me.lklRoutenauswahl = New System.Windows.Forms.LinkLabel() - Me.sbRoute5 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.sbRoute9 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.sbRoute8 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.sbRoute7 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.sbRoute6 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.sbRoute4 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.sbRoute3 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.sbRoute2 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.sbRoute1 = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.Label14 = New System.Windows.Forms.Label() 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.Label9 = New System.Windows.Forms.Label() - Me.sbAbgangZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() 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.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.pnlHead.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -98,29 +79,10 @@ Partial Class frmDigicust Me.pnlHead.Controls.Add(Me.cboStammreferenz) Me.pnlHead.Controls.Add(Me.txtLKWId) Me.pnlHead.Controls.Add(Me.usrCntl_Carrier) - Me.pnlHead.Controls.Add(Me.txtDat) - Me.pnlHead.Controls.Add(Me.dtpDat) - Me.pnlHead.Controls.Add(Me.Label7) - Me.pnlHead.Controls.Add(Me.lblC) - Me.pnlHead.Controls.Add(Me.txtTransporttemp) - Me.pnlHead.Controls.Add(Me.cbxTemperatur) - Me.pnlHead.Controls.Add(Me.lklRoutenauswahl) - Me.pnlHead.Controls.Add(Me.sbRoute5) - Me.pnlHead.Controls.Add(Me.sbRoute9) - Me.pnlHead.Controls.Add(Me.sbRoute8) - Me.pnlHead.Controls.Add(Me.sbRoute7) - Me.pnlHead.Controls.Add(Me.sbRoute6) - Me.pnlHead.Controls.Add(Me.sbRoute4) - Me.pnlHead.Controls.Add(Me.sbRoute3) - Me.pnlHead.Controls.Add(Me.sbRoute2) - Me.pnlHead.Controls.Add(Me.sbRoute1) - Me.pnlHead.Controls.Add(Me.Label14) Me.pnlHead.Controls.Add(Me.Label4) Me.pnlHead.Controls.Add(Me.sbBestimmungsZollstelle) Me.pnlHead.Controls.Add(Me.Label3) Me.pnlHead.Controls.Add(Me.dgvAnhaenge) - Me.pnlHead.Controls.Add(Me.Label9) - Me.pnlHead.Controls.Add(Me.sbAbgangZollstelle) Me.pnlHead.Controls.Add(Me.txtDyMandant) Me.pnlHead.Controls.Add(Me.Label1) Me.pnlHead.Controls.Add(Me.txtDyNiederlassung) @@ -130,6 +92,45 @@ Partial Class frmDigicust Me.pnlHead.Size = New System.Drawing.Size(478, 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)) @@ -141,7 +142,7 @@ Partial Class frmDigicust ' 'Label6 ' - Me.Label6.Location = New System.Drawing.Point(10, 562) + Me.Label6.Location = New System.Drawing.Point(10, 373) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(135, 13) Me.Label6.TabIndex = 147 @@ -151,7 +152,7 @@ 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, 179) + Me.Label8.Location = New System.Drawing.Point(283, 156) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(57, 13) Me.Label8.TabIndex = 146 @@ -167,7 +168,7 @@ Partial Class frmDigicust 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, 176) + 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 @@ -187,7 +188,7 @@ Partial Class frmDigicust Me.txtLKWId._Waehrung = False Me.txtLKWId._WaehrungZeichen = True Me.txtLKWId.ForeColor = System.Drawing.Color.Black - Me.txtLKWId.Location = New System.Drawing.Point(151, 177) + Me.txtLKWId.Location = New System.Drawing.Point(151, 154) Me.txtLKWId.MaxLineLength = -1 Me.txtLKWId.MaxLines_Warning = "" Me.txtLKWId.MaxLines_Warning_Label = Nothing @@ -200,347 +201,14 @@ Partial Class frmDigicust 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, 332) + 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 ' - 'txtDat - ' - Me.txtDat._DateTimeOnly = False - Me.txtDat._numbersOnly = False - Me.txtDat._numbersOnlyKommastellen = "" - Me.txtDat._numbersOnlyTrennzeichen = True - Me.txtDat._Prozent = False - Me.txtDat._ShortDateNew = False - Me.txtDat._ShortDateOnly = True - Me.txtDat._TimeOnly = False - Me.txtDat._TimeOnly_Seconds = False - Me.txtDat._value = "" - Me.txtDat._Waehrung = False - Me.txtDat._WaehrungZeichen = True - Me.txtDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) - Me.txtDat.ForeColor = System.Drawing.Color.Black - Me.txtDat.Location = New System.Drawing.Point(151, 251) - Me.txtDat.MaxLength = 10 - Me.txtDat.MaxLineLength = -1 - Me.txtDat.MaxLines_Warning = "" - Me.txtDat.MaxLines_Warning_Label = Nothing - Me.txtDat.Multiline = True - Me.txtDat.Name = "txtDat" - Me.txtDat.Size = New System.Drawing.Size(78, 24) - Me.txtDat.TabIndex = 141 - ' - 'dtpDat - ' - Me.dtpDat.CustomFormat = "''" - Me.dtpDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dtpDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpDat.Location = New System.Drawing.Point(151, 251) - Me.dtpDat.Margin = New System.Windows.Forms.Padding(0) - Me.dtpDat.Name = "dtpDat" - Me.dtpDat.Size = New System.Drawing.Size(110, 24) - Me.dtpDat.TabIndex = 142 - ' - 'Label7 - ' - Me.Label7.Location = New System.Drawing.Point(10, 251) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(103, 17) - Me.Label7.TabIndex = 140 - Me.Label7.Text = "Datumgrenze:" - ' - 'lblC - ' - Me.lblC.AutoSize = True - Me.lblC.Location = New System.Drawing.Point(251, 282) - Me.lblC.Name = "lblC" - Me.lblC.Size = New System.Drawing.Size(18, 13) - Me.lblC.TabIndex = 139 - Me.lblC.Text = "°C" - ' - 'txtTransporttemp - ' - Me.txtTransporttemp._DateTimeOnly = False - Me.txtTransporttemp._numbersOnly = False - Me.txtTransporttemp._numbersOnlyKommastellen = "" - Me.txtTransporttemp._numbersOnlyTrennzeichen = True - Me.txtTransporttemp._Prozent = False - Me.txtTransporttemp._ShortDateNew = False - Me.txtTransporttemp._ShortDateOnly = False - Me.txtTransporttemp._TimeOnly = False - Me.txtTransporttemp._TimeOnly_Seconds = False - Me.txtTransporttemp._value = "" - Me.txtTransporttemp._Waehrung = False - Me.txtTransporttemp._WaehrungZeichen = True - Me.txtTransporttemp.ForeColor = System.Drawing.Color.Black - Me.txtTransporttemp.Location = New System.Drawing.Point(151, 278) - Me.txtTransporttemp.MaxLineLength = -1 - Me.txtTransporttemp.MaxLines_Warning = "" - Me.txtTransporttemp.MaxLines_Warning_Label = Nothing - Me.txtTransporttemp.Name = "txtTransporttemp" - Me.txtTransporttemp.Size = New System.Drawing.Size(100, 20) - Me.txtTransporttemp.TabIndex = 138 - ' - 'cbxTemperatur - ' - Me.cbxTemperatur.AutoSize = True - Me.cbxTemperatur.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxTemperatur.Location = New System.Drawing.Point(13, 278) - Me.cbxTemperatur.Name = "cbxTemperatur" - Me.cbxTemperatur.Size = New System.Drawing.Size(131, 17) - Me.cbxTemperatur.TabIndex = 137 - Me.cbxTemperatur.TabStop = False - Me.cbxTemperatur.Text = "Transport-Temperatur:" - Me.cbxTemperatur.UseVisualStyleBackColor = True - ' - 'lklRoutenauswahl - ' - Me.lklRoutenauswahl.AutoSize = True - Me.lklRoutenauswahl.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.lklRoutenauswahl.Location = New System.Drawing.Point(392, 478) - Me.lklRoutenauswahl.Name = "lklRoutenauswahl" - Me.lklRoutenauswahl.Size = New System.Drawing.Size(81, 13) - Me.lklRoutenauswahl.TabIndex = 117 - Me.lklRoutenauswahl.TabStop = True - Me.lklRoutenauswahl.Text = "Routenauswahl" - ' - 'sbRoute5 - ' - Me.sbRoute5._allowFreitext = False - Me.sbRoute5._AllowSetValue = False - Me.sbRoute5._allowSpaceAsSplitter = False - Me.sbRoute5._autoSizeGross = False - Me.sbRoute5._hideIfListEmpty = True - Me.sbRoute5._value = "" - Me.sbRoute5.conn_art = "FMZOLL" - Me.sbRoute5.dgvpos = "LEFT" - Me.sbRoute5.DISPLAY_PARAM = Nothing - Me.sbRoute5.INVISIBLE_COLUMNS = Nothing - Me.sbRoute5.key_visible = False - Me.sbRoute5.KEYPARAM = Nothing - Me.sbRoute5.Location = New System.Drawing.Point(166, 513) - Me.sbRoute5.Name = "sbRoute5" - Me.sbRoute5.searchActive = True - Me.sbRoute5.Size = New System.Drawing.Size(154, 20) - Me.sbRoute5.SQL_ORDER_BY = Nothing - Me.sbRoute5.SQL_SELECT = Nothing - Me.sbRoute5.SQL_WHERE = Nothing - Me.sbRoute5.SQL_WhereParamList = Nothing - Me.sbRoute5.TabIndex = 122 - Me.sbRoute5.usrcntl = Nothing - ' - 'sbRoute9 - ' - Me.sbRoute9._allowFreitext = False - Me.sbRoute9._AllowSetValue = False - Me.sbRoute9._allowSpaceAsSplitter = False - Me.sbRoute9._autoSizeGross = False - Me.sbRoute9._hideIfListEmpty = True - Me.sbRoute9._value = "" - Me.sbRoute9.conn_art = "FMZOLL" - Me.sbRoute9.dgvpos = "LEFT" - Me.sbRoute9.DISPLAY_PARAM = Nothing - Me.sbRoute9.INVISIBLE_COLUMNS = Nothing - Me.sbRoute9.key_visible = False - Me.sbRoute9.KEYPARAM = Nothing - Me.sbRoute9.Location = New System.Drawing.Point(319, 532) - Me.sbRoute9.Name = "sbRoute9" - Me.sbRoute9.searchActive = True - Me.sbRoute9.Size = New System.Drawing.Size(154, 20) - Me.sbRoute9.SQL_ORDER_BY = Nothing - Me.sbRoute9.SQL_SELECT = Nothing - Me.sbRoute9.SQL_WHERE = Nothing - Me.sbRoute9.SQL_WhereParamList = Nothing - Me.sbRoute9.TabIndex = 126 - Me.sbRoute9.usrcntl = Nothing - ' - 'sbRoute8 - ' - Me.sbRoute8._allowFreitext = False - Me.sbRoute8._AllowSetValue = False - Me.sbRoute8._allowSpaceAsSplitter = False - Me.sbRoute8._autoSizeGross = False - Me.sbRoute8._hideIfListEmpty = True - Me.sbRoute8._value = "" - Me.sbRoute8.conn_art = "FMZOLL" - Me.sbRoute8.dgvpos = "LEFT" - Me.sbRoute8.DISPLAY_PARAM = Nothing - Me.sbRoute8.INVISIBLE_COLUMNS = Nothing - Me.sbRoute8.key_visible = False - Me.sbRoute8.KEYPARAM = Nothing - Me.sbRoute8.Location = New System.Drawing.Point(166, 532) - Me.sbRoute8.Name = "sbRoute8" - Me.sbRoute8.searchActive = True - Me.sbRoute8.Size = New System.Drawing.Size(154, 20) - Me.sbRoute8.SQL_ORDER_BY = Nothing - Me.sbRoute8.SQL_SELECT = Nothing - Me.sbRoute8.SQL_WHERE = Nothing - Me.sbRoute8.SQL_WhereParamList = Nothing - Me.sbRoute8.TabIndex = 125 - Me.sbRoute8.usrcntl = Nothing - ' - 'sbRoute7 - ' - Me.sbRoute7._allowFreitext = False - Me.sbRoute7._AllowSetValue = False - Me.sbRoute7._allowSpaceAsSplitter = False - Me.sbRoute7._autoSizeGross = False - Me.sbRoute7._hideIfListEmpty = True - Me.sbRoute7._value = "" - Me.sbRoute7.conn_art = "FMZOLL" - Me.sbRoute7.dgvpos = "LEFT" - Me.sbRoute7.DISPLAY_PARAM = Nothing - Me.sbRoute7.INVISIBLE_COLUMNS = Nothing - Me.sbRoute7.key_visible = False - Me.sbRoute7.KEYPARAM = Nothing - Me.sbRoute7.Location = New System.Drawing.Point(13, 532) - Me.sbRoute7.Name = "sbRoute7" - Me.sbRoute7.searchActive = True - Me.sbRoute7.Size = New System.Drawing.Size(154, 20) - Me.sbRoute7.SQL_ORDER_BY = Nothing - Me.sbRoute7.SQL_SELECT = Nothing - Me.sbRoute7.SQL_WHERE = Nothing - Me.sbRoute7.SQL_WhereParamList = Nothing - Me.sbRoute7.TabIndex = 124 - Me.sbRoute7.usrcntl = Nothing - ' - 'sbRoute6 - ' - Me.sbRoute6._allowFreitext = False - Me.sbRoute6._AllowSetValue = False - Me.sbRoute6._allowSpaceAsSplitter = False - Me.sbRoute6._autoSizeGross = False - Me.sbRoute6._hideIfListEmpty = True - Me.sbRoute6._value = "" - Me.sbRoute6.conn_art = "FMZOLL" - Me.sbRoute6.dgvpos = "LEFT" - Me.sbRoute6.DISPLAY_PARAM = Nothing - Me.sbRoute6.INVISIBLE_COLUMNS = Nothing - Me.sbRoute6.key_visible = False - Me.sbRoute6.KEYPARAM = Nothing - Me.sbRoute6.Location = New System.Drawing.Point(319, 513) - Me.sbRoute6.Name = "sbRoute6" - Me.sbRoute6.searchActive = True - Me.sbRoute6.Size = New System.Drawing.Size(154, 20) - Me.sbRoute6.SQL_ORDER_BY = Nothing - Me.sbRoute6.SQL_SELECT = Nothing - Me.sbRoute6.SQL_WHERE = Nothing - Me.sbRoute6.SQL_WhereParamList = Nothing - Me.sbRoute6.TabIndex = 123 - Me.sbRoute6.usrcntl = Nothing - ' - 'sbRoute4 - ' - Me.sbRoute4._allowFreitext = False - Me.sbRoute4._AllowSetValue = False - Me.sbRoute4._allowSpaceAsSplitter = False - Me.sbRoute4._autoSizeGross = False - Me.sbRoute4._hideIfListEmpty = True - Me.sbRoute4._value = "" - Me.sbRoute4.conn_art = "FMZOLL" - Me.sbRoute4.dgvpos = "LEFT" - Me.sbRoute4.DISPLAY_PARAM = Nothing - Me.sbRoute4.INVISIBLE_COLUMNS = Nothing - Me.sbRoute4.key_visible = False - Me.sbRoute4.KEYPARAM = Nothing - Me.sbRoute4.Location = New System.Drawing.Point(13, 513) - Me.sbRoute4.Name = "sbRoute4" - Me.sbRoute4.searchActive = True - Me.sbRoute4.Size = New System.Drawing.Size(154, 20) - Me.sbRoute4.SQL_ORDER_BY = Nothing - Me.sbRoute4.SQL_SELECT = Nothing - Me.sbRoute4.SQL_WHERE = Nothing - Me.sbRoute4.SQL_WhereParamList = Nothing - Me.sbRoute4.TabIndex = 121 - Me.sbRoute4.usrcntl = Nothing - ' - 'sbRoute3 - ' - Me.sbRoute3._allowFreitext = False - Me.sbRoute3._AllowSetValue = False - Me.sbRoute3._allowSpaceAsSplitter = False - Me.sbRoute3._autoSizeGross = False - Me.sbRoute3._hideIfListEmpty = True - Me.sbRoute3._value = "" - Me.sbRoute3.conn_art = "FMZOLL" - Me.sbRoute3.dgvpos = "LEFT" - Me.sbRoute3.DISPLAY_PARAM = Nothing - Me.sbRoute3.INVISIBLE_COLUMNS = Nothing - Me.sbRoute3.key_visible = False - Me.sbRoute3.KEYPARAM = Nothing - Me.sbRoute3.Location = New System.Drawing.Point(319, 494) - Me.sbRoute3.Name = "sbRoute3" - Me.sbRoute3.searchActive = True - Me.sbRoute3.Size = New System.Drawing.Size(154, 20) - Me.sbRoute3.SQL_ORDER_BY = Nothing - Me.sbRoute3.SQL_SELECT = Nothing - Me.sbRoute3.SQL_WHERE = Nothing - Me.sbRoute3.SQL_WhereParamList = Nothing - Me.sbRoute3.TabIndex = 120 - Me.sbRoute3.usrcntl = Nothing - ' - 'sbRoute2 - ' - Me.sbRoute2._allowFreitext = False - Me.sbRoute2._AllowSetValue = False - Me.sbRoute2._allowSpaceAsSplitter = False - Me.sbRoute2._autoSizeGross = False - Me.sbRoute2._hideIfListEmpty = True - Me.sbRoute2._value = "" - Me.sbRoute2.conn_art = "FMZOLL" - Me.sbRoute2.dgvpos = "LEFT" - Me.sbRoute2.DISPLAY_PARAM = Nothing - Me.sbRoute2.INVISIBLE_COLUMNS = Nothing - Me.sbRoute2.key_visible = False - Me.sbRoute2.KEYPARAM = Nothing - Me.sbRoute2.Location = New System.Drawing.Point(166, 494) - Me.sbRoute2.Name = "sbRoute2" - Me.sbRoute2.searchActive = True - Me.sbRoute2.Size = New System.Drawing.Size(154, 20) - Me.sbRoute2.SQL_ORDER_BY = Nothing - Me.sbRoute2.SQL_SELECT = Nothing - Me.sbRoute2.SQL_WHERE = Nothing - Me.sbRoute2.SQL_WhereParamList = Nothing - Me.sbRoute2.TabIndex = 119 - Me.sbRoute2.usrcntl = Nothing - ' - 'sbRoute1 - ' - Me.sbRoute1._allowFreitext = False - Me.sbRoute1._AllowSetValue = False - Me.sbRoute1._allowSpaceAsSplitter = False - Me.sbRoute1._autoSizeGross = False - Me.sbRoute1._hideIfListEmpty = True - Me.sbRoute1._value = "" - Me.sbRoute1.conn_art = "FMZOLL" - Me.sbRoute1.dgvpos = "LEFT" - Me.sbRoute1.DISPLAY_PARAM = Nothing - Me.sbRoute1.INVISIBLE_COLUMNS = Nothing - Me.sbRoute1.key_visible = False - Me.sbRoute1.KEYPARAM = Nothing - Me.sbRoute1.Location = New System.Drawing.Point(13, 494) - Me.sbRoute1.Name = "sbRoute1" - Me.sbRoute1.searchActive = True - Me.sbRoute1.Size = New System.Drawing.Size(154, 20) - Me.sbRoute1.SQL_ORDER_BY = Nothing - Me.sbRoute1.SQL_SELECT = Nothing - Me.sbRoute1.SQL_WHERE = Nothing - Me.sbRoute1.SQL_WhereParamList = Nothing - Me.sbRoute1.TabIndex = 118 - Me.sbRoute1.usrcntl = Nothing - ' - 'Label14 - ' - Me.Label14.Location = New System.Drawing.Point(10, 478) - Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(135, 13) - Me.Label14.TabIndex = 116 - Me.Label14.Text = "Route:" - ' 'Label4 ' - Me.Label4.Location = New System.Drawing.Point(10, 229) + Me.Label4.Location = New System.Drawing.Point(10, 180) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(121, 17) Me.Label4.TabIndex = 114 @@ -560,7 +228,7 @@ Partial Class frmDigicust Me.sbBestimmungsZollstelle.INVISIBLE_COLUMNS = Nothing Me.sbBestimmungsZollstelle.key_visible = False Me.sbBestimmungsZollstelle.KEYPARAM = Nothing - Me.sbBestimmungsZollstelle.Location = New System.Drawing.Point(151, 229) + 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) @@ -573,7 +241,7 @@ Partial Class frmDigicust ' 'Label3 ' - Me.Label3.Location = New System.Drawing.Point(10, 180) + Me.Label3.Location = New System.Drawing.Point(10, 157) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(103, 17) Me.Label3.TabIndex = 113 @@ -589,10 +257,10 @@ Partial Class frmDigicust 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, 578) + 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, 122) + Me.dgvAnhaenge.Size = New System.Drawing.Size(463, 299) Me.dgvAnhaenge.TabIndex = 112 ' 'columnName @@ -602,39 +270,6 @@ Partial Class frmDigicust Me.columnName.Name = "columnName" Me.columnName.ReadOnly = True ' - 'Label9 - ' - Me.Label9.Location = New System.Drawing.Point(10, 206) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(103, 17) - Me.Label9.TabIndex = 110 - Me.Label9.Text = "Abgangs-Zollstelle:" - ' - 'sbAbgangZollstelle - ' - Me.sbAbgangZollstelle._allowFreitext = False - Me.sbAbgangZollstelle._AllowSetValue = False - Me.sbAbgangZollstelle._allowSpaceAsSplitter = False - Me.sbAbgangZollstelle._autoSizeGross = False - Me.sbAbgangZollstelle._hideIfListEmpty = True - Me.sbAbgangZollstelle._value = "" - Me.sbAbgangZollstelle.conn_art = "FMZOLL" - Me.sbAbgangZollstelle.dgvpos = "LEFT" - Me.sbAbgangZollstelle.DISPLAY_PARAM = Nothing - Me.sbAbgangZollstelle.INVISIBLE_COLUMNS = Nothing - Me.sbAbgangZollstelle.key_visible = False - Me.sbAbgangZollstelle.KEYPARAM = Nothing - Me.sbAbgangZollstelle.Location = New System.Drawing.Point(151, 203) - Me.sbAbgangZollstelle.Name = "sbAbgangZollstelle" - Me.sbAbgangZollstelle.searchActive = True - Me.sbAbgangZollstelle.Size = New System.Drawing.Size(196, 20) - Me.sbAbgangZollstelle.SQL_ORDER_BY = Nothing - Me.sbAbgangZollstelle.SQL_SELECT = Nothing - Me.sbAbgangZollstelle.SQL_WHERE = Nothing - Me.sbAbgangZollstelle.SQL_WhereParamList = Nothing - Me.sbAbgangZollstelle.TabIndex = 111 - Me.sbAbgangZollstelle.usrcntl = Nothing - ' 'txtDyMandant ' Me.txtDyMandant.BackColor = System.Drawing.Color.White @@ -677,45 +312,6 @@ Partial Class frmDigicust Me.lblBezugsnummer.Text = "4800/000000/17 AAA" Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' - '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 = "" - ' 'frmDigicust ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -742,30 +338,11 @@ Partial Class frmDigicust 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 txtDat As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents dtpDat As DateTimePicker - Friend WithEvents Label7 As Label - Friend WithEvents lblC As Label - Friend WithEvents txtTransporttemp As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents cbxTemperatur As CheckBox - Friend WithEvents lklRoutenauswahl As LinkLabel - Friend WithEvents sbRoute5 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents sbRoute9 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents sbRoute8 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents sbRoute7 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents sbRoute6 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents sbRoute4 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents sbRoute3 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents sbRoute2 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents sbRoute1 As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents Label14 As Label Friend WithEvents Label4 As Label Friend WithEvents sbBestimmungsZollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox Friend WithEvents Label3 As Label Friend WithEvents dgvAnhaenge As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents columnName As DataGridViewTextBoxColumn - Friend WithEvents Label9 As Label - Friend WithEvents sbAbgangZollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox Friend WithEvents txtDyMandant As Label Friend WithEvents Label1 As Label Friend WithEvents txtDyNiederlassung As Label diff --git a/Aviso/frmDigicust.vb b/Aviso/frmDigicust.vb index 11453db..4b8c15b 100644 --- a/Aviso/frmDigicust.vb +++ b/Aviso/frmDigicust.vb @@ -82,11 +82,11 @@ Public Class frmDigicust Try If atez_data.status = "Sent" Then - MsgBox(IIf(atez_data.json <> "", atez_data.json, "")) - Exit Sub + End If If Not checkAttachment() Then + Exit Sub End If @@ -100,41 +100,38 @@ Public Class frmDigicust lblInfo.Text = "" - With atez_data + 'With atez_data - .AvisoId = AVISO.AvisoID - .SendungsId = SENDUNG.tblSnd_SendungID - .VERAG_LRN = lblBezugsnummer.Text - .LicensePlateContainerNo = txtLKWId.Text - .DAKOSY_TemplateCode = cboStammreferenz._value - .DAKOSY_IOPartner = txtDyMandant.Text - .DAKOSY_Division3 = txtDyNiederlassung.Text - .DepartureCustomsOffice = sbAbgangZollstelle._value - .DestinationCustomsOffice = sbBestimmungsZollstelle._value - .DatDeterminationLimit = txtDat.Text - .CoolingTemperature = IIf(cbxTemperatur.Checked, txtTransporttemp.Text, "") - .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 + ' .AvisoId = AVISO.AvisoID + ' .SendungsId = SENDUNG.tblSnd_SendungID + ' .VERAG_LRN = 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 - 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 + ' 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() + ' .SAVE() - End With + 'End With - saveRoute(atez_data) - sendAtezData(atez_data, atez) + + 'sendAtezData(atez_data, atez) Me.Cursor = Cursors.Default @@ -241,7 +238,6 @@ Public Class frmDigicust Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO" End Select - initSeachboxes() initAttachment() 'If openExisting Then @@ -403,43 +399,6 @@ Public Class frmDigicust End Sub - Sub initSeachboxes() - - sbAbgangZollstelle.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"}) - 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"}) - - sbRoute1.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - sbRoute2.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - sbRoute3.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - sbRoute4.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - sbRoute5.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - sbRoute6.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - sbRoute7.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - sbRoute8.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - sbRoute9.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) - End Sub - - Private Sub lklRoutenauswahl_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lklRoutenauswahl.LinkClicked - Dim frmRoutenauswahl As New frmRoutenauswahl - If frmRoutenauswahl.ShowDialog(Me) = DialogResult.OK Then - If frmRoutenauswahl.ROUTE.Count > 0 Then sbRoute1.SET_VALUE(frmRoutenauswahl.ROUTE(0)) Else sbRoute1.SET_VALUE("") - If frmRoutenauswahl.ROUTE.Count > 1 Then sbRoute2.SET_VALUE(frmRoutenauswahl.ROUTE(1)) Else sbRoute2.SET_VALUE("") - If frmRoutenauswahl.ROUTE.Count > 2 Then sbRoute3.SET_VALUE(frmRoutenauswahl.ROUTE(2)) Else sbRoute3.SET_VALUE("") - If frmRoutenauswahl.ROUTE.Count > 3 Then sbRoute4.SET_VALUE(frmRoutenauswahl.ROUTE(3)) Else sbRoute4.SET_VALUE("") - If frmRoutenauswahl.ROUTE.Count > 4 Then sbRoute5.SET_VALUE(frmRoutenauswahl.ROUTE(4)) Else sbRoute5.SET_VALUE("") - If frmRoutenauswahl.ROUTE.Count > 5 Then sbRoute6.SET_VALUE(frmRoutenauswahl.ROUTE(5)) Else sbRoute6.SET_VALUE("") - If frmRoutenauswahl.ROUTE.Count > 6 Then sbRoute7.SET_VALUE(frmRoutenauswahl.ROUTE(6)) Else sbRoute7.SET_VALUE("") - If frmRoutenauswahl.ROUTE.Count > 7 Then sbRoute8.SET_VALUE(frmRoutenauswahl.ROUTE(7)) Else sbRoute8.SET_VALUE("") - If frmRoutenauswahl.ROUTE.Count > 8 Then sbRoute9.SET_VALUE(frmRoutenauswahl.ROUTE(8)) Else sbRoute9.SET_VALUE("") - - End If - End Sub - - Private Sub dtpDat_ValueChanged(sender As Object, e As EventArgs) Handles dtpDat.ValueChanged - txtDat._value = CDate(sender.value).ToShortDateString - End Sub - - Public Function checkAttachment() As Boolean Dim selectedDocuments As Boolean = False @@ -470,43 +429,7 @@ Public Class frmDigicust End Function - Public Sub setRoute() - Dim Route_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen) - VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen.LOAD_LIST_ByNCTS(Route_LIST, id) - - Dim i = 0 - For Each route In Route_LIST - If i = 0 Then sbRoute1.SET_VALUE(route.Route_Country) - If i = 1 Then sbRoute2.SET_VALUE(route.Route_Country) - If i = 2 Then sbRoute3.SET_VALUE(route.Route_Country) - If i = 3 Then sbRoute4.SET_VALUE(route.Route_Country) - If i = 4 Then sbRoute5.SET_VALUE(route.Route_Country) - If i = 5 Then sbRoute6.SET_VALUE(route.Route_Country) - If i = 6 Then sbRoute7.SET_VALUE(route.Route_Country) - If i = 7 Then sbRoute8.SET_VALUE(route.Route_Country) - If i = 8 Then sbRoute9.SET_VALUE(route.Route_Country) - i = i + 1 - Next - - - End Sub - - - - Public Sub saveRoute(atezData As cATEZ_NCTS_DATA) - - - If sbRoute1._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute1._value) - If sbRoute2._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute2._value) - If sbRoute3._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute3._value) - If sbRoute4._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute4._value) - If sbRoute5._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute5._value) - If sbRoute6._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute6._value) - If sbRoute7._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute7._value) - If sbRoute8._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute8._value) - If sbRoute9._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute9._value) - End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click rtfToken.Text = "" diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 0abf23b..5bd6aac 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -24,10 +24,16 @@ Partial Class frmSendungsdetailsNEU Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU)) - 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 DataGridViewCellStyle16 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() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -38,7 +44,6 @@ Partial Class frmSendungsdetailsNEU Me.dgvAnhang = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.btnDirektAnfuegen = New System.Windows.Forms.Button() Me.Panel19 = New System.Windows.Forms.Panel() - Me.Button19 = New System.Windows.Forms.Button() Me.Button17 = New System.Windows.Forms.Button() Me.btnQuckScan = New System.Windows.Forms.Button() Me.Panel21 = New System.Windows.Forms.Panel() @@ -113,6 +118,12 @@ Partial Class frmSendungsdetailsNEU Me.Button7 = New System.Windows.Forms.Button() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.gridVermerke = New System.Windows.Forms.DataGridView() + Me.tbATEZ = New System.Windows.Forms.TabPage() + Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView() + Me.Panel23 = New System.Windows.Forms.Panel() + Me.Button20 = New System.Windows.Forms.Button() + Me.tbDigicust = New System.Windows.Forms.TabPage() + Me.Button19 = New System.Windows.Forms.Button() Me.Panel14 = New System.Windows.Forms.Panel() Me.pnlDetails = New System.Windows.Forms.Panel() Me.tbcntr = New System.Windows.Forms.TabControl() @@ -415,9 +426,8 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem() Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.cntxAPI = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.ATEZToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DigicustToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.dgvDigicust = New System.Windows.Forms.DataGridView() + Me.Panel24 = New System.Windows.Forms.Panel() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -439,6 +449,10 @@ Partial Class frmSendungsdetailsNEU Me.pnlSpedBuchNacherfassung.SuspendLayout() Me.TabPage3.SuspendLayout() CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbATEZ.SuspendLayout() + CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel23.SuspendLayout() + Me.tbDigicust.SuspendLayout() Me.pnlDetails.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage4.SuspendLayout() @@ -477,7 +491,8 @@ Partial Class frmSendungsdetailsNEU Me.ctxtWeitereFormulare.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout() - Me.cntxAPI.SuspendLayout() + CType(Me.dgvDigicust, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel24.SuspendLayout() Me.SuspendLayout() ' 'pnl @@ -512,6 +527,8 @@ Partial Class frmSendungsdetailsNEU Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage2) Me.TabControl1.Controls.Add(Me.TabPage3) + Me.TabControl1.Controls.Add(Me.tbATEZ) + Me.TabControl1.Controls.Add(Me.tbDigicust) Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.TabControl1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.TabControl1.Location = New System.Drawing.Point(0, 3) @@ -601,7 +618,6 @@ Partial Class frmSendungsdetailsNEU ' 'Panel19 ' - Me.Panel19.Controls.Add(Me.Button19) Me.Panel19.Controls.Add(Me.Button17) Me.Panel19.Controls.Add(Me.btnQuckScan) Me.Panel19.Controls.Add(Me.Panel21) @@ -616,28 +632,13 @@ Partial Class frmSendungsdetailsNEU Me.Panel19.Size = New System.Drawing.Size(1206, 45) Me.Panel19.TabIndex = 0 ' - 'Button19 - ' - Me.Button19.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button19.Image = Global.AVISO.My.Resources.Resources.spedbuch_small - Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button19.Location = New System.Drawing.Point(121, 5) - Me.Button19.Name = "Button19" - Me.Button19.Size = New System.Drawing.Size(72, 34) - Me.Button19.TabIndex = 8 - Me.Button19.Text = "API" - Me.Button19.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button19.UseVisualStyleBackColor = True - Me.Button19.Visible = False - ' 'Button17 ' Me.Button17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button17.Image = Global.AVISO.My.Resources.Resources.spedbuch_small Me.Button17.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button17.Location = New System.Drawing.Point(746, 5) + Me.Button17.Location = New System.Drawing.Point(724, 5) Me.Button17.Name = "Button17" Me.Button17.Size = New System.Drawing.Size(76, 34) Me.Button17.TabIndex = 5 @@ -651,7 +652,7 @@ Partial Class frmSendungsdetailsNEU Me.btnQuckScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnQuckScan.Image = CType(resources.GetObject("btnQuckScan.Image"), System.Drawing.Image) Me.btnQuckScan.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnQuckScan.Location = New System.Drawing.Point(633, 5) + Me.btnQuckScan.Location = New System.Drawing.Point(595, 5) Me.btnQuckScan.Name = "btnQuckScan" Me.btnQuckScan.Size = New System.Drawing.Size(107, 34) Me.btnQuckScan.TabIndex = 4 @@ -758,7 +759,7 @@ Partial Class frmSendungsdetailsNEU Me.btnPDFZusammenfueren.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnPDFZusammenfueren.Image = Global.AVISO.My.Resources.Resources.pdf11 Me.btnPDFZusammenfueren.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnPDFZusammenfueren.Location = New System.Drawing.Point(199, 5) + Me.btnPDFZusammenfueren.Location = New System.Drawing.Point(159, 5) Me.btnPDFZusammenfueren.Name = "btnPDFZusammenfueren" Me.btnPDFZusammenfueren.Size = New System.Drawing.Size(153, 34) Me.btnPDFZusammenfueren.TabIndex = 1 @@ -771,7 +772,7 @@ Partial Class frmSendungsdetailsNEU Me.btnMailVorlage.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnMailVorlage.Image = Global.AVISO.My.Resources.Resources.email_big1 Me.btnMailVorlage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMailVorlage.Location = New System.Drawing.Point(361, 5) + Me.btnMailVorlage.Location = New System.Drawing.Point(321, 5) Me.btnMailVorlage.Name = "btnMailVorlage" Me.btnMailVorlage.Padding = New System.Windows.Forms.Padding(0, 0, 20, 0) Me.btnMailVorlage.Size = New System.Drawing.Size(134, 34) @@ -785,10 +786,10 @@ Partial Class frmSendungsdetailsNEU Me.btnOptionen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOptionen.Image = CType(resources.GetObject("btnOptionen.Image"), System.Drawing.Image) Me.btnOptionen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnOptionen.Location = New System.Drawing.Point(828, 5) + Me.btnOptionen.Location = New System.Drawing.Point(805, 5) Me.btnOptionen.Name = "btnOptionen" Me.btnOptionen.Padding = New System.Windows.Forms.Padding(0, 0, 20, 0) - Me.btnOptionen.Size = New System.Drawing.Size(106, 34) + Me.btnOptionen.Size = New System.Drawing.Size(129, 34) Me.btnOptionen.TabIndex = 6 Me.btnOptionen.Text = "Optionen" Me.btnOptionen.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -799,7 +800,7 @@ Partial Class frmSendungsdetailsNEU Me.btnImportAssi.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnImportAssi.Image = CType(resources.GetObject("btnImportAssi.Image"), System.Drawing.Image) Me.btnImportAssi.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnImportAssi.Location = New System.Drawing.Point(501, 5) + Me.btnImportAssi.Location = New System.Drawing.Point(461, 5) Me.btnImportAssi.Name = "btnImportAssi" Me.btnImportAssi.Size = New System.Drawing.Size(129, 34) Me.btnImportAssi.TabIndex = 3 @@ -1492,18 +1493,18 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle13.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle14.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 0) @@ -1512,8 +1513,8 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.ReadOnly = True Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle3 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1524,6 +1525,105 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.TabIndex = 0 Me.gridVermerke.TabStop = False ' + 'tbATEZ + ' + Me.tbATEZ.Controls.Add(Me.dgvATEZNCTS) + Me.tbATEZ.Controls.Add(Me.Panel23) + Me.tbATEZ.Location = New System.Drawing.Point(4, 29) + Me.tbATEZ.Name = "tbATEZ" + Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3) + Me.tbATEZ.Size = New System.Drawing.Size(1206, 288) + Me.tbATEZ.TabIndex = 6 + Me.tbATEZ.Text = "ATEZ" + Me.tbATEZ.UseVisualStyleBackColor = True + ' + 'dgvATEZNCTS + ' + Me.dgvATEZNCTS.AllowUserToAddRows = False + Me.dgvATEZNCTS.AllowUserToDeleteRows = False + Me.dgvATEZNCTS.AllowUserToResizeRows = False + DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + Me.dgvATEZNCTS.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 + Me.dgvATEZNCTS.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing + Me.dgvATEZNCTS.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvATEZNCTS.Location = New System.Drawing.Point(3, 48) + Me.dgvATEZNCTS.MultiSelect = False + Me.dgvATEZNCTS.Name = "dgvATEZNCTS" + Me.dgvATEZNCTS.ReadOnly = True + Me.dgvATEZNCTS.RowHeadersVisible = False + Me.dgvATEZNCTS.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle6 + Me.dgvATEZNCTS.RowTemplate.Height = 20 + Me.dgvATEZNCTS.RowTemplate.ReadOnly = True + Me.dgvATEZNCTS.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvATEZNCTS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvATEZNCTS.ShowCellErrors = False + Me.dgvATEZNCTS.ShowRowErrors = False + Me.dgvATEZNCTS.Size = New System.Drawing.Size(1200, 237) + Me.dgvATEZNCTS.TabIndex = 105 + Me.dgvATEZNCTS.TabStop = False + ' + 'Panel23 + ' + Me.Panel23.Controls.Add(Me.Button20) + Me.Panel23.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel23.Location = New System.Drawing.Point(3, 3) + Me.Panel23.Name = "Panel23" + Me.Panel23.Size = New System.Drawing.Size(1200, 45) + Me.Panel23.TabIndex = 106 + ' + 'Button20 + ' + Me.Button20.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button20.Image = Global.AVISO.My.Resources.Resources.plus + Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button20.Location = New System.Drawing.Point(3, 8) + Me.Button20.Name = "Button20" + Me.Button20.Size = New System.Drawing.Size(136, 34) + Me.Button20.TabIndex = 8 + Me.Button20.Text = "ATEZ-NCTS" + Me.Button20.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button20.UseVisualStyleBackColor = True + Me.Button20.Visible = False + ' + 'tbDigicust + ' + Me.tbDigicust.Controls.Add(Me.dgvDigicust) + Me.tbDigicust.Controls.Add(Me.Panel24) + Me.tbDigicust.Location = New System.Drawing.Point(4, 29) + Me.tbDigicust.Name = "tbDigicust" + Me.tbDigicust.Size = New System.Drawing.Size(1206, 288) + Me.tbDigicust.TabIndex = 7 + Me.tbDigicust.Text = "Digicust" + Me.tbDigicust.UseVisualStyleBackColor = True + ' + 'Button19 + ' + Me.Button19.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button19.Image = Global.AVISO.My.Resources.Resources.plus + Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button19.Location = New System.Drawing.Point(5, 8) + Me.Button19.Name = "Button19" + Me.Button19.Size = New System.Drawing.Size(104, 34) + Me.Button19.TabIndex = 9 + Me.Button19.Text = "Digicust" + Me.Button19.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button19.UseVisualStyleBackColor = True + Me.Button19.Visible = False + ' 'Panel14 ' Me.Panel14.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) @@ -2258,8 +2358,8 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle16.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle10.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle10 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 Me.clmnPreis.Name = "clmnPreis" @@ -4809,7 +4909,7 @@ Partial Class frmSendungsdetailsNEU Me.cntxtAnh.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtAnh.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MarkiertePDFsDruckenToolStripMenuItem, Me.EMailAnfügenToolStripMenuItem, Me.KopierenZwischenablageToolStripMenuItem, Me.LaufzetteldruckJANEINToolStripMenuItem, Me.GestellungslisteAnfügenJANEINToolStripMenuItem, Me.AbrechungFremdeGrenzeAktDruckenToolStripMenuItem, Me.HervorhebenToolStripMenuItem}) Me.cntxtAnh.Name = "cntxtAnh" - Me.cntxtAnh.Size = New System.Drawing.Size(294, 236) + Me.cntxtAnh.Size = New System.Drawing.Size(294, 214) ' 'MarkiertePDFsDruckenToolStripMenuItem ' @@ -5351,23 +5451,51 @@ Partial Class frmSendungsdetailsNEU Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30) Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen" ' - 'cntxAPI + 'dgvDigicust ' - Me.cntxAPI.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATEZToolStripMenuItem, Me.DigicustToolStripMenuItem}) - Me.cntxAPI.Name = "cntxAPI" - Me.cntxAPI.Size = New System.Drawing.Size(118, 48) + Me.dgvDigicust.AllowUserToAddRows = False + Me.dgvDigicust.AllowUserToDeleteRows = False + Me.dgvDigicust.AllowUserToResizeRows = False + DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 + Me.dgvDigicust.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8 + Me.dgvDigicust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing + Me.dgvDigicust.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvDigicust.Location = New System.Drawing.Point(0, 45) + Me.dgvDigicust.MultiSelect = False + Me.dgvDigicust.Name = "dgvDigicust" + Me.dgvDigicust.ReadOnly = True + Me.dgvDigicust.RowHeadersVisible = False + Me.dgvDigicust.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle9 + Me.dgvDigicust.RowTemplate.Height = 20 + Me.dgvDigicust.RowTemplate.ReadOnly = True + Me.dgvDigicust.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvDigicust.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvDigicust.ShowCellErrors = False + Me.dgvDigicust.ShowRowErrors = False + Me.dgvDigicust.Size = New System.Drawing.Size(1206, 243) + Me.dgvDigicust.TabIndex = 107 + Me.dgvDigicust.TabStop = False ' - 'ATEZToolStripMenuItem + 'Panel24 ' - Me.ATEZToolStripMenuItem.Name = "ATEZToolStripMenuItem" - Me.ATEZToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.ATEZToolStripMenuItem.Text = "ATEZ" - ' - 'DigicustToolStripMenuItem - ' - Me.DigicustToolStripMenuItem.Name = "DigicustToolStripMenuItem" - Me.DigicustToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.DigicustToolStripMenuItem.Text = "Digicust" + Me.Panel24.Controls.Add(Me.Button19) + Me.Panel24.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel24.Location = New System.Drawing.Point(0, 0) + Me.Panel24.Name = "Panel24" + Me.Panel24.Size = New System.Drawing.Size(1206, 45) + Me.Panel24.TabIndex = 108 ' 'frmSendungsdetailsNEU ' @@ -5413,6 +5541,10 @@ Partial Class frmSendungsdetailsNEU Me.pnlSpedBuchNacherfassung.PerformLayout() Me.TabPage3.ResumeLayout(False) CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).EndInit() + Me.tbATEZ.ResumeLayout(False) + CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel23.ResumeLayout(False) + Me.tbDigicust.ResumeLayout(False) Me.pnlDetails.ResumeLayout(False) Me.tbcntr.ResumeLayout(False) Me.TabPage4.ResumeLayout(False) @@ -5463,7 +5595,8 @@ Partial Class frmSendungsdetailsNEU Me.ctxtWeitereFormulare.ResumeLayout(False) Me.ContextMenuStrip1.ResumeLayout(False) Me.ContextMenuStrip2.ResumeLayout(False) - Me.cntxAPI.ResumeLayout(False) + CType(Me.dgvDigicust, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel24.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -5851,11 +5984,15 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents ToolStripMenuItem28 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem29 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem30 As ToolStripMenuItem - Friend WithEvents Button19 As Button Friend WithEvents AntragQualitätskontrolleToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripMenuItem31 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem32 As ToolStripMenuItem - Friend WithEvents cntxAPI As ContextMenuStrip - Friend WithEvents ATEZToolStripMenuItem As ToolStripMenuItem - Friend WithEvents DigicustToolStripMenuItem As ToolStripMenuItem + Friend WithEvents tbATEZ As TabPage + Friend WithEvents dgvATEZNCTS As DataGridView + Friend WithEvents Panel23 As Panel + Friend WithEvents Button20 As Button + Friend WithEvents tbDigicust As TabPage + Friend WithEvents Button19 As Button + Friend WithEvents dgvDigicust As DataGridView + Friend WithEvents Panel24 As Panel End Class diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index 2f2e7c6..eb3d52e 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -1531,9 +1531,6 @@ mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg== - - 296, 17 - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V @@ -1654,18 +1651,6 @@ True - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAHtJREFUSEvt @@ -2074,9 +2059,6 @@ 174, 17 - - 404, 17 - 596, 17 @@ -2526,9 +2508,6 @@ fjuTNv9i/tQzLEixxaJZiCHx/5vo8E9z4BWUwHZVTQAAAABJRU5ErkJggg== - - 49, 41 - AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 58b1ad0..8441e1c 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -411,6 +411,10 @@ Public Class frmSendungsdetailsNEU Button20.Visible = True End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DIGICUST", Me) Then + Button19.Visible = True + End If + cboFiliale._allowFreiText = Nothing Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER @@ -3069,6 +3073,8 @@ Public Class frmSendungsdetailsNEU initAnhang() ElseIf TabControl1.SelectedTab Is tbKundenInfo Then initdgvATEZ() + ElseIf TabControl1.SelectedTab Is tbDigicust Then + initdgvDigicust() ElseIf TabControl1.SelectedTab Is tbKundenInfo Then Dim kdSrc As VERAG_PROG_ALLGEMEIN.KdSearchBox = txtAuftraggeber If kdSrc.KdNr_value <= 0 Then kdSrc = txtEmpfaenger @@ -3973,9 +3979,9 @@ Public Class frmSendungsdetailsNEU Next End Sub - Private Sub Button20_Click(sender As Object, e As EventArgs) Handles btnOptionen.Click - cntxtAnh.Show(Cursor.Position) - End Sub + 'Private Sub Button20_Click(sender As Object, e As EventArgs) Handles btnOptionen.Click + ' cntxtAnh.Show(Cursor.Position) + 'End Sub Private Sub KopierenZwischenablageToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KopierenZwischenablageToolStripMenuItem.Click If dgvAnhang.SelectedRows.Count >= 1 Then @@ -6278,28 +6284,24 @@ Public Class frmSendungsdetailsNEU Me.Cursor = Cursors.Default End Sub - Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click - SAVE_ME() + 'Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click + ' SAVE_ME() - cntxAPI.Show(Cursor.Position) - Try - If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then - Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) - Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy")) - frmAttilaATEZNCTS.Show(Me) - End If + ' cntxAPI.Show(Cursor.Position) + ' Try + ' If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then + ' Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) + ' Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy")) + ' frmAttilaATEZNCTS.Show(Me) + ' End If - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try - Me.Cursor = Cursors.Default + ' Catch ex As Exception + ' MsgBox(ex.Message & ex.StackTrace) + ' End Try + ' Me.Cursor = Cursors.Default - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try - - End Sub + 'End Sub Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click SAVE_ME() @@ -6307,8 +6309,9 @@ Public Class frmSendungsdetailsNEU Try If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) - Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy")) + Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"), dgvATEZNCTS) frmAttilaATEZNCTS.Show(Me) + initdgvATEZ() End If Catch ex As Exception @@ -6316,48 +6319,48 @@ Public Class frmSendungsdetailsNEU End Try Me.Cursor = Cursors.Default - SAVE_ME() - If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub - Dim frMZA As New SDL.frmZollanmeldung("T1", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"), "MODALTRANS") - frMZA.Show() - AddHandler frMZA.FormClosed, Sub() - initdgvZollAnmeldungen() - End Sub + 'SAVE_ME() + 'If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub + 'Dim frMZA As New SDL.frmZollanmeldung("T1", Nothing, AVISO, SENDUNG_LIST(CURRENT_INDEX), Now.ToString("yy"), "MODALTRANS") + 'frMZA.Show() + 'AddHandler frMZA.FormClosed, Sub() + ' initdgvZollAnmeldungen() + ' End Sub End Sub - Private Sub ATEZToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATEZToolStripMenuItem.Click - Try - If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then - Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) - Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy")) - frmAttilaATEZNCTS.Show(Me) - End If + 'Private Sub ATEZToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATEZToolStripMenuItem.Click + ' Try + ' If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then + ' Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) + ' Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy")) + ' frmAttilaATEZNCTS.Show(Me) + ' End If - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try - Me.Cursor = Cursors.Default + ' Catch ex As Exception + ' MsgBox(ex.Message & ex.StackTrace) + ' End Try + ' Me.Cursor = Cursors.Default - End Sub + 'End Sub - Private Sub DigicustToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DigicustToolStripMenuItem.Click - Try - If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then - If AVISO.ImEx.ToLower() <> "import" Then - MsgBox("API unterstützt nur Importe!" & vbNewLine & "Aktenübersicht-Einstellungen kontrollieren") - Exit Sub - End If - Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) - Dim frm = New frmDigicust(AVISO, SND, Now.ToString("yy")) - frm.Show(Me) - End If + 'Private Sub DigicustToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DigicustToolStripMenuItem.Click + ' Try + ' If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then + ' If AVISO.ImEx.ToLower() <> "import" Then + ' MsgBox("API unterstützt nur Importe!" & vbNewLine & "Aktenübersicht-Einstellungen kontrollieren") + ' Exit Sub + ' End If + ' Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) + ' Dim frm = New frmDigicust(AVISO, SND, Now.ToString("yy")) + ' frm.Show(Me) + ' End If - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try - Me.Cursor = Cursors.Default - End Sub + ' Catch ex As Exception + ' MsgBox(ex.Message & ex.StackTrace) + ' End Try + ' Me.Cursor = Cursors.Default + 'End Sub Sub initdgvATEZ() With dgvATEZNCTS @@ -6390,16 +6393,71 @@ Public Class frmSendungsdetailsNEU Private Sub dgvATEZNCTS_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvATEZNCTS.CellDoubleClick Try + Me.Cursor = Cursors.WaitCursor + If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then - Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) - Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy")) + Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0) + + Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value, AVISO, SND, Now.ToString("yy")) frmAttilaATEZNCTS.Show(Me) + Me.Refresh() End If + Cursor = Cursors.Default + Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try End Sub + + Private Sub dgvATEZNCTS_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvATEZNCTS.KeyUp + If e.KeyCode = Keys.Delete Then + If dgvATEZNCTS.SelectedRows.Count > 0 AndAlso dgvATEZNCTS.SelectedRows(0).Cells("Status").Value <> "Sent" Then + If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then + Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value) + atez.delete() + initdgvATEZ() + End If + End If + End If + End Sub + + Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click + Try + If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then + Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) + Dim frm = New frmDigicust(AVISO, SND, Now.ToString("yy"), dgvATEZNCTS) + frm.Show(Me) + End If + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + Me.Cursor = Cursors.Default + End Sub + + + Sub initdgvDigicust() + With dgvDigicust + .Columns.Clear() + .ReadOnly = False + .DataSource = SQL.loadDgvBySql("select * FROM [tblDigicust_Sessions]", "FMZOLL") + If .Columns.Count <= 0 Then Exit Sub + 'Ä.Columns("txtStatus").ReadOnly = False + .Columns("session_Id").Visible = True + + .Columns("token").HeaderText = "Token" + .Columns("token").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + .Columns("datetime").HeaderText = "Erstellt" + .Columns("datetime").Width = 100 + .Columns("datetime").DefaultCellStyle.Format = "dd.MM.yy HH:mm" + .Columns("datetime").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + + .ReadOnly = False + End With + + End Sub End Class diff --git a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb index ee09062..145cdf6 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb @@ -54,7 +54,6 @@ Partial Class usrcntlAktDetailsATILLANeu Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.tbcntr = New System.Windows.Forms.TabControl() Me.tbVermerke = New System.Windows.Forms.TabPage() - Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla() Me.tbZollanmeldungen = New System.Windows.Forms.TabPage() Me.Panel1 = New System.Windows.Forms.Panel() Me.dgvZollAnmeldungen = New System.Windows.Forms.DataGridView() @@ -157,6 +156,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AusZwischenablageEinfügenPasteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla() Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -276,17 +276,6 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbVermerke.Text = "Vermerk eintragen" Me.tbVermerke.UseVisualStyleBackColor = True ' - 'UsrCntlVermerkeATilla1 - ' - Me.UsrCntlVermerkeATilla1.AutoScroll = True - Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control - Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1" - Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151) - Me.UsrCntlVermerkeATilla1.TabIndex = 0 - ' 'tbZollanmeldungen ' Me.tbZollanmeldungen.Controls.Add(Me.Panel1) @@ -1736,6 +1725,17 @@ Partial Class usrcntlAktDetailsATILLANeu Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30) Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)" ' + 'UsrCntlVermerkeATilla1 + ' + Me.UsrCntlVermerkeATilla1.AutoScroll = True + Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control + Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1" + Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151) + Me.UsrCntlVermerkeATilla1.TabIndex = 0 + ' 'usrcntlAktDetailsATILLANeu ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 72d74bd..ec95b37 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -1687,4 +1687,15 @@ Public Class usrcntlAktDetailsATILLANeu End Sub + Private Sub dgvATEZNCTS_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvATEZNCTS.KeyUp + If e.KeyCode = Keys.Delete Then + If dgvATEZNCTS.SelectedRows.Count > 0 AndAlso dgvATEZNCTS.SelectedRows(0).Cells("Status").Value <> "Sent" Then + If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then + Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value) + atez.delete() + initdgvATEZ() + End If + End If + End If + End Sub End Class