This commit is contained in:
2025-08-01 07:43:34 +02:00
parent 038e2957c7
commit 14dc77cdb7
9 changed files with 115 additions and 78 deletions

View File

@@ -1495,6 +1495,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmAuswahl_Aviso.resx"> <EmbeddedResource Include="frmAuswahl_Aviso.resx">
<DependentUpon>frmAuswahl_Aviso.vb</DependentUpon> <DependentUpon>frmAuswahl_Aviso.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Auswertung\frmAuswertung.resx"> <EmbeddedResource Include="Auswertung\frmAuswertung.resx">
<DependentUpon>frmAuswertung.vb</DependentUpon> <DependentUpon>frmAuswertung.vb</DependentUpon>

View File

@@ -222,10 +222,12 @@ Public Class frmAvisoWeiterleiten
btn.Enabled = enabled btn.Enabled = enabled
AddHandler btn.Click, Sub() AddHandler btn.Click, Sub()
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "ATILLA" : btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma, "WL: " & If(bezeichnungFirma <> "ATILLA", "[" & bezeichnungFirma & "] ", "") & bezeichnung) btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma, "WL: " & If(bezeichnungFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, "[" & bezeichnungFirma & "] ", "") & bezeichnung)
Case Else : btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma) 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
End Select ' Case "ATILLA" : btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma, "WL: " & If(bezeichnungFirma <> "ATILLA", "[" & bezeichnungFirma & "] ", "") & bezeichnung)
' Case Else : btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma)
'End Select
initButtons(flpFirma, btn) initButtons(flpFirma, btn)
End Sub End Sub

View File

@@ -23,7 +23,7 @@ Partial Class usrCntlBenachrichtigungen
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel()
Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -80,8 +80,8 @@ Partial Class usrCntlBenachrichtigungen
Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
@@ -97,9 +97,9 @@ Partial Class usrCntlBenachrichtigungen
Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Panel4.Controls.Add(Me.cbxTaskForce) Me.Panel4.Controls.Add(Me.cbxTaskForce)
Me.Panel4.Controls.Add(Me.cbxVerwarung) Me.Panel4.Controls.Add(Me.cbxVerwarung)
Me.Panel4.Controls.Add(Me.txtVermerk)
Me.Panel4.Controls.Add(Me.cbxNeukunden) Me.Panel4.Controls.Add(Me.cbxNeukunden)
Me.Panel4.Controls.Add(Me.Button10) Me.Panel4.Controls.Add(Me.Button10)
Me.Panel4.Controls.Add(Me.txtVermerk)
Me.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom
Me.Panel4.Location = New System.Drawing.Point(0, 165) Me.Panel4.Location = New System.Drawing.Point(0, 165)
Me.Panel4.Name = "Panel4" Me.Panel4.Name = "Panel4"

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("4.1.4.8")> <Assembly: AssemblyVersion("4.1.4.9")>
<Assembly: AssemblyFileVersion("4.1.4.8")> <Assembly: AssemblyFileVersion("4.1.4.9")>

View File

