diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb index bce699e..de5f84e 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb @@ -1,4 +1,5 @@ Imports DAKOSY_Worker.SumAErledigungsinformationVorpapier +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlBenachrichtigungen Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -269,13 +270,23 @@ Public Class usrCntlBenachrichtigungen Case Else 'Weiterleitung Akt/Snd If AB.BESTAETIGEN_BENACHRICHTIGUNG Then - 'Übermehmen - If AB.ab_Art = "A" Then - If Not ASF.AktUebernehmen(AB.ab_AvisoID, False, False, False) Then Exit Sub - ' If Not ASF.AktUebernehmen(AB.ab_AvisoID, False, False, True) Then Exit Sub - Else - If Not ASF.SendungUebernehmen(AB.ab_SendungID, AB.ab_AvisoID) Then Exit Sub - End If + Select Case AB.ab_BenachrichtigungCode + Case VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.Vorauskasse_OK + AvisoStatusFunctions.insertSendungsVermerk(AB.ab_SendungID, AB.ab_AvisoID, "Benachrichtigung 'Vorauskasse OK' bestätigt.", 46) + 'Akt nicht übernehmen + Case VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.ZOLL_Dokumentenbeschau + AvisoStatusFunctions.insertSendungsVermerk(AB.ab_SendungID, AB.ab_AvisoID, "Benachrichtigung 'ZOLL:Dokumentenbeschau' bestätigt.", 46) + 'Akt nicht übernehmen + Case Else + 'Weiterleitung --> Übermehmen + If AB.ab_Art = "A" Then + If Not ASF.AktUebernehmen(AB.ab_AvisoID, False, False, False) Then Exit Sub + ' If Not ASF.AktUebernehmen(AB.ab_AvisoID, False, False, True) Then Exit Sub + Else + If Not ASF.SendungUebernehmen(AB.ab_SendungID, AB.ab_AvisoID) Then Exit Sub + End If + + End Select 'VERMERK inserieren 'insertSendungsVermerk(SendungID, myAviso.AvisoID, "In die Neukunden-Abteilung gegeben.", 46) Dim f As New frmAvisoWeiterleitenBestaetigen(AB) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 68c82c4..440246c 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index d621d50..4a35dfc 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -579,11 +579,13 @@ Public Class frmHauptfenster End Sub Sub initEAviso() - If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '?? - Label22.Text = VERAGSQL.getValueTxtBySql("SELECT count(*) FROM [tblNCTS_TR] where ncts_AVISO_einarbeitet=0 AND ncts_Partnersystem='ATEZ'", "FMZOLL") '"XX" - If Label22.Text = "0" Then Label22.Text = "" - Label22.Visible = Label22.Text <> "" - Label22.BringToFront() + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then + If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '?? + Label22.Text = VERAGSQL.getValueTxtBySql("SELECT count(*) FROM [tblNCTS_TR] where ncts_AVISO_einarbeitet=0 AND ncts_Partnersystem='ATEZ'", "FMZOLL") '"XX" + If Label22.Text = "0" Then Label22.Text = "" + Label22.Visible = Label22.Text <> "" + Label22.BringToFront() + End If End Sub Public Sub setAktDetails(id, showSendungsdetails) Details_anzeigen(id) ', showSendungsdetails) diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index fbd4ad6..4a8e88c 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -24,10 +24,10 @@ 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 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 DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 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() @@ -391,6 +391,8 @@ Partial Class frmSendungsdetailsNEU Me.UNISPEDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AuftragATANAKToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ATANAKTRFraechter = New System.Windows.Forms.ToolStripMenuItem() + Me.ATANAKEUFraechter = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem26 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem27 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem25 = New System.Windows.Forms.ToolStripMenuItem() @@ -400,10 +402,10 @@ Partial Class frmSendungsdetailsNEU Me.AlleEIDRSendungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AktuelleSendungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.WarenortAMBARToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AuftragMOTISToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() 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.AuftragMOTISToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -1444,18 +1446,18 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - 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 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 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) @@ -1464,8 +1466,8 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.ReadOnly = True Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle7 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -2210,8 +2212,8 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle4.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle8.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle8 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 Me.clmnPreis.Name = "clmnPreis" @@ -5066,7 +5068,7 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.T1BestätigungToolStripMenuItem, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16, Me.AuftragATANAKToolStripMenuItem, Me.ToolStripMenuItem26, Me.ToolStripMenuItem27, Me.ToolStripMenuItem25, Me.GVMSInfoToolStripMenuItem, Me.WarenortAMBARToolStripMenuItem, Me.AuftragMOTISToolStripMenuItem}) Me.ContextMenuStrip1.Name = "cntxtAnh" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 356) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 334) ' 'ToolStripMenuItem15 ' @@ -5129,11 +5131,26 @@ Partial Class frmSendungsdetailsNEU ' 'AuftragATANAKToolStripMenuItem ' + Me.AuftragATANAKToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATANAKTRFraechter, Me.ATANAKEUFraechter}) Me.AuftragATANAKToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.email_big1 Me.AuftragATANAKToolStripMenuItem.Name = "AuftragATANAKToolStripMenuItem" Me.AuftragATANAKToolStripMenuItem.Size = New System.Drawing.Size(222, 30) Me.AuftragATANAKToolStripMenuItem.Text = "Auftrag DSG/ATANAK (UK)" ' + 'ATANAKTRFraechter + ' + Me.ATANAKTRFraechter.Image = CType(resources.GetObject("ATANAKTRFraechter.Image"), System.Drawing.Image) + Me.ATANAKTRFraechter.Name = "ATANAKTRFraechter" + Me.ATANAKTRFraechter.Size = New System.Drawing.Size(238, 30) + Me.ATANAKTRFraechter.Text = "ATANAK (TR Frächter)" + ' + 'ATANAKEUFraechter + ' + Me.ATANAKEUFraechter.Image = CType(resources.GetObject("ATANAKEUFraechter.Image"), System.Drawing.Image) + Me.ATANAKEUFraechter.Name = "ATANAKEUFraechter" + Me.ATANAKEUFraechter.Size = New System.Drawing.Size(238, 30) + Me.ATANAKEUFraechter.Text = "ATANAK (EU/andere Frächter)" + ' 'ToolStripMenuItem26 ' Me.ToolStripMenuItem26.Image = Global.AVISO.My.Resources.Resources.email_big1 @@ -5200,6 +5217,13 @@ Partial Class frmSendungsdetailsNEU Me.WarenortAMBARToolStripMenuItem.Text = "Warenort (AMBAR) " Me.WarenortAMBARToolStripMenuItem.Visible = False ' + 'AuftragMOTISToolStripMenuItem + ' + Me.AuftragMOTISToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.email_big1 + Me.AuftragMOTISToolStripMenuItem.Name = "AuftragMOTISToolStripMenuItem" + Me.AuftragMOTISToolStripMenuItem.Size = New System.Drawing.Size(222, 30) + Me.AuftragMOTISToolStripMenuItem.Text = "Auftrag MOTIS" + ' 'ContextMenuStrip2 ' Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -5222,13 +5246,6 @@ Partial Class frmSendungsdetailsNEU Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30) Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen" ' - 'AuftragMOTISToolStripMenuItem - ' - Me.AuftragMOTISToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.email_big1 - Me.AuftragMOTISToolStripMenuItem.Name = "AuftragMOTISToolStripMenuItem" - Me.AuftragMOTISToolStripMenuItem.Size = New System.Drawing.Size(222, 30) - Me.AuftragMOTISToolStripMenuItem.Text = "Auftrag MOTIS" - ' 'frmSendungsdetailsNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5666,7 +5683,6 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents ExportT1ToolStripMenuItem As ToolStripMenuItem Public WithEvents txtAnzahlPos As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label4 As Label - Friend WithEvents AuftragATANAKToolStripMenuItem As ToolStripMenuItem Friend WithEvents btnQuckScan As Button Friend WithEvents ToolStripMenuItem21 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem22 As ToolStripMenuItem @@ -5703,4 +5719,7 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents AMBARZollbeschauNEUToolStripMenuItem As ToolStripMenuItem Friend WithEvents WarenortAMBARToolStripMenuItem As ToolStripMenuItem Friend WithEvents AuftragMOTISToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AuftragATANAKToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ATANAKTRFraechter As ToolStripMenuItem + Friend WithEvents ATANAKEUFraechter As ToolStripMenuItem End Class diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index 9efdf68..6dd64c4 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -1531,6 +1531,9 @@ mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg== + + 296, 17 + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V @@ -1651,6 +1654,18 @@ True + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAHtJREFUSEvt @@ -1883,12 +1898,117 @@ 174, 17 + + 404, 17 + 596, 17 843, 17 + + + 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 diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 73108f9..5a54805 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -4981,7 +4981,7 @@ Public Class frmSendungsdetailsNEU End Sub - Private Sub AuftragATANAKToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AuftragATANAKToolStripMenuItem.Click + Private Sub AuftragATANAKToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATANAKTRFraechter.Click, ATANAKEUFraechter.Click Try VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("ClipBoard_TMP") @@ -4997,7 +4997,10 @@ Public Class frmSendungsdetailsNEU Mail.Subject = If(AVISO.ImEx <> "", AVISO.ImEx & " / ", "") & AVISO.LKW_Nr & " / " & "ETA: " & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & " // VERAG" 'Mail.To = "european@atanak.com" ' Mail.To = "european@dailygroupage.com" - Mail.To = "dover@atanak.com" + + If sender Is ATANAKEUFraechter Then Mail.To = "dover@atanak.com" + If sender Is ATANAKTRFraechter Then Mail.To = "european@atanak.com" + Dim TextHTML = "" TextHTML &= "Dear ATANAK Team,
"