diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index 6328e7b..1fe3997 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -6188,8 +6188,8 @@ Public Class frmDYNachrichtenVerarbeitung End If 'Wenn TEAM nicht gefunden, Firma... - If EZA_TMP IsNot Nothing AndAlso EZA_TMP.eza_firma IsNot Nothing AndAlso EZA_TMP.eza_firma <> "" Then - If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then + If sendToID <= 0 Then + If EZA_TMP IsNot Nothing AndAlso EZA_TMP.eza_firma IsNot Nothing AndAlso EZA_TMP.eza_firma <> "" Then sendToID = EZA_TMP.eza_firma art = "F" End If @@ -6242,8 +6242,8 @@ Public Class frmDYNachrichtenVerarbeitung End If 'Wenn TEAM nicht gefunden, Firma... - If EZA_TMP IsNot Nothing AndAlso EZA_TMP.eza_firma IsNot Nothing AndAlso EZA_TMP.eza_firma <> "" Then - If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then + If sendToID <= 0 Then + If EZA_TMP IsNot Nothing AndAlso EZA_TMP.eza_firma IsNot Nothing AndAlso EZA_TMP.eza_firma <> "" Then sendToID = EZA_TMP.eza_firma art = "F" End If @@ -6305,8 +6305,8 @@ Public Class frmDYNachrichtenVerarbeitung End If 'Wenn TEAM nicht gefunden, Firma... - If EZA_TMP IsNot Nothing AndAlso EZA_TMP.eza_firma IsNot Nothing AndAlso EZA_TMP.eza_firma <> "" Then - If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then + If sendToID <= 0 Then + If EZA_TMP IsNot Nothing AndAlso EZA_TMP.eza_firma IsNot Nothing AndAlso EZA_TMP.eza_firma <> "" Then sendToID = EZA_TMP.eza_firma art = "F" End If diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index c4adf14..86f2ed7 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -45,6 +45,7 @@ Partial Class frmStartOptions Me.cbxSyskaWdh = New System.Windows.Forms.CheckBox() Me.txtSyskaWdhDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button10 = New System.Windows.Forms.Button() + Me.piceZollAnh = New System.Windows.Forms.PictureBox() Me.txtEZOLLAnhDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblEZOLLDat = New System.Windows.Forms.LinkLabel() Me.Button6 = New System.Windows.Forms.Button() @@ -65,12 +66,21 @@ Partial Class frmStartOptions Me.CheckBox3 = New System.Windows.Forms.CheckBox() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.Button20 = New System.Windows.Forms.Button() + Me.Button19 = New System.Windows.Forms.Button() + Me.Label23 = New System.Windows.Forms.Label() + Me.Button18 = New System.Windows.Forms.Button() + Me.Button17 = New System.Windows.Forms.Button() Me.LinkLabel38 = New System.Windows.Forms.LinkLabel() + Me.PictureBox17 = New System.Windows.Forms.PictureBox() Me.LinkLabel37 = New System.Windows.Forms.LinkLabel() + Me.PictureBox16 = New System.Windows.Forms.PictureBox() Me.Button15 = New System.Windows.Forms.Button() Me.Button8 = New System.Windows.Forms.Button() Me.LinkLabel28 = New System.Windows.Forms.LinkLabel() Me.LinkLabel4 = New System.Windows.Forms.LinkLabel() + Me.PictureBox13 = New System.Windows.Forms.PictureBox() + Me.picC0008 = New System.Windows.Forms.PictureBox() Me.LinkLabel26 = New System.Windows.Forms.LinkLabel() Me.Label2 = New System.Windows.Forms.Label() Me.LinkLabel5 = New System.Windows.Forms.LinkLabel() @@ -78,20 +88,28 @@ Partial Class frmStartOptions Me.LinkLabel23 = New System.Windows.Forms.LinkLabel() Me.LinkLabel7 = New System.Windows.Forms.LinkLabel() Me.LinkLabel24 = New System.Windows.Forms.LinkLabel() + Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.Label5 = New System.Windows.Forms.Label() Me.LinkLabel8 = New System.Windows.Forms.LinkLabel() Me.LinkLabel21 = New System.Windows.Forms.LinkLabel() + Me.PictureBox2 = New System.Windows.Forms.PictureBox() Me.LinkLabel22 = New System.Windows.Forms.LinkLabel() Me.LinkLabel9 = New System.Windows.Forms.LinkLabel() Me.Label4 = New System.Windows.Forms.Label() Me.LinkLabel10 = New System.Windows.Forms.LinkLabel() Me.Label1 = New System.Windows.Forms.Label() + Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.LinkLabel11 = New System.Windows.Forms.LinkLabel() + Me.PictureBox4 = New System.Windows.Forms.PictureBox() Me.LinkLabel12 = New System.Windows.Forms.LinkLabel() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.LinkLabel13 = New System.Windows.Forms.LinkLabel() + Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.LinkLabel14 = New System.Windows.Forms.LinkLabel() + Me.PictureBox7 = New System.Windows.Forms.PictureBox() Me.LinkLabel15 = New System.Windows.Forms.LinkLabel() Me.LinkLabel16 = New System.Windows.Forms.LinkLabel() + Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.Button11 = New System.Windows.Forms.Button() Me.Label15 = New System.Windows.Forms.Label() @@ -121,6 +139,8 @@ Partial Class frmStartOptions Me.txtVRGOutEZA_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.PictureBox15 = New System.Windows.Forms.PictureBox() + Me.PictureBox14 = New System.Windows.Forms.PictureBox() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.LinkLabel39 = New System.Windows.Forms.LinkLabel() Me.LinkLabel40 = New System.Windows.Forms.LinkLabel() @@ -141,9 +161,13 @@ Partial Class frmStartOptions Me.Button9 = New System.Windows.Forms.Button() Me.Label3 = New System.Windows.Forms.Label() Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.PictureBox12 = New System.Windows.Forms.PictureBox() Me.LinkLabel20 = New System.Windows.Forms.LinkLabel() + Me.PictureBox11 = New System.Windows.Forms.PictureBox() Me.LinkLabel19 = New System.Windows.Forms.LinkLabel() + Me.PictureBox10 = New System.Windows.Forms.PictureBox() Me.LinkLabel18 = New System.Windows.Forms.LinkLabel() + Me.PictureBox9 = New System.Windows.Forms.PictureBox() Me.LinkLabel17 = New System.Windows.Forms.LinkLabel() Me.cbxHistory = New System.Windows.Forms.CheckBox() Me.btn = New System.Windows.Forms.Button() @@ -153,33 +177,11 @@ Partial Class frmStartOptions Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Button17 = New System.Windows.Forms.Button() - Me.piceZollAnh = New System.Windows.Forms.PictureBox() - Me.PictureBox17 = New System.Windows.Forms.PictureBox() - Me.PictureBox16 = New System.Windows.Forms.PictureBox() - Me.PictureBox13 = New System.Windows.Forms.PictureBox() - Me.picC0008 = New System.Windows.Forms.PictureBox() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.PictureBox2 = New System.Windows.Forms.PictureBox() - Me.PictureBox3 = New System.Windows.Forms.PictureBox() - Me.PictureBox4 = New System.Windows.Forms.PictureBox() - Me.PictureBox5 = New System.Windows.Forms.PictureBox() - Me.PictureBox6 = New System.Windows.Forms.PictureBox() - Me.PictureBox7 = New System.Windows.Forms.PictureBox() - Me.PictureBox8 = New System.Windows.Forms.PictureBox() - Me.PictureBox15 = New System.Windows.Forms.PictureBox() - Me.PictureBox14 = New System.Windows.Forms.PictureBox() - Me.PictureBox12 = New System.Windows.Forms.PictureBox() - Me.PictureBox11 = New System.Windows.Forms.PictureBox() - Me.PictureBox10 = New System.Windows.Forms.PictureBox() - Me.PictureBox9 = New System.Windows.Forms.PictureBox() + Me.Button21 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() + CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() - Me.TabPage2.SuspendLayout() - CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TabPage3.SuspendLayout() - CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox17, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox16, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox13, System.ComponentModel.ISupportInitialize).BeginInit() @@ -192,8 +194,11 @@ Partial Class frmStartOptions CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabPage2.SuspendLayout() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabPage3.SuspendLayout() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() @@ -524,6 +529,17 @@ Partial Class frmStartOptions Me.Button10.UseVisualStyleBackColor = True Me.Button10.Visible = False ' + 'piceZollAnh + ' + Me.piceZollAnh.BackgroundImage = CType(resources.GetObject("piceZollAnh.BackgroundImage"), System.Drawing.Image) + Me.piceZollAnh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.piceZollAnh.Location = New System.Drawing.Point(500, 190) + Me.piceZollAnh.Name = "piceZollAnh" + Me.piceZollAnh.Size = New System.Drawing.Size(18, 18) + Me.piceZollAnh.TabIndex = 56 + Me.piceZollAnh.TabStop = False + Me.piceZollAnh.Visible = False + ' 'txtEZOLLAnhDat ' Me.txtEZOLLAnhDat._DateTimeOnly = False @@ -755,6 +771,11 @@ Partial Class frmStartOptions ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.Button21) + Me.TabPage1.Controls.Add(Me.Button20) + Me.TabPage1.Controls.Add(Me.Button19) + Me.TabPage1.Controls.Add(Me.Label23) + Me.TabPage1.Controls.Add(Me.Button18) Me.TabPage1.Controls.Add(Me.Button17) Me.TabPage1.Controls.Add(Me.LinkLabel38) Me.TabPage1.Controls.Add(Me.PictureBox17) @@ -803,6 +824,65 @@ Partial Class frmStartOptions Me.TabPage1.Text = "Zollverfahren" Me.TabPage1.UseVisualStyleBackColor = True ' + 'Button20 + ' + Me.Button20.Enabled = False + Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button20.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button20.Location = New System.Drawing.Point(581, 323) + Me.Button20.Name = "Button20" + Me.Button20.Size = New System.Drawing.Size(211, 24) + Me.Button20.TabIndex = 80 + Me.Button20.Text = "xxx AAS Ankunft 4h" + Me.Button20.UseVisualStyleBackColor = True + ' + 'Button19 + ' + Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button19.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button19.Location = New System.Drawing.Point(581, 300) + Me.Button19.Name = "Button19" + Me.Button19.Size = New System.Drawing.Size(211, 24) + Me.Button19.TabIndex = 79 + Me.Button19.Text = "AAS Vermerke 24h" + Me.Button19.UseVisualStyleBackColor = True + ' + 'Label23 + ' + Me.Label23.AutoSize = True + Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label23.Location = New System.Drawing.Point(582, 261) + Me.Label23.Name = "Label23" + Me.Label23.Size = New System.Drawing.Size(152, 13) + Me.Label23.TabIndex = 78 + Me.Label23.Text = "AAS (Aviso-Alert-System):" + ' + 'Button18 + ' + Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button18.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button18.Location = New System.Drawing.Point(581, 277) + Me.Button18.Name = "Button18" + Me.Button18.Size = New System.Drawing.Size(211, 24) + Me.Button18.TabIndex = 77 + Me.Button18.Text = "AAS Vermerke Überschreitung" + Me.Button18.UseVisualStyleBackColor = True + ' + 'Button17 + ' + Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button17.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button17.Location = New System.Drawing.Point(581, 179) + Me.Button17.Name = "Button17" + Me.Button17.Size = New System.Drawing.Size(211, 24) + Me.Button17.TabIndex = 61 + Me.Button17.Text = "DATENARCHIV_ARCHIV" + Me.Button17.UseVisualStyleBackColor = True + ' 'LinkLabel38 ' Me.LinkLabel38.AutoSize = True @@ -814,6 +894,17 @@ Partial Class frmStartOptions Me.LinkLabel38.TabStop = True Me.LinkLabel38.Text = "I0610 - Zust. Zollstelle (AES)" ' + 'PictureBox17 + ' + Me.PictureBox17.BackgroundImage = CType(resources.GetObject("PictureBox17.BackgroundImage"), System.Drawing.Image) + Me.PictureBox17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox17.Location = New System.Drawing.Point(630, 120) + Me.PictureBox17.Name = "PictureBox17" + Me.PictureBox17.Size = New System.Drawing.Size(18, 18) + Me.PictureBox17.TabIndex = 60 + Me.PictureBox17.TabStop = False + Me.PictureBox17.Visible = False + ' 'LinkLabel37 ' Me.LinkLabel37.AutoSize = True @@ -825,12 +916,23 @@ Partial Class frmStartOptions Me.LinkLabel37.TabStop = True Me.LinkLabel37.Text = "C0141 - Zollstellen" ' + 'PictureBox16 + ' + Me.PictureBox16.BackgroundImage = CType(resources.GetObject("PictureBox16.BackgroundImage"), System.Drawing.Image) + Me.PictureBox16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox16.Location = New System.Drawing.Point(400, 120) + Me.PictureBox16.Name = "PictureBox16" + Me.PictureBox16.Size = New System.Drawing.Size(18, 18) + Me.PictureBox16.TabIndex = 58 + Me.PictureBox16.TabStop = False + Me.PictureBox16.Visible = False + ' 'Button15 ' Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button15.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button15.Location = New System.Drawing.Point(581, 250) + Me.Button15.Location = New System.Drawing.Point(581, 209) Me.Button15.Name = "Button15" Me.Button15.Size = New System.Drawing.Size(211, 24) Me.Button15.TabIndex = 56 @@ -842,9 +944,9 @@ Partial Class frmStartOptions Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button8.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(581, 313) + Me.Button8.Location = New System.Drawing.Point(732, 5) Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(211, 24) + Me.Button8.Size = New System.Drawing.Size(123, 24) Me.Button8.TabIndex = 54 Me.Button8.Text = "test" Me.Button8.UseVisualStyleBackColor = True @@ -871,6 +973,28 @@ Partial Class frmStartOptions Me.LinkLabel4.TabStop = True Me.LinkLabel4.Text = "C0008 - NCTS Länder" ' + 'PictureBox13 + ' + Me.PictureBox13.BackgroundImage = CType(resources.GetObject("PictureBox13.BackgroundImage"), System.Drawing.Image) + Me.PictureBox13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox13.Location = New System.Drawing.Point(129, 120) + Me.PictureBox13.Name = "PictureBox13" + Me.PictureBox13.Size = New System.Drawing.Size(18, 18) + Me.PictureBox13.TabIndex = 54 + Me.PictureBox13.TabStop = False + Me.PictureBox13.Visible = False + ' + 'picC0008 + ' + Me.picC0008.BackgroundImage = CType(resources.GetObject("picC0008.BackgroundImage"), System.Drawing.Image) + Me.picC0008.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picC0008.Location = New System.Drawing.Point(129, 32) + Me.picC0008.Name = "picC0008" + Me.picC0008.Size = New System.Drawing.Size(18, 18) + Me.picC0008.TabIndex = 7 + Me.picC0008.TabStop = False + Me.picC0008.Visible = False + ' 'LinkLabel26 ' Me.LinkLabel26.AutoSize = True @@ -947,6 +1071,17 @@ Partial Class frmStartOptions Me.LinkLabel24.TabStop = True Me.LinkLabel24.Text = "Eingangsnachrichten abrufen TEST" ' + 'PictureBox1 + ' + Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) + Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox1.Location = New System.Drawing.Point(205, 60) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(18, 18) + Me.PictureBox1.TabIndex = 12 + Me.PictureBox1.TabStop = False + Me.PictureBox1.Visible = False + ' 'Label5 ' Me.Label5.AutoSize = True @@ -979,6 +1114,17 @@ Partial Class frmStartOptions Me.LinkLabel21.TabStop = True Me.LinkLabel21.Text = "Eingangsnachrichten abrufen PROD" ' + 'PictureBox2 + ' + Me.PictureBox2.BackgroundImage = CType(resources.GetObject("PictureBox2.BackgroundImage"), System.Drawing.Image) + Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox2.Location = New System.Drawing.Point(421, 32) + Me.PictureBox2.Name = "PictureBox2" + Me.PictureBox2.Size = New System.Drawing.Size(18, 18) + Me.PictureBox2.TabIndex = 14 + Me.PictureBox2.TabStop = False + Me.PictureBox2.Visible = False + ' 'LinkLabel22 ' Me.LinkLabel22.AutoSize = True @@ -1032,6 +1178,17 @@ Partial Class frmStartOptions Me.Label1.TabIndex = 0 Me.Label1.Text = "ZOLL.DE Codelisten einlesen:" ' + 'PictureBox3 + ' + Me.PictureBox3.BackgroundImage = CType(resources.GetObject("PictureBox3.BackgroundImage"), System.Drawing.Image) + Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox3.Location = New System.Drawing.Point(405, 60) + Me.PictureBox3.Name = "PictureBox3" + Me.PictureBox3.Size = New System.Drawing.Size(18, 18) + Me.PictureBox3.TabIndex = 17 + Me.PictureBox3.TabStop = False + Me.PictureBox3.Visible = False + ' 'LinkLabel11 ' Me.LinkLabel11.AutoSize = True @@ -1043,6 +1200,17 @@ Partial Class frmStartOptions Me.LinkLabel11.TabStop = True Me.LinkLabel11.Text = "A0122 - Art der Anmeldung (Überführung)" ' + 'PictureBox4 + ' + Me.PictureBox4.BackgroundImage = CType(resources.GetObject("PictureBox4.BackgroundImage"), System.Drawing.Image) + Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox4.Location = New System.Drawing.Point(683, 60) + Me.PictureBox4.Name = "PictureBox4" + Me.PictureBox4.Size = New System.Drawing.Size(18, 18) + Me.PictureBox4.TabIndex = 19 + Me.PictureBox4.TabStop = False + Me.PictureBox4.Visible = False + ' 'LinkLabel12 ' Me.LinkLabel12.AutoSize = True @@ -1054,6 +1222,17 @@ Partial Class frmStartOptions Me.LinkLabel12.TabStop = True Me.LinkLabel12.Text = "A0127 - Beteiligten-Konstellation" ' + 'PictureBox5 + ' + Me.PictureBox5.BackgroundImage = CType(resources.GetObject("PictureBox5.BackgroundImage"), System.Drawing.Image) + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox5.Location = New System.Drawing.Point(640, 32) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(18, 18) + Me.PictureBox5.TabIndex = 21 + Me.PictureBox5.TabStop = False + Me.PictureBox5.Visible = False + ' 'LinkLabel13 ' Me.LinkLabel13.AutoSize = True @@ -1065,6 +1244,17 @@ Partial Class frmStartOptions Me.LinkLabel13.TabStop = True Me.LinkLabel13.Text = "I0400 - Währungsliste" ' + 'PictureBox6 + ' + Me.PictureBox6.BackgroundImage = CType(resources.GetObject("PictureBox6.BackgroundImage"), System.Drawing.Image) + Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox6.Location = New System.Drawing.Point(127, 90) + Me.PictureBox6.Name = "PictureBox6" + Me.PictureBox6.Size = New System.Drawing.Size(18, 18) + Me.PictureBox6.TabIndex = 23 + Me.PictureBox6.TabStop = False + Me.PictureBox6.Visible = False + ' 'LinkLabel14 ' Me.LinkLabel14.AutoSize = True @@ -1076,6 +1266,17 @@ Partial Class frmStartOptions Me.LinkLabel14.TabStop = True Me.LinkLabel14.Text = "C0013 - Unterlagen" ' + 'PictureBox7 + ' + Me.PictureBox7.BackgroundImage = CType(resources.GetObject("PictureBox7.BackgroundImage"), System.Drawing.Image) + Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox7.Location = New System.Drawing.Point(400, 90) + Me.PictureBox7.Name = "PictureBox7" + Me.PictureBox7.Size = New System.Drawing.Size(18, 18) + Me.PictureBox7.TabIndex = 25 + Me.PictureBox7.TabStop = False + Me.PictureBox7.Visible = False + ' 'LinkLabel15 ' Me.LinkLabel15.AutoSize = True @@ -1098,6 +1299,17 @@ Partial Class frmStartOptions Me.LinkLabel16.TabStop = True Me.LinkLabel16.Text = "I0200 - Unterlageaerten (EZA)" ' + 'PictureBox8 + ' + Me.PictureBox8.BackgroundImage = CType(resources.GetObject("PictureBox8.BackgroundImage"), System.Drawing.Image) + Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox8.Location = New System.Drawing.Point(630, 90) + Me.PictureBox8.Name = "PictureBox8" + Me.PictureBox8.Size = New System.Drawing.Size(18, 18) + Me.PictureBox8.TabIndex = 29 + Me.PictureBox8.TabStop = False + Me.PictureBox8.Visible = False + ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.Button11) @@ -1509,6 +1721,28 @@ Partial Class frmStartOptions Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(153, 20) Me.txtVRGOut_BezugsNr.TabIndex = 5 ' + 'PictureBox15 + ' + Me.PictureBox15.BackgroundImage = CType(resources.GetObject("PictureBox15.BackgroundImage"), System.Drawing.Image) + Me.PictureBox15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox15.Location = New System.Drawing.Point(596, 255) + Me.PictureBox15.Name = "PictureBox15" + Me.PictureBox15.Size = New System.Drawing.Size(18, 18) + Me.PictureBox15.TabIndex = 67 + Me.PictureBox15.TabStop = False + Me.PictureBox15.Visible = False + ' + 'PictureBox14 + ' + Me.PictureBox14.BackgroundImage = CType(resources.GetObject("PictureBox14.BackgroundImage"), System.Drawing.Image) + Me.PictureBox14.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox14.Location = New System.Drawing.Point(596, 65) + Me.PictureBox14.Name = "PictureBox14" + Me.PictureBox14.Size = New System.Drawing.Size(18, 18) + Me.PictureBox14.TabIndex = 56 + Me.PictureBox14.TabStop = False + Me.PictureBox14.Visible = False + ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.LinkLabel39) @@ -1746,6 +1980,17 @@ Partial Class frmStartOptions Me.MyTextBox1.TabIndex = 11 Me.MyTextBox1.Text = "100000" ' + 'PictureBox12 + ' + Me.PictureBox12.BackgroundImage = CType(resources.GetObject("PictureBox12.BackgroundImage"), System.Drawing.Image) + Me.PictureBox12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox12.Location = New System.Drawing.Point(127, 130) + Me.PictureBox12.Name = "PictureBox12" + Me.PictureBox12.Size = New System.Drawing.Size(18, 18) + Me.PictureBox12.TabIndex = 37 + Me.PictureBox12.TabStop = False + Me.PictureBox12.Visible = False + ' 'LinkLabel20 ' Me.LinkLabel20.AutoSize = True @@ -1757,6 +2002,17 @@ Partial Class frmStartOptions Me.LinkLabel20.TabStop = True Me.LinkLabel20.Text = "UID-Prüfung VERAG" ' + 'PictureBox11 + ' + Me.PictureBox11.BackgroundImage = CType(resources.GetObject("PictureBox11.BackgroundImage"), System.Drawing.Image) + Me.PictureBox11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox11.Location = New System.Drawing.Point(620, 94) + Me.PictureBox11.Name = "PictureBox11" + Me.PictureBox11.Size = New System.Drawing.Size(18, 18) + Me.PictureBox11.TabIndex = 35 + Me.PictureBox11.TabStop = False + Me.PictureBox11.Visible = False + ' 'LinkLabel19 ' Me.LinkLabel19.AutoSize = True @@ -1768,6 +2024,17 @@ Partial Class frmStartOptions Me.LinkLabel19.TabStop = True Me.LinkLabel19.Text = "Währungskurse EZB 90D" ' + 'PictureBox10 + ' + Me.PictureBox10.BackgroundImage = CType(resources.GetObject("PictureBox10.BackgroundImage"), System.Drawing.Image) + Me.PictureBox10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox10.Location = New System.Drawing.Point(620, 73) + Me.PictureBox10.Name = "PictureBox10" + Me.PictureBox10.Size = New System.Drawing.Size(18, 18) + Me.PictureBox10.TabIndex = 33 + Me.PictureBox10.TabStop = False + Me.PictureBox10.Visible = False + ' 'LinkLabel18 ' Me.LinkLabel18.AutoSize = True @@ -1779,6 +2046,17 @@ Partial Class frmStartOptions Me.LinkLabel18.TabStop = True Me.LinkLabel18.Text = "Währungskurse EZB" ' + 'PictureBox9 + ' + Me.PictureBox9.BackgroundImage = CType(resources.GetObject("PictureBox9.BackgroundImage"), System.Drawing.Image) + Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox9.Location = New System.Drawing.Point(620, 46) + Me.PictureBox9.Name = "PictureBox9" + Me.PictureBox9.Size = New System.Drawing.Size(18, 18) + Me.PictureBox9.TabIndex = 31 + Me.PictureBox9.TabStop = False + Me.PictureBox9.Visible = False + ' 'LinkLabel17 ' Me.LinkLabel17.AutoSize = True @@ -1894,226 +2172,17 @@ Partial Class frmStartOptions Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20) Me.txtGJ_UNISPED.TabIndex = 68 ' - 'Button17 + 'Button21 ' - Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button17.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button17.Location = New System.Drawing.Point(581, 179) - Me.Button17.Name = "Button17" - Me.Button17.Size = New System.Drawing.Size(211, 24) - Me.Button17.TabIndex = 61 - Me.Button17.Text = "DATENARCHIV_ARCHIV" - Me.Button17.UseVisualStyleBackColor = True - ' - 'piceZollAnh - ' - Me.piceZollAnh.BackgroundImage = CType(resources.GetObject("piceZollAnh.BackgroundImage"), System.Drawing.Image) - Me.piceZollAnh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.piceZollAnh.Location = New System.Drawing.Point(500, 190) - Me.piceZollAnh.Name = "piceZollAnh" - Me.piceZollAnh.Size = New System.Drawing.Size(18, 18) - Me.piceZollAnh.TabIndex = 56 - Me.piceZollAnh.TabStop = False - Me.piceZollAnh.Visible = False - ' - 'PictureBox17 - ' - Me.PictureBox17.BackgroundImage = CType(resources.GetObject("PictureBox17.BackgroundImage"), System.Drawing.Image) - Me.PictureBox17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox17.Location = New System.Drawing.Point(630, 120) - Me.PictureBox17.Name = "PictureBox17" - Me.PictureBox17.Size = New System.Drawing.Size(18, 18) - Me.PictureBox17.TabIndex = 60 - Me.PictureBox17.TabStop = False - Me.PictureBox17.Visible = False - ' - 'PictureBox16 - ' - Me.PictureBox16.BackgroundImage = CType(resources.GetObject("PictureBox16.BackgroundImage"), System.Drawing.Image) - Me.PictureBox16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox16.Location = New System.Drawing.Point(400, 120) - Me.PictureBox16.Name = "PictureBox16" - Me.PictureBox16.Size = New System.Drawing.Size(18, 18) - Me.PictureBox16.TabIndex = 58 - Me.PictureBox16.TabStop = False - Me.PictureBox16.Visible = False - ' - 'PictureBox13 - ' - Me.PictureBox13.BackgroundImage = CType(resources.GetObject("PictureBox13.BackgroundImage"), System.Drawing.Image) - Me.PictureBox13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox13.Location = New System.Drawing.Point(129, 120) - Me.PictureBox13.Name = "PictureBox13" - Me.PictureBox13.Size = New System.Drawing.Size(18, 18) - Me.PictureBox13.TabIndex = 54 - Me.PictureBox13.TabStop = False - Me.PictureBox13.Visible = False - ' - 'picC0008 - ' - Me.picC0008.BackgroundImage = CType(resources.GetObject("picC0008.BackgroundImage"), System.Drawing.Image) - Me.picC0008.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picC0008.Location = New System.Drawing.Point(129, 32) - Me.picC0008.Name = "picC0008" - Me.picC0008.Size = New System.Drawing.Size(18, 18) - Me.picC0008.TabIndex = 7 - Me.picC0008.TabStop = False - Me.picC0008.Visible = False - ' - 'PictureBox1 - ' - Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) - Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox1.Location = New System.Drawing.Point(205, 60) - Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(18, 18) - Me.PictureBox1.TabIndex = 12 - Me.PictureBox1.TabStop = False - Me.PictureBox1.Visible = False - ' - 'PictureBox2 - ' - Me.PictureBox2.BackgroundImage = CType(resources.GetObject("PictureBox2.BackgroundImage"), System.Drawing.Image) - Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox2.Location = New System.Drawing.Point(421, 32) - Me.PictureBox2.Name = "PictureBox2" - Me.PictureBox2.Size = New System.Drawing.Size(18, 18) - Me.PictureBox2.TabIndex = 14 - Me.PictureBox2.TabStop = False - Me.PictureBox2.Visible = False - ' - 'PictureBox3 - ' - Me.PictureBox3.BackgroundImage = CType(resources.GetObject("PictureBox3.BackgroundImage"), System.Drawing.Image) - Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox3.Location = New System.Drawing.Point(405, 60) - Me.PictureBox3.Name = "PictureBox3" - Me.PictureBox3.Size = New System.Drawing.Size(18, 18) - Me.PictureBox3.TabIndex = 17 - Me.PictureBox3.TabStop = False - Me.PictureBox3.Visible = False - ' - 'PictureBox4 - ' - Me.PictureBox4.BackgroundImage = CType(resources.GetObject("PictureBox4.BackgroundImage"), System.Drawing.Image) - Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox4.Location = New System.Drawing.Point(683, 60) - Me.PictureBox4.Name = "PictureBox4" - Me.PictureBox4.Size = New System.Drawing.Size(18, 18) - Me.PictureBox4.TabIndex = 19 - Me.PictureBox4.TabStop = False - Me.PictureBox4.Visible = False - ' - 'PictureBox5 - ' - Me.PictureBox5.BackgroundImage = CType(resources.GetObject("PictureBox5.BackgroundImage"), System.Drawing.Image) - Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox5.Location = New System.Drawing.Point(640, 32) - Me.PictureBox5.Name = "PictureBox5" - Me.PictureBox5.Size = New System.Drawing.Size(18, 18) - Me.PictureBox5.TabIndex = 21 - Me.PictureBox5.TabStop = False - Me.PictureBox5.Visible = False - ' - 'PictureBox6 - ' - Me.PictureBox6.BackgroundImage = CType(resources.GetObject("PictureBox6.BackgroundImage"), System.Drawing.Image) - Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox6.Location = New System.Drawing.Point(127, 90) - Me.PictureBox6.Name = "PictureBox6" - Me.PictureBox6.Size = New System.Drawing.Size(18, 18) - Me.PictureBox6.TabIndex = 23 - Me.PictureBox6.TabStop = False - Me.PictureBox6.Visible = False - ' - 'PictureBox7 - ' - Me.PictureBox7.BackgroundImage = CType(resources.GetObject("PictureBox7.BackgroundImage"), System.Drawing.Image) - Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox7.Location = New System.Drawing.Point(400, 90) - Me.PictureBox7.Name = "PictureBox7" - Me.PictureBox7.Size = New System.Drawing.Size(18, 18) - Me.PictureBox7.TabIndex = 25 - Me.PictureBox7.TabStop = False - Me.PictureBox7.Visible = False - ' - 'PictureBox8 - ' - Me.PictureBox8.BackgroundImage = CType(resources.GetObject("PictureBox8.BackgroundImage"), System.Drawing.Image) - Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox8.Location = New System.Drawing.Point(630, 90) - Me.PictureBox8.Name = "PictureBox8" - Me.PictureBox8.Size = New System.Drawing.Size(18, 18) - Me.PictureBox8.TabIndex = 29 - Me.PictureBox8.TabStop = False - Me.PictureBox8.Visible = False - ' - 'PictureBox15 - ' - Me.PictureBox15.BackgroundImage = CType(resources.GetObject("PictureBox15.BackgroundImage"), System.Drawing.Image) - Me.PictureBox15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox15.Location = New System.Drawing.Point(596, 255) - Me.PictureBox15.Name = "PictureBox15" - Me.PictureBox15.Size = New System.Drawing.Size(18, 18) - Me.PictureBox15.TabIndex = 67 - Me.PictureBox15.TabStop = False - Me.PictureBox15.Visible = False - ' - 'PictureBox14 - ' - Me.PictureBox14.BackgroundImage = CType(resources.GetObject("PictureBox14.BackgroundImage"), System.Drawing.Image) - Me.PictureBox14.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox14.Location = New System.Drawing.Point(596, 65) - Me.PictureBox14.Name = "PictureBox14" - Me.PictureBox14.Size = New System.Drawing.Size(18, 18) - Me.PictureBox14.TabIndex = 56 - Me.PictureBox14.TabStop = False - Me.PictureBox14.Visible = False - ' - 'PictureBox12 - ' - Me.PictureBox12.BackgroundImage = CType(resources.GetObject("PictureBox12.BackgroundImage"), System.Drawing.Image) - Me.PictureBox12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox12.Location = New System.Drawing.Point(127, 130) - Me.PictureBox12.Name = "PictureBox12" - Me.PictureBox12.Size = New System.Drawing.Size(18, 18) - Me.PictureBox12.TabIndex = 37 - Me.PictureBox12.TabStop = False - Me.PictureBox12.Visible = False - ' - 'PictureBox11 - ' - Me.PictureBox11.BackgroundImage = CType(resources.GetObject("PictureBox11.BackgroundImage"), System.Drawing.Image) - Me.PictureBox11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox11.Location = New System.Drawing.Point(620, 94) - Me.PictureBox11.Name = "PictureBox11" - Me.PictureBox11.Size = New System.Drawing.Size(18, 18) - Me.PictureBox11.TabIndex = 35 - Me.PictureBox11.TabStop = False - Me.PictureBox11.Visible = False - ' - 'PictureBox10 - ' - Me.PictureBox10.BackgroundImage = CType(resources.GetObject("PictureBox10.BackgroundImage"), System.Drawing.Image) - Me.PictureBox10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox10.Location = New System.Drawing.Point(620, 73) - Me.PictureBox10.Name = "PictureBox10" - Me.PictureBox10.Size = New System.Drawing.Size(18, 18) - Me.PictureBox10.TabIndex = 33 - Me.PictureBox10.TabStop = False - Me.PictureBox10.Visible = False - ' - 'PictureBox9 - ' - Me.PictureBox9.BackgroundImage = CType(resources.GetObject("PictureBox9.BackgroundImage"), System.Drawing.Image) - Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox9.Location = New System.Drawing.Point(620, 46) - Me.PictureBox9.Name = "PictureBox9" - Me.PictureBox9.Size = New System.Drawing.Size(18, 18) - Me.PictureBox9.TabIndex = 31 - Me.PictureBox9.TabStop = False - Me.PictureBox9.Visible = False + Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button21.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button21.Location = New System.Drawing.Point(581, 346) + Me.Button21.Name = "Button21" + Me.Button21.Size = New System.Drawing.Size(211, 24) + Me.Button21.TabIndex = 81 + Me.Button21.Text = "AAS Sendung 24h" + Me.Button21.UseVisualStyleBackColor = True ' 'frmStartOptions ' @@ -2130,15 +2199,10 @@ Partial Class frmStartOptions Me.WindowState = System.Windows.Forms.FormWindowState.Minimized Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).EndInit() Me.tbcntr.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() - Me.TabPage2.ResumeLayout(False) - Me.TabPage2.PerformLayout() - CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() - Me.TabPage3.ResumeLayout(False) - Me.TabPage3.PerformLayout() - CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox17, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox16, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox13, System.ComponentModel.ISupportInitialize).EndInit() @@ -2151,8 +2215,13 @@ Partial Class frmStartOptions CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage2.ResumeLayout(False) + Me.TabPage2.PerformLayout() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage3.ResumeLayout(False) + Me.TabPage3.PerformLayout() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() @@ -2309,4 +2378,9 @@ Partial Class frmStartOptions Friend WithEvents Label22 As Label Friend WithEvents cbxVermerk As CheckBox Friend WithEvents Button17 As Button + Friend WithEvents Label23 As Label + Friend WithEvents Button18 As Button + Friend WithEvents Button20 As Button + Friend WithEvents Button19 As Button + Friend WithEvents Button21 As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index d43bcdc..6b89517 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -3441,4 +3441,147 @@ Public Class frmStartOptions Dim f As New frmDatenarchivarchiv f.ShowDialog() End Sub + + Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click + doAASVermerke_Schwelle() + + End Sub + + Function doAASVermerke_Schwelle() + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim dt = SQL.loadDgvBySql(" + SELECT TOP 1000 aviso.AvisoID,Vermerke.[Hinweis_Vermerk] + ,CASE WHEN Vermerke.SendungID is not null THEN(SELECT FilialenNr from tblSendungen WHERE tblSnd_SendungID=Vermerke.SendungID) ELSE NULL END FilialenNr + FROM [Aviso] + inner join Vermerke on [Aviso].AvisoID=Vermerke.AvisoID + inner join VermerkeCodes on Vermerke.VermerkeCode=VermerkeCodes.VermerkCodeId + WHERE [Aviso].Status NOT IN (1,2) AND AAS_Warnsystem=1 and AAS_Warnstufe=0 and DATEDIFF(HOUR,Vermerke.Datum,GETDATE())>AAS_SchwelleStunden and [VermerkIDAufgehoben] is null + and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945)) + AND Aviso.Datum > DATEADD( day,-1,GETDATE()) + ", "AVISO") + + If dt IsNot Nothing Then + For Each r In dt.Rows + insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 1) + Next + End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return False + End Try + Return True + End Function + Function doAASVermerke_24h() + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim dt = SQL.loadDgvBySql(" + SELECT TOP 1000 aviso.AvisoID, Datum + FROM [Aviso] + WHERE [Aviso].Status NOT IN (1,2) + and DATEDIFF(HOUR, (select top 1 Datum from Vermerke where Vermerke.AvisoID=aviso.AvisoID order by Vermerke.Datum desc),GETDATE())>24 + and DATEDIFF(HOUR, (select top 1 Datum from Aenderungen where Aenderungen.AvisoID=aviso.AvisoID order by Aenderungen.Datum desc),GETDATE())>24 + AND Datum > DATEADD( day,-2,GETDATE()) + ", "AVISO") + + If dt IsNot Nothing Then + For Each r In dt.Rows + insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER w4h", "REMINDER: " & r("Hinweis_Vermerk"), 0) + Next + End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return False + End Try + Return True + End Function + + Function doAASVermerke_Ankunft() ' 4 Stunden + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim dt = SQL.loadDgvBySql(" + SELECT TOP 1000 aviso.AvisoID, Datum + FROM [Aviso] + WHERE [Aviso].Status IN (3) + and DATEDIFF(HOUR, (select top 1 Datum from Vermerke where Vermerke.AvisoID=aviso.AvisoID order by Vermerke.Datum desc),GETDATE())>4 + and DATEDIFF(HOUR, (select top 1 Datum from Aenderungen where Aenderungen.AvisoID=aviso.AvisoID order by Aenderungen.Datum desc),GETDATE())>4 + AND Datum > DATEADD( day,-2,GETDATE()) + + ", "AVISO") + + If dt IsNot Nothing Then + For Each r In dt.Rows + insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 0) + Next + End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return False + End Try + Return True + End Function + + Function insertBenachrichtigung_AAS(AvisoId, SendungsId, firma, code, TXT_AAS_HEAD, TXT_AAS_BODY, prio) + ' + 'Benachrichtigung + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim sendToID As String = SQL.DLookup("tblSnd_VG_MA", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) + Dim art = "B" + + 'Wenn Benutzer vorschreiben nicht online, dann Benutzer der Sendung... + If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then + sendToID = SQL.DLookup("LetzterMitarbeiterId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) + art = "B" + End If + + 'Wenn Benutzer der Sendung nicht online, dann Benutzer des LKW .. + If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then + sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO", -1) + art = "B" + End If + + 'Wenn Benutzer des LKWs nicht online, Team... + If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then + sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) + art = "T" + End If + + 'Wenn TEAM nicht gefunden, Firma... + If sendToID <= 0 Then + If firma IsNot Nothing AndAlso firma <> "" Then + sendToID = firma + art = "F" + End If + End If + + 'Wenn gefunden + If (art = "F" AndAlso If(sendToID, "") <> "") OrElse sendToID >= 0 Then + Dim statusAVISO = SQL.DLookup("Status", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") + Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") + If GrenzstelleAVISO = "???" Then + Select Case statusAVISO + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben + 'Nicht + Case Else + + VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma) + End Select + End If + End If + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return False + End Try + Return True + End Function + + Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click + doAASVermerke_24h() + End Sub + + Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click + doAASVermerke_Ankunft() + End Sub End Class \ No newline at end of file