@@ -27,6 +27,9 @@ Partial Class frmAddSendungsvermerkShort
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.pnlMain = New System.Windows.Forms.Panel() Me.pnlMain = New System.Windows.Forms.Panel()
Me.pnlSendungsVermker = New System.Windows.Forms.Panel() Me.pnlSendungsVermker = New System.Windows.Forms.Panel()
Me.optGewPackAngefordert = New System.Windows.Forms.CheckBox()
Me.optKostenbestaetigungAngefordert = New System.Windows.Forms.CheckBox()
Me.optZolltarifnummerAngefordert = New System.Windows.Forms.CheckBox()
Me.txtSonstigesDokumentFehlt = New System.Windows.Forms.TextBox() Me.txtSonstigesDokumentFehlt = New System.Windows.Forms.TextBox()
Me.cbxPackliste = New System.Windows.Forms.CheckBox() Me.cbxPackliste = New System.Windows.Forms.CheckBox()
Me.Label4 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label()
@@ -73,9 +76,7 @@ Partial Class frmAddSendungsvermerkShort
Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.PictureBox4 = New System.Windows.Forms.PictureBox() Me.PictureBox4 = New System.Windows.Forms.PictureBox()
Me.Panel4 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel()
Me.optGewPackAngefordert = New System.Windows.Forms.CheckBox() Me.optDraft = New System.Windows.Forms.CheckBox()
Me.optKostenbestaetigungAngefordert = New System.Windows.Forms.CheckBox()
Me.optZolltarifnummerAngefordert = New System.Windows.Forms.CheckBox()
Me.pnlMain.SuspendLayout() Me.pnlMain.SuspendLayout()
Me.pnlSendungsVermker.SuspendLayout() Me.pnlSendungsVermker.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -94,13 +95,14 @@ Partial Class frmAddSendungsvermerkShort
Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
Me.pnlMain.Location = New System.Drawing.Point(0, 0) Me.pnlMain.Location = New System.Drawing.Point(0, 0)
Me.pnlMain.Name = "pnlMain" Me.pnlMain.Name = "pnlMain"
Me.pnlMain.Size = New System.Drawing.Size(454, 563) Me.pnlMain.Size = New System.Drawing.Size(454, 605)
Me.pnlMain.TabIndex = 0 Me.pnlMain.TabIndex = 0
' '
'pnlSendungsVermker 'pnlSendungsVermker
' '
Me.pnlSendungsVermker.BackColor = System.Drawing.Color.White Me.pnlSendungsVermker.BackColor = System.Drawing.Color.White
Me.pnlSendungsVermker.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlSendungsVermker.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.pnlSendungsVermker.Controls.Add(Me.optDraft)
Me.pnlSendungsVermker.Controls.Add(Me.optGewPackAngefordert) Me.pnlSendungsVermker.Controls.Add(Me.optGewPackAngefordert)
Me.pnlSendungsVermker.Controls.Add(Me.optKostenbestaetigungAngefordert) Me.pnlSendungsVermker.Controls.Add(Me.optKostenbestaetigungAngefordert)
Me.pnlSendungsVermker.Controls.Add(Me.optZolltarifnummerAngefordert) Me.pnlSendungsVermker.Controls.Add(Me.optZolltarifnummerAngefordert)
@@ -152,9 +154,39 @@ Partial Class frmAddSendungsvermerkShort
Me.pnlSendungsVermker.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlSendungsVermker.Dock = System.Windows.Forms.DockStyle.Fill
Me.pnlSendungsVermker.Location = New System.Drawing.Point(0, 0) Me.pnlSendungsVermker.Location = New System.Drawing.Point(0, 0)
Me.pnlSendungsVermker.Name = "pnlSendungsVermker" Me.pnlSendungsVermker.Name = "pnlSendungsVermker"
Me.pnlSendungsVermker.Size = New System.Drawing.Size(454, 563) Me.pnlSendungsVermker.Size = New System.Drawing.Size(454, 605)
Me.pnlSendungsVermker.TabIndex = 0 Me.pnlSendungsVermker.TabIndex = 0
' '
'optGewPackAngefordert
'
Me.optGewPackAngefordert.AutoSize = True
Me.optGewPackAngefordert.Location = New System.Drawing.Point(12, 236)
Me.optGewPackAngefordert.Name = "optGewPackAngefordert"
Me.optGewPackAngefordert.Size = New System.Drawing.Size(245, 17)
Me.optGewPackAngefordert.TabIndex = 101
Me.optGewPackAngefordert.Text = "Gewicht/Packstücke mangelhaft - angefordert"
Me.optGewPackAngefordert.UseVisualStyleBackColor = True
'
'optKostenbestaetigungAngefordert
'
Me.optKostenbestaetigungAngefordert.AutoSize = True
Me.optKostenbestaetigungAngefordert.Location = New System.Drawing.Point(270, 214)
Me.optKostenbestaetigungAngefordert.Name = "optKostenbestaetigungAngefordert"
Me.optKostenbestaetigungAngefordert.Size = New System.Drawing.Size(177, 17)
Me.optKostenbestaetigungAngefordert.TabIndex = 99
Me.optKostenbestaetigungAngefordert.Text = "Kostenbestätigung - angefordert"
Me.optKostenbestaetigungAngefordert.UseVisualStyleBackColor = True
'
'optZolltarifnummerAngefordert
'
Me.optZolltarifnummerAngefordert.AutoSize = True
Me.optZolltarifnummerAngefordert.Location = New System.Drawing.Point(12, 214)
Me.optZolltarifnummerAngefordert.Name = "optZolltarifnummerAngefordert"
Me.optZolltarifnummerAngefordert.Size = New System.Drawing.Size(154, 17)
Me.optZolltarifnummerAngefordert.TabIndex = 98
Me.optZolltarifnummerAngefordert.Text = "Zolltarifnummer angefordert"
Me.optZolltarifnummerAngefordert.UseVisualStyleBackColor = True
'
'txtSonstigesDokumentFehlt 'txtSonstigesDokumentFehlt
' '
Me.txtSonstigesDokumentFehlt.BackColor = System.Drawing.Color.White Me.txtSonstigesDokumentFehlt.BackColor = System.Drawing.Color.White
@@ -181,7 +213,7 @@ Partial Class frmAddSendungsvermerkShort
Me.Label4.AutoSize = True Me.Label4.AutoSize = True
Me.Label4.BackColor = System.Drawing.Color.WhiteSmoke Me.Label4.BackColor = System.Drawing.Color.WhiteSmoke
Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label4.Location = New System.Drawing.Point(11, 379) Me.Label4.Location = New System.Drawing.Point(11, 411)
Me.Label4.Name = "Label4" Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(125, 17) Me.Label4.Size = New System.Drawing.Size(125, 17)
Me.Label4.TabIndex = 96 Me.Label4.TabIndex = 96
@@ -191,7 +223,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.optFremd_ATB.AutoSize = True Me.optFremd_ATB.AutoSize = True
Me.optFremd_ATB.BackColor = System.Drawing.Color.WhiteSmoke Me.optFremd_ATB.BackColor = System.Drawing.Color.WhiteSmoke
Me.optFremd_ATB.Location = New System.Drawing.Point(12, 426) Me.optFremd_ATB.Location = New System.Drawing.Point(12, 458)
Me.optFremd_ATB.Name = "optFremd_ATB" Me.optFremd_ATB.Name = "optFremd_ATB"
Me.optFremd_ATB.Size = New System.Drawing.Size(130, 17) Me.optFremd_ATB.Size = New System.Drawing.Size(130, 17)
Me.optFremd_ATB.TabIndex = 94 Me.optFremd_ATB.TabIndex = 94
@@ -202,7 +234,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.optFremd_SendungAvisiert.AutoSize = True Me.optFremd_SendungAvisiert.AutoSize = True
Me.optFremd_SendungAvisiert.BackColor = System.Drawing.Color.WhiteSmoke Me.optFremd_SendungAvisiert.BackColor = System.Drawing.Color.WhiteSmoke
Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 403) Me.optFremd_SendungAvisiert.Location = New System.Drawing.Point(12, 435)
Me.optFremd_SendungAvisiert.Name = "optFremd_SendungAvisiert" Me.optFremd_SendungAvisiert.Name = "optFremd_SendungAvisiert"
Me.optFremd_SendungAvisiert.Size = New System.Drawing.Size(193, 17) Me.optFremd_SendungAvisiert.Size = New System.Drawing.Size(193, 17)
Me.optFremd_SendungAvisiert.TabIndex = 93 Me.optFremd_SendungAvisiert.TabIndex = 93
@@ -276,7 +308,7 @@ Partial Class frmAddSendungsvermerkShort
Me.lblErrSpedition.AutoSize = True Me.lblErrSpedition.AutoSize = True
Me.lblErrSpedition.BackColor = System.Drawing.Color.WhiteSmoke Me.lblErrSpedition.BackColor = System.Drawing.Color.WhiteSmoke
Me.lblErrSpedition.ForeColor = System.Drawing.Color.Red Me.lblErrSpedition.ForeColor = System.Drawing.Color.Red
Me.lblErrSpedition.Location = New System.Drawing.Point(175, 284) Me.lblErrSpedition.Location = New System.Drawing.Point(175, 316)
Me.lblErrSpedition.Name = "lblErrSpedition" Me.lblErrSpedition.Name = "lblErrSpedition"
Me.lblErrSpedition.Size = New System.Drawing.Size(158, 13) Me.lblErrSpedition.Size = New System.Drawing.Size(158, 13)
Me.lblErrSpedition.TabIndex = 17 Me.lblErrSpedition.TabIndex = 17
@@ -288,7 +320,7 @@ Partial Class frmAddSendungsvermerkShort
Me.Label2.AutoSize = True Me.Label2.AutoSize = True
Me.Label2.BackColor = System.Drawing.Color.WhiteSmoke Me.Label2.BackColor = System.Drawing.Color.WhiteSmoke
Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
Me.Label2.Location = New System.Drawing.Point(175, 284) Me.Label2.Location = New System.Drawing.Point(175, 316)
Me.Label2.Name = "Label2" Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(57, 13) Me.Label2.Size = New System.Drawing.Size(57, 13)
Me.Label2.TabIndex = 84 Me.Label2.TabIndex = 84
@@ -299,7 +331,7 @@ Partial Class frmAddSendungsvermerkShort
Me.lblErrGrund.AutoSize = True Me.lblErrGrund.AutoSize = True
Me.lblErrGrund.BackColor = System.Drawing.Color.WhiteSmoke Me.lblErrGrund.BackColor = System.Drawing.Color.WhiteSmoke
Me.lblErrGrund.ForeColor = System.Drawing.Color.Red Me.lblErrGrund.ForeColor = System.Drawing.Color.Red
Me.lblErrGrund.Location = New System.Drawing.Point(147, 353) Me.lblErrGrund.Location = New System.Drawing.Point(147, 385)
Me.lblErrGrund.Name = "lblErrGrund" Me.lblErrGrund.Name = "lblErrGrund"
Me.lblErrGrund.Size = New System.Drawing.Size(149, 13) Me.lblErrGrund.Size = New System.Drawing.Size(149, 13)
Me.lblErrGrund.TabIndex = 26 Me.lblErrGrund.TabIndex = 26
@@ -350,7 +382,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.txtSpedition.BackColor = System.Drawing.Color.WhiteSmoke Me.txtSpedition.BackColor = System.Drawing.Color.WhiteSmoke
Me.txtSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSpedition.Location = New System.Drawing.Point(177, 300) Me.txtSpedition.Location = New System.Drawing.Point(177, 332)
Me.txtSpedition.MaxLength = 50 Me.txtSpedition.MaxLength = 50
Me.txtSpedition.Name = "txtSpedition" Me.txtSpedition.Name = "txtSpedition"
Me.txtSpedition.Size = New System.Drawing.Size(125, 20) Me.txtSpedition.Size = New System.Drawing.Size(125, 20)
@@ -371,7 +403,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.optSpeditionWeitergeleitet.AutoSize = True Me.optSpeditionWeitergeleitet.AutoSize = True
Me.optSpeditionWeitergeleitet.BackColor = System.Drawing.Color.WhiteSmoke Me.optSpeditionWeitergeleitet.BackColor = System.Drawing.Color.WhiteSmoke
Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 302) Me.optSpeditionWeitergeleitet.Location = New System.Drawing.Point(12, 334)
Me.optSpeditionWeitergeleitet.Name = "optSpeditionWeitergeleitet" Me.optSpeditionWeitergeleitet.Name = "optSpeditionWeitergeleitet"
Me.optSpeditionWeitergeleitet.Size = New System.Drawing.Size(163, 17) Me.optSpeditionWeitergeleitet.Size = New System.Drawing.Size(163, 17)
Me.optSpeditionWeitergeleitet.TabIndex = 19 Me.optSpeditionWeitergeleitet.TabIndex = 19
@@ -382,7 +414,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.optFreierText.AutoSize = True Me.optFreierText.AutoSize = True
Me.optFreierText.BackColor = System.Drawing.Color.WhiteSmoke Me.optFreierText.BackColor = System.Drawing.Color.WhiteSmoke
Me.optFreierText.Location = New System.Drawing.Point(12, 329) Me.optFreierText.Location = New System.Drawing.Point(12, 361)
Me.optFreierText.Name = "optFreierText" Me.optFreierText.Name = "optFreierText"
Me.optFreierText.Size = New System.Drawing.Size(105, 17) Me.optFreierText.Size = New System.Drawing.Size(105, 17)
Me.optFreierText.TabIndex = 27 Me.optFreierText.TabIndex = 27
@@ -393,7 +425,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.optATAangefordert.AutoSize = True Me.optATAangefordert.AutoSize = True
Me.optATAangefordert.BackColor = System.Drawing.Color.WhiteSmoke Me.optATAangefordert.BackColor = System.Drawing.Color.WhiteSmoke
Me.optATAangefordert.Location = New System.Drawing.Point(164, 426) Me.optATAangefordert.Location = New System.Drawing.Point(164, 458)
Me.optATAangefordert.Name = "optATAangefordert" Me.optATAangefordert.Name = "optATAangefordert"
Me.optATAangefordert.Size = New System.Drawing.Size(208, 17) Me.optATAangefordert.Size = New System.Drawing.Size(208, 17)
Me.optATAangefordert.TabIndex = 15 Me.optATAangefordert.TabIndex = 15
@@ -424,7 +456,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.Label3.AutoSize = True Me.Label3.AutoSize = True
Me.Label3.BackColor = System.Drawing.Color.WhiteSmoke Me.Label3.BackColor = System.Drawing.Color.WhiteSmoke
Me.Label3.Location = New System.Drawing.Point(308, 303) Me.Label3.Location = New System.Drawing.Point(308, 335)
Me.Label3.Name = "Label3" Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(57, 13) Me.Label3.Size = New System.Drawing.Size(57, 13)
Me.Label3.TabIndex = 22 Me.Label3.TabIndex = 22
@@ -434,7 +466,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.lblErr240Zeichen.AutoSize = True Me.lblErr240Zeichen.AutoSize = True
Me.lblErr240Zeichen.ForeColor = System.Drawing.Color.Red Me.lblErr240Zeichen.ForeColor = System.Drawing.Color.Red
Me.lblErr240Zeichen.Location = New System.Drawing.Point(219, 464) Me.lblErr240Zeichen.Location = New System.Drawing.Point(219, 496)
Me.lblErr240Zeichen.Name = "lblErr240Zeichen" Me.lblErr240Zeichen.Name = "lblErr240Zeichen"
Me.lblErr240Zeichen.Size = New System.Drawing.Size(95, 13) Me.lblErr240Zeichen.Size = New System.Drawing.Size(95, 13)
Me.lblErr240Zeichen.TabIndex = 32 Me.lblErr240Zeichen.TabIndex = 32
@@ -446,7 +478,7 @@ Partial Class frmAddSendungsvermerkShort
Me.txtDetail.AcceptsReturn = True Me.txtDetail.AcceptsReturn = True
Me.txtDetail.BackColor = System.Drawing.Color.White Me.txtDetail.BackColor = System.Drawing.Color.White
Me.txtDetail.ForeColor = System.Drawing.SystemColors.InfoText Me.txtDetail.ForeColor = System.Drawing.SystemColors.InfoText
Me.txtDetail.Location = New System.Drawing.Point(12, 480) Me.txtDetail.Location = New System.Drawing.Point(12, 512)
Me.txtDetail.MaxLength = 240 Me.txtDetail.MaxLength = 240
Me.txtDetail.Multiline = True Me.txtDetail.Multiline = True
Me.txtDetail.Name = "txtDetail" Me.txtDetail.Name = "txtDetail"
@@ -459,7 +491,7 @@ Partial Class frmAddSendungsvermerkShort
'lblZustzlFreitext 'lblZustzlFreitext
' '
Me.lblZustzlFreitext.AutoSize = True Me.lblZustzlFreitext.AutoSize = True
Me.lblZustzlFreitext.Location = New System.Drawing.Point(9, 464) Me.lblZustzlFreitext.Location = New System.Drawing.Point(9, 496)
Me.lblZustzlFreitext.Name = "lblZustzlFreitext" Me.lblZustzlFreitext.Name = "lblZustzlFreitext"
Me.lblZustzlFreitext.Size = New System.Drawing.Size(142, 13) Me.lblZustzlFreitext.Size = New System.Drawing.Size(142, 13)
Me.lblZustzlFreitext.TabIndex = 31 Me.lblZustzlFreitext.TabIndex = 31
@@ -469,7 +501,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.txtSendungSpedition.BackColor = System.Drawing.Color.WhiteSmoke Me.txtSendungSpedition.BackColor = System.Drawing.Color.WhiteSmoke
Me.txtSendungSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtSendungSpedition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 300) Me.txtSendungSpedition.Location = New System.Drawing.Point(144, 332)
Me.txtSendungSpedition.MaxLength = 50 Me.txtSendungSpedition.MaxLength = 50
Me.txtSendungSpedition.Name = "txtSendungSpedition" Me.txtSendungSpedition.Name = "txtSendungSpedition"
Me.txtSendungSpedition.Size = New System.Drawing.Size(25, 20) Me.txtSendungSpedition.Size = New System.Drawing.Size(25, 20)
@@ -490,7 +522,7 @@ Partial Class frmAddSendungsvermerkShort
'btnOK 'btnOK
' '
Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnOK.Location = New System.Drawing.Point(320, 480) Me.btnOK.Location = New System.Drawing.Point(320, 512)
Me.btnOK.Name = "btnOK" Me.btnOK.Name = "btnOK"
Me.btnOK.Size = New System.Drawing.Size(124, 54) Me.btnOK.Size = New System.Drawing.Size(124, 54)
Me.btnOK.TabIndex = 34 Me.btnOK.TabIndex = 34
@@ -513,7 +545,7 @@ Partial Class frmAddSendungsvermerkShort
Me.Label9.AutoSize = True Me.Label9.AutoSize = True
Me.Label9.BackColor = System.Drawing.Color.WhiteSmoke Me.Label9.BackColor = System.Drawing.Color.WhiteSmoke
Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
Me.Label9.Location = New System.Drawing.Point(354, 353) Me.Label9.Location = New System.Drawing.Point(354, 385)
Me.Label9.Name = "Label9" Me.Label9.Name = "Label9"
Me.Label9.Size = New System.Drawing.Size(90, 13) Me.Label9.Size = New System.Drawing.Size(90, 13)
Me.Label9.TabIndex = 30 Me.Label9.TabIndex = 30
@@ -546,7 +578,7 @@ Partial Class frmAddSendungsvermerkShort
Me.Label17.AutoSize = True Me.Label17.AutoSize = True
Me.Label17.BackColor = System.Drawing.Color.WhiteSmoke Me.Label17.BackColor = System.Drawing.Color.WhiteSmoke
Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Italic) Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Italic)
Me.Label17.Location = New System.Drawing.Point(144, 353) Me.Label17.Location = New System.Drawing.Point(144, 385)
Me.Label17.Name = "Label17" Me.Label17.Name = "Label17"
Me.Label17.Size = New System.Drawing.Size(182, 13) Me.Label17.Size = New System.Drawing.Size(182, 13)
Me.Label17.TabIndex = 29 Me.Label17.TabIndex = 29
@@ -557,7 +589,7 @@ Partial Class frmAddSendungsvermerkShort
Me.Label13.AutoSize = True Me.Label13.AutoSize = True
Me.Label13.BackColor = System.Drawing.Color.WhiteSmoke Me.Label13.BackColor = System.Drawing.Color.WhiteSmoke
Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label13.Location = New System.Drawing.Point(9, 275) Me.Label13.Location = New System.Drawing.Point(9, 307)
Me.Label13.Name = "Label13" Me.Label13.Name = "Label13"
Me.Label13.Size = New System.Drawing.Size(84, 17) Me.Label13.Size = New System.Drawing.Size(84, 17)
Me.Label13.TabIndex = 16 Me.Label13.TabIndex = 16
@@ -589,7 +621,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.txtFreierText.BackColor = System.Drawing.Color.WhiteSmoke Me.txtFreierText.BackColor = System.Drawing.Color.WhiteSmoke
Me.txtFreierText.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtFreierText.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
Me.txtFreierText.Location = New System.Drawing.Point(122, 327) Me.txtFreierText.Location = New System.Drawing.Point(122, 359)
Me.txtFreierText.MaxLength = 80 Me.txtFreierText.MaxLength = 80
Me.txtFreierText.Name = "txtFreierText" Me.txtFreierText.Name = "txtFreierText"
Me.txtFreierText.Size = New System.Drawing.Size(322, 23) Me.txtFreierText.Size = New System.Drawing.Size(322, 23)
@@ -610,7 +642,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.Label20.AutoSize = True Me.Label20.AutoSize = True
Me.Label20.BackColor = System.Drawing.Color.WhiteSmoke Me.Label20.BackColor = System.Drawing.Color.WhiteSmoke
Me.Label20.Location = New System.Drawing.Point(267, 303) Me.Label20.Location = New System.Drawing.Point(267, 335)
Me.Label20.Name = "Label20" Me.Label20.Name = "Label20"
Me.Label20.Size = New System.Drawing.Size(0, 13) Me.Label20.Size = New System.Drawing.Size(0, 13)
Me.Label20.TabIndex = 21 Me.Label20.TabIndex = 21
@@ -640,7 +672,7 @@ Partial Class frmAddSendungsvermerkShort
' '
Me.PictureBox4.BackColor = System.Drawing.Color.WhiteSmoke Me.PictureBox4.BackColor = System.Drawing.Color.WhiteSmoke
Me.PictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.PictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.PictureBox4.Location = New System.Drawing.Point(-1, 265) Me.PictureBox4.Location = New System.Drawing.Point(-1, 297)
Me.PictureBox4.Name = "PictureBox4" Me.PictureBox4.Name = "PictureBox4"
Me.PictureBox4.Size = New System.Drawing.Size(453, 189) Me.PictureBox4.Size = New System.Drawing.Size(453, 189)
Me.PictureBox4.TabIndex = 78 Me.PictureBox4.TabIndex = 78
@@ -656,41 +688,21 @@ Partial Class frmAddSendungsvermerkShort
Me.Panel4.Size = New System.Drawing.Size(454, 0) Me.Panel4.Size = New System.Drawing.Size(454, 0)
Me.Panel4.TabIndex = 1 Me.Panel4.TabIndex = 1
' '
'optGewPackAngefordert 'optDraft
' '
Me.optGewPackAngefordert.AutoSize = True Me.optDraft.AutoSize = True
Me.optGewPackAngefordert.Location = New System.Drawing.Point(12, 236) Me.optDraft.Location = New System.Drawing.Point(12, 262)
Me.optGewPackAngefordert.Name = "optGewPackAngefordert" Me.optDraft.Name = "optDraft"
Me.optGewPackAngefordert.Size = New System.Drawing.Size(245, 17) Me.optDraft.Size = New System.Drawing.Size(174, 17)
Me.optGewPackAngefordert.TabIndex = 101 Me.optDraft.TabIndex = 102
Me.optGewPackAngefordert.Text = "Gewicht/Packstücke mangelhaft - angefordert" Me.optDraft.Text = "T1/T2 ""Draft"" OK - angefordert"
Me.optGewPackAngefordert.UseVisualStyleBackColor = True Me.optDraft.UseVisualStyleBackColor = True
'
'optKostenbestaetigungAngefordert
'
Me.optKostenbestaetigungAngefordert.AutoSize = True
Me.optKostenbestaetigungAngefordert.Location = New System.Drawing.Point(270, 214)
Me.optKostenbestaetigungAngefordert.Name = "optKostenbestaetigungAngefordert"
Me.optKostenbestaetigungAngefordert.Size = New System.Drawing.Size(177, 17)
Me.optKostenbestaetigungAngefordert.TabIndex = 99
Me.optKostenbestaetigungAngefordert.Text = "Kostenbestätigung - angefordert"
Me.optKostenbestaetigungAngefordert.UseVisualStyleBackColor = True
'
'optZolltarifnummerAngefordert
'
Me.optZolltarifnummerAngefordert.AutoSize = True
Me.optZolltarifnummerAngefordert.Location = New System.Drawing.Point(12, 214)
Me.optZolltarifnummerAngefordert.Name = "optZolltarifnummerAngefordert"
Me.optZolltarifnummerAngefordert.Size = New System.Drawing.Size(154, 17)
Me.optZolltarifnummerAngefordert.TabIndex = 98
Me.optZolltarifnummerAngefordert.Text = "Zolltarifnummer angefordert"
Me.optZolltarifnummerAngefordert.UseVisualStyleBackColor = True
' '
'frmAddSendungsvermerkShort 'frmAddSendungsvermerkShort
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(454, 563) Me.ClientSize = New System.Drawing.Size(454, 605)
Me.Controls.Add(Me.pnlMain) Me.Controls.Add(Me.pnlMain)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -759,4 +771,5 @@ Partial Class frmAddSendungsvermerkShort
Friend WithEvents optGewPackAngefordert As CheckBox Friend WithEvents optGewPackAngefordert As CheckBox
Friend WithEvents optKostenbestaetigungAngefordert As CheckBox Friend WithEvents optKostenbestaetigungAngefordert As CheckBox
Friend WithEvents optZolltarifnummerAngefordert As CheckBox Friend WithEvents optZolltarifnummerAngefordert As CheckBox
Friend WithEvents optDraft As CheckBox
End Class End Class

View File

@@ -175,6 +175,7 @@ Public Class frmAddSendungsvermerkShort
If optFremd_ATB.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATB von Fremdeinsteller erhalten bei Sendung '" & txtSendung.Text.Trim & "' ", 72) If optFremd_ATB.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "ATB von Fremdeinsteller erhalten bei Sendung '" & txtSendung.Text.Trim & "' ", 72)
If optFremd_SendungAvisiert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' an Fremdeinsteller avisiert", 73) If optFremd_SendungAvisiert.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' an Fremdeinsteller avisiert", 73)
' If optSndUmmelden.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' umgemeldet", 94) ' If optSndUmmelden.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Sendung '" & txtSendung.Text.Trim & "' umgemeldet", 94)
If optDraft.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "T2 Draft OK bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 118)
If optUeberwachungsdok.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Ü-Dok bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 53) If optUeberwachungsdok.Checked Then insertSendungsVermerk(SendungID, myAviso.AvisoID, "Ü-Dok bei Sendung '" & txtSendung.Text.Trim & "' - angefordert", 53)

View File

@@ -97,21 +97,25 @@ Public Class frmEintragAviso
kdAvisierer.initKdBox(Me) kdAvisierer.initKdBox(Me)
kdAuftraggeber.initKdBox(Me) kdAuftraggeber.initKdBox(Me)
Select Case FIRMA_TMP
Case "ATILLA"
cboGrenzstelle.Items.Clear()
cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Grenzstelle] IN ('SUB','NEU') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False)
cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
'cboGrenzstelle.changeItem("")
Case Else
cboGrenzstelle.Items.Clear() cboGrenzstelle.Items.Clear()
cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & FIRMA_TMP & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE") cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & FIRMA_TMP & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE")
cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???")) cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
cboGrenzstelle.changeItem("") cboGrenzstelle.changeItem("")
End Select 'Select Case FIRMA_TMP
' Case "ATILLA"
' cboGrenzstelle.Items.Clear()
' cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Grenzstelle] IN ('SUB','NEU') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False)
' cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
' 'cboGrenzstelle.changeItem("")
' Case Else
' cboGrenzstelle.Items.Clear()
' cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & FIRMA_TMP & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE")
' cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
' cboGrenzstelle.changeItem("")
'End Select
cboTransportmittelart.Items.Clear() cboTransportmittelart.Items.Clear()
cboTransportmittelart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cboTransportmittelart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))

View File

@@ -5191,7 +5191,9 @@ ELSE_ATILLA:
End Sub End Sub
Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
VERAG_PROG_ALLGEMEIN.cBZST_UID_REST.CheckVat("DE", "147838463", "", "") 'geht ned - zugang
Exit Sub

View File

@@ -1359,6 +1359,15 @@ Public Class usrcntlAktDetails
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
Case "118"
myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
myVermerk.VermerkCodeId = 119
Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
End Select End Select
End If End If
@@ -1570,6 +1579,11 @@ Public Class usrcntlAktDetails
optionCell.Value = "Kostenbestätigung erhalten" optionCell.Value = "Kostenbestätigung erhalten"
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kostenbestätigung erhalten' einzutragen." optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kostenbestätigung erhalten' einzutragen."
End If End If
Case 118
If Not existCodeInGridVermerke(r, gridvermerke, 119, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
optionCell.Value = "T1/T2 Draft OK erhalten"
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'T1/T2 Draft OK ' einzutragen."
End If
End Select End Select
End If End If