diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 70662ed6..d16a939a 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -376,16 +376,24 @@ Public Class cFakturierung Else If VK IsNot Nothing AndAlso CDbl(VK.vk_Betrag) > 0 Then If VK.vk_GeldEingetroffen Then ' Wenn 0 dann Fehler - If CDbl(VK.vk_Betrag) = CDbl(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) Then + Dim diff As Double = CDbl(VK.vk_Betrag) - CDbl(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) + If diff = 0 Then Select Case RECHNUNG.RechnungSprache Case "EN" : strText = strText & "The invoice amount has already been paid in advance." & vbCrLf Case Else : strText = strText & "Der Rechnungsbetrag wurde bereits per Vorauszahlung beglichen." & vbCrLf End Select Else - Select Case RECHNUNG.RechnungSprache - Case "EN" : strText = strText & "An advance payment has already been made for this invoice, please transfer the difference." & vbCrLf - Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, bitte überweisen Sie den Differenzbetrag." & vbCrLf - End Select + If diff > 0 Then 'Guthaben + Select Case RECHNUNG.RechnungSprache + Case "EN" : strText = strText & "An advance payment has already been made for this invoice, resulting in a credit balance of " & diff.ToString("C2") & "." & vbCrLf + Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, daraus ergibt sich ein Guthaben von " & diff.ToString("C2") & "." & vbCrLf + End Select + Else 'Nachzahlung + Select Case RECHNUNG.RechnungSprache + Case "EN" : strText = strText & "An advance payment has already been made for this invoice, please transfer the difference." & vbCrLf + Case Else : strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, bitte überweisen Sie den Differenzbetrag." & vbCrLf + End Select + End If End If End If End If diff --git a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb index 7e76727c..57f4241b 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb @@ -119,7 +119,9 @@ Partial Class frmRechnungenSuche Me.EVOLOGSammelrechnungAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnl = New System.Windows.Forms.Panel() - Me.Button9 = New System.Windows.Forms.Button() + Me.btnPDF = New System.Windows.Forms.Button() + Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() Me.FlatButton7 = New System.Windows.Forms.Button() Me.lblErgebnis = New System.Windows.Forms.Label() @@ -130,8 +132,6 @@ Partial Class frmRechnungenSuche Me.Label4 = New System.Windows.Forms.Label() Me.pnlTop = New System.Windows.Forms.Panel() Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -149,8 +149,8 @@ Partial Class frmRechnungenSuche Me.pnlBerichte.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnl.SuspendLayout() - Me.pnlTop.SuspendLayout() Me.ctxtRg.SuspendLayout() + Me.pnlTop.SuspendLayout() Me.SuspendLayout() ' 'SplitContainer @@ -1653,27 +1653,41 @@ Partial Class frmRechnungenSuche ' 'pnl ' - Me.pnl.Controls.Add(Me.Button9) + Me.pnl.Controls.Add(Me.btnPDF) Me.pnl.Dock = System.Windows.Forms.DockStyle.Left Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" Me.pnl.Size = New System.Drawing.Size(233, 68) Me.pnl.TabIndex = 5 ' - 'Button9 + 'btnPDF ' - Me.Button9.ContextMenuStrip = Me.ctxtRg - Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button9.Image = Global.SDL.My.Resources.Resources.pdf1 - Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(16, 4) - Me.Button9.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) - Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(105, 57) - Me.Button9.TabIndex = 93 - Me.Button9.Text = "Als PDF" - Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button9.UseVisualStyleBackColor = True + Me.btnPDF.ContextMenuStrip = Me.ctxtRg + Me.btnPDF.Enabled = False + Me.btnPDF.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnPDF.Image = Global.SDL.My.Resources.Resources.pdf1 + Me.btnPDF.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnPDF.Location = New System.Drawing.Point(16, 4) + Me.btnPDF.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) + Me.btnPDF.Name = "btnPDF" + Me.btnPDF.Size = New System.Drawing.Size(105, 57) + Me.btnPDF.TabIndex = 93 + Me.btnPDF.Text = "Als PDF" + Me.btnPDF.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnPDF.UseVisualStyleBackColor = True + ' + 'ctxtRg + ' + Me.ctxtRg.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiHochladenToolStripMenuItem}) + Me.ctxtRg.Name = "ctxtRg" + Me.ctxtRg.Size = New System.Drawing.Size(197, 26) + ' + 'DateiHochladenToolStripMenuItem + ' + Me.DateiHochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf + Me.DateiHochladenToolStripMenuItem.Name = "DateiHochladenToolStripMenuItem" + Me.DateiHochladenToolStripMenuItem.Size = New System.Drawing.Size(196, 22) + Me.DateiHochladenToolStripMenuItem.Text = "PDF in Zwischenablage" ' 'btnExcel ' @@ -1773,19 +1787,6 @@ Partial Class frmRechnungenSuche Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19) Me.TestToolStripMenuItem.Text = "test" ' - 'ctxtRg - ' - Me.ctxtRg.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiHochladenToolStripMenuItem}) - Me.ctxtRg.Name = "ctxtRg" - Me.ctxtRg.Size = New System.Drawing.Size(197, 48) - ' - 'DateiHochladenToolStripMenuItem - ' - Me.DateiHochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf - Me.DateiHochladenToolStripMenuItem.Name = "DateiHochladenToolStripMenuItem" - Me.DateiHochladenToolStripMenuItem.Size = New System.Drawing.Size(196, 22) - Me.DateiHochladenToolStripMenuItem.Text = "PDF in Zwischenablage" - ' 'frmRechnungenSuche ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -1821,9 +1822,9 @@ Partial Class frmRechnungenSuche Me.MenuStrip1.ResumeLayout(False) Me.MenuStrip1.PerformLayout() Me.pnl.ResumeLayout(False) + Me.ctxtRg.ResumeLayout(False) Me.pnlTop.ResumeLayout(False) Me.pnlTop.PerformLayout() - Me.ctxtRg.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1932,7 +1933,7 @@ Partial Class frmRechnungenSuche Friend WithEvents Button3 As Button Friend WithEvents Label19 As Label Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents Button9 As Button + Friend WithEvents btnPDF As Button Friend WithEvents ctxtRg As ContextMenuStrip Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/Fakturierung/frmRechnungenSuche.resx b/SDL/Fakturierung/frmRechnungenSuche.resx index 1d191c20..a5c52092 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.resx +++ b/SDL/Fakturierung/frmRechnungenSuche.resx @@ -126,12 +126,6 @@ 316, 17 - - 431, 17 - - - 316, 17 - @@ -180,7 +174,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB3VJREFUSEu9VntQ1NUe + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAB3VJREFUSEu9VntQ1NUe /86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C @@ -262,7 +256,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB3VJREFUSEu9VntQ1NUe + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAB3VJREFUSEu9VntQ1NUe /86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C @@ -344,7 +338,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB3VJREFUSEu9VntQ1NUe + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAB3VJREFUSEu9VntQ1NUe /86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C @@ -379,6 +373,9 @@ +pba6dFrM1PV1UllydvKbJK3ltKLlYvIQffynwNyXv+PBvofzgNyIxLbwtkAAAAASUVORK5CYII= + + 431, 17 + AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb index 40360203..61e34cfb 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.vb @@ -1,4 +1,5 @@ Imports System.Data.SqlClient +Imports TAlex.WPF.Helpers Public Class frmRechnungenSuche Dim SQL As New SQL @@ -64,7 +65,7 @@ Public Class frmRechnungenSuche '.Columns("Absender").HeaderText = "Absender" '.Columns("Absender").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("Vermittler").MinimumWidth = 150 + .Columns("Vermittler").MinimumWidth = 150 .Columns("Vermittler").HeaderText = "Auftraggeber" .Columns("Vermittler").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill @@ -72,7 +73,7 @@ Public Class frmRechnungenSuche '.Columns("Empfänger").HeaderText = "Empfänger" '.Columns("Empfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("LKW Kennzeichen").Width = 120 + .Columns("LKW Kennzeichen").Width = 120 .Columns("LKW Kennzeichen").HeaderText = "LKW Kennzeichen" .Columns("Sachbearbeiter").MinimumWidth = 100 @@ -182,7 +183,7 @@ Public Class frmRechnungenSuche list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KdFrachtfuehrerKdNr", KdFrachtfuehrerKdnr.Text.Replace("*", "%"))) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KdFrachtfuehrer", KdFrachtfuehrer.Text.Replace("*", "%"))) - + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Datum_von", txtAbfertDat.Text & " 00:00:00")) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Datum_bis", txtAbfertDatBis.Text & " 23:59:59")) If txtAbfertigungsnummerBis.Text <> "" Then @@ -231,7 +232,7 @@ Public Class frmRechnungenSuche cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) 'ComboBox1.fillWithSQL("SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", True, "FMZOLL") MyListBox1.fillWithSQL(" SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", , "FMZOLL") - Button4.PerformClick() + Button4.PerformClick() Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then @@ -372,7 +373,7 @@ Public Class frmRechnungenSuche End If End Sub - Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick + Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick ', DataGridView.CellContentDoubleClick If DataGridView.SelectedRows.Count = 0 Then Exit Sub Dim f As New frmKundenUebersichtZollRgDetails(DataGridView.SelectedRows(0).Cells("RK_ID").Value) @@ -806,7 +807,7 @@ Public Class frmRechnungenSuche Return list End Function - Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles Button9.Click + Private Sub Button9_Click_1(sender As Object, e As EventArgs) Handles btnPDF.Click Me.Cursor = Cursors.WaitCursor Try For Each RK_ID In getList_RK_ID() @@ -841,4 +842,8 @@ Public Class frmRechnungenSuche End Try Me.Cursor = Cursors.Default End Sub + + Private Sub DataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridView.SelectionChanged + btnPDF.Enabled = (DataGridView.SelectedRows.Count > 0) + End Sub End Class \ No newline at end of file diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 3be9c4b8..6685acfd 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb index c3a21377..24eb36dc 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb @@ -104,8 +104,8 @@ Public Class rptKontrolleLKW_NCTSTR sqlStrSUB &= " order by cast(ncts_Eroeffnung as date),ncts_ObjectName" - 'MsgBox(sqlStr) - 'MsgBox(sqlStrSUB) + ' MsgBox(sqlStr) + ' MsgBox(sqlStrSUB) SUB_DATA = kundenSQL.loadDgvBySql(sqlStrSUB, "FMZOLL", 1000) diff --git a/SDL/Reports/Zoll/subrptKontrolleLKW_Dakosy.vb b/SDL/Reports/Zoll/subrptKontrolleLKW_Dakosy.vb index f337b13b..3f4fec91 100644 --- a/SDL/Reports/Zoll/subrptKontrolleLKW_Dakosy.vb +++ b/SDL/Reports/Zoll/subrptKontrolleLKW_Dakosy.vb @@ -37,9 +37,21 @@ Public Class subrptKontrolleLKW_Dakosy 'lblArbNrValue.Text = nullStr(Fields.Item("ArbNr").Value) lblMRNValue.Text = nullStr(Fields.Item("ncts_MRN").Value) '.Text = nullStr(Fields.Item("Pos").Value) - lblAnDatValue.Text = nullDat(Fields.Item("ncts_Eroeffnung").Value) + + If Fields.Item("ncts_Eroeffnung") IsNot Nothing AndAlso Fields.Item("ncts_Eroeffnung").Value IsNot DBNull.Value Then + lblAnDatValue.Text = nullDat(Fields.Item("ncts_Eroeffnung").Value) + Else + lblAnDatValue.Text = nullDat(Fields.Item("ncts_Trans_DatumZeit").Value) + End If + + + If Fields.Item("ncts_Ankunft") IsNot Nothing AndAlso Fields.Item("ncts_Ankunft").Value IsNot DBNull.Value Then + lblGestDatValue.Text = nullDat(Fields.Item("ncts_Ankunft").Value) + Else + lblGestDatValue.Text = nullDat(Fields.Item("ncts_GestelltAm").Value) + End If + ' lblAnDatValue.Text = nullDat(Fields.Item("ncts_Trans_DatumZeit").Value) - lblGestDatValue.Text = nullDat(Fields.Item("ncts_Ankunft").Value) lblSBValue.Text = nullStr(Fields.Item("ncts_Bearbeiter").Value) lblBuergschaft.Text = nullStr(Fields.Item("nctsSA_GRN").Value) If Not Fields.Item("nctsSA_AbgabenBetrag").Value Is DBNull.Value Then diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb index c032a85f..e3e7c701 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb @@ -1,6 +1,7 @@ Imports DAKOSY_Worker Imports Tamir Imports Tamir.SharpSsh +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlATLAS_AES @@ -438,6 +439,13 @@ Public Class usrCntlATLAS_AES End If DY_ANM.UPDATE_DATA() + + + + 'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist. + DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId) + + Me.FindForm.Close() End If End Sub diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb index 594d8bad..339436ce 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb @@ -2,6 +2,7 @@ Imports Tamir Imports Tamir.SharpSsh Imports Microsoft.Office.Interop +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlATLAS_EZA @@ -9,7 +10,8 @@ Public Class usrCntlATLAS_EZA Property ADRESSEN As usrCntlATLAS_EZA_Adressen Property POSITIONEN As usrCntlATLAS_EZA_Positionen Property DV1 As usrCntlATLAS_EZA_DV1 - + + Property Jahr2Stellig As Integer @@ -374,7 +376,7 @@ Public Class usrCntlATLAS_EZA '==> VORBLENDUNG: ' Dim cdy As New cDakosyEZA - cdy.EZA_ObjectName = BezugsNr + cdy.eza_ObjectName = BezugsNr ' cdy.EZA_AbgangsDienststellennummer = "DE004102" 'frmZollanmeldung.setAbgangszollstelle(cdy.eza_Eingangszollstelle, AVISO) frmZollanmeldung.setZollstelle(cdy.eza_AdressierteZollstelle, AVISO) @@ -383,7 +385,7 @@ Public Class usrCntlATLAS_EZA End If ' cdy.EZA_VersendungsLandCode = "DE" - cdy.EZA_dyaArt = cDy_ART + cdy.eza_dyaArt = cDy_ART If AVISO IsNot Nothing Then ' cdy.EZA_Befoerderungsmittel_KennzeichenAbgang = AVISO.LKW_Nr ' cdy.EZA_Befoerderungsmittel_KennzeichenGrenzueberschreitend = "X" @@ -671,7 +673,7 @@ Public Class usrCntlATLAS_EZA Sub loadDYZollanmeldungen(Optional Status As String = "") ' + Speichern If DY_ANM Is Nothing Then - DY_ANM = New cDakosy_Zollanmeldungen(EZA.EZA_dyaAnmID) + DY_ANM = New cDakosy_Zollanmeldungen(EZA.eza_dyaAnmID) End If DY_ANM.dy_ART = ALLG.EZA_ART 'cDy_ART DY_ANM.dy_BezugsNr = BezugsNr @@ -706,11 +708,14 @@ Public Class usrCntlATLAS_EZA Else If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen. End If - End If + End If End If End If DY_ANM.UPDATE_DATA() + 'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist. + DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId) + Me.FindForm.Close() @@ -730,10 +735,10 @@ Public Class usrCntlATLAS_EZA If EZA IsNot Nothing Then 'Dim cDY As New cDakosyEZA(cDyAnm.dy_Id, cDyAnm.dy_Erstellung_SB) - EZA.EZA_dyaAnmID = DY_ANM.dy_Id - EZA.EZA_Erstellung_SB = DY_ANM.dy_Erstellung_SB - EZA.EZA_LetzteBearbeitung = Now - EZA.EZA_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB + EZA.eza_dyaAnmID = DY_ANM.dy_Id + EZA.eza_Erstellung_SB = DY_ANM.dy_Erstellung_SB + EZA.eza_LetzteBearbeitung = Now + EZA.eza_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB DAKOSY_Interface_SEND.loadInClass_VersandanmeldungEZA(EZA, Me, DY_ANM) If Not EZA.SAVE_ALL() Then diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb index d2672600..23805fd1 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb @@ -580,6 +580,10 @@ Public Class usrCntlATLAS_NCTS End If DY_ANM.UPDATE_DATA() + + 'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist. + DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId) + Me.FindForm.Close() End If Me.Cursor = Cursors.Default diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 66b934af..5506ec51 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -215,7 +215,8 @@ Public Class cProgramFunctions If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat395] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat397] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") Else - docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].TheCat398 WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") + docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].TheCat889 WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") + If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat398] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat291] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat153] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat119] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON") diff --git a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb index da48788b..0ff43655 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb @@ -35,12 +35,10 @@ Partial Class frmKundenUebersichtZOLL Me.tabZolltarife = New System.Windows.Forms.TabPage() Me.pnlZollTarife = New System.Windows.Forms.Panel() Me.tabKundendaten = New System.Windows.Forms.TabPage() - Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht() Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.tbcntrKundenDaten = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbStatistik = New System.Windows.Forms.TabPage() Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button1 = New System.Windows.Forms.Button() @@ -143,6 +141,11 @@ Partial Class frmKundenUebersichtZOLL Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.btnRgPdf = New System.Windows.Forms.Button() + Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.ContextMenuStrip1.SuspendLayout() Me.tabZolltarife.SuspendLayout() Me.tabKundendaten.SuspendLayout() @@ -167,6 +170,7 @@ Partial Class frmKundenUebersichtZOLL Me.pnlTop.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip3.SuspendLayout() + Me.ctxtRg.SuspendLayout() Me.SuspendLayout() ' 'ContextMenuStrip1 @@ -213,17 +217,6 @@ Partial Class frmKundenUebersichtZOLL Me.tabKundendaten.TabIndex = 0 Me.tabKundendaten.Text = "Kundendaten" ' - 'usrcntlKundenuebersicht - ' - Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White - Me.usrcntlKundenuebersicht.BER_STUFE = 0 - Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) - Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" - Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691) - Me.usrcntlKundenuebersicht.TabIndex = 0 - ' 'ContextMenuStrip2 ' Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -267,16 +260,6 @@ Partial Class frmKundenUebersichtZOLL Me.TabPage1.TabIndex = 2 Me.TabPage1.Text = "Offerte" ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691) - Me.UsrCntlOfferte1.TabIndex = 0 - ' 'tbStatistik ' Me.tbStatistik.BackColor = System.Drawing.Color.White @@ -851,6 +834,7 @@ Partial Class frmKundenUebersichtZOLL ' 'MyPanel1 ' + Me.MyPanel1.Controls.Add(Me.btnRgPdf) Me.MyPanel1.Controls.Add(Me.btnMonat) Me.MyPanel1.Controls.Add(Me.Button10) Me.MyPanel1.Controls.Add(Me.Button11) @@ -1412,6 +1396,56 @@ Partial Class frmKundenUebersichtZOLL Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'ctxtRg + ' + Me.ctxtRg.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiHochladenToolStripMenuItem}) + Me.ctxtRg.Name = "ctxtRg" + Me.ctxtRg.Size = New System.Drawing.Size(197, 26) + ' + 'DateiHochladenToolStripMenuItem + ' + Me.DateiHochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf + Me.DateiHochladenToolStripMenuItem.Name = "DateiHochladenToolStripMenuItem" + Me.DateiHochladenToolStripMenuItem.Size = New System.Drawing.Size(196, 22) + Me.DateiHochladenToolStripMenuItem.Text = "PDF in Zwischenablage" + ' + 'btnRgPdf + ' + Me.btnRgPdf.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnRgPdf.ContextMenuStrip = Me.ctxtRg + Me.btnRgPdf.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnRgPdf.Image = Global.SDL.My.Resources.Resources.pdf1 + Me.btnRgPdf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnRgPdf.Location = New System.Drawing.Point(1069, 2) + Me.btnRgPdf.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) + Me.btnRgPdf.Name = "btnRgPdf" + Me.btnRgPdf.Size = New System.Drawing.Size(105, 57) + Me.btnRgPdf.TabIndex = 212 + Me.btnRgPdf.Text = "Als PDF" + Me.btnRgPdf.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnRgPdf.UseVisualStyleBackColor = True + ' + 'usrcntlKundenuebersicht + ' + Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White + Me.usrcntlKundenuebersicht.BER_STUFE = 0 + Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) + Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" + Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691) + Me.usrcntlKundenuebersicht.TabIndex = 0 + ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'frmKundenUebersichtZOLL ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1457,6 +1491,7 @@ Partial Class frmKundenUebersichtZOLL Me.pnlTop.PerformLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip3.ResumeLayout(False) + Me.ctxtRg.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1573,4 +1608,7 @@ Partial Class frmKundenUebersichtZOLL Friend WithEvents ToolStripMenuItem11 As ToolStripMenuItem Friend WithEvents cboKundenblattFirma As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents SYSKAÜbertragToolStripMenuItem As ToolStripMenuItem + Friend WithEvents btnRgPdf As Button + Friend WithEvents ctxtRg As ContextMenuStrip + Friend WithEvents DateiHochladenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/kunden/frmKundenUebersichtZOLL.resx b/SDL/kunden/frmKundenUebersichtZOLL.resx index ab9806a9..e8c422c9 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.resx +++ b/SDL/kunden/frmKundenUebersichtZOLL.resx @@ -123,6 +123,9 @@ 518, 17 + + 832, 17 + 17, 17 diff --git a/SDL/kunden/frmKundenUebersichtZOLL.vb b/SDL/kunden/frmKundenUebersichtZOLL.vb index 842f2c3f..0a67cfc5 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.vb @@ -1252,9 +1252,9 @@ Public Class frmKundenUebersichtZOLL Else If If(KUNDE.EORITIN, "") = "" Then - MsgBox("Bitte EORI-Nr. eintragen!") - Exit Sub - End If + MsgBox("Bitte EORI-Nr. eintragen!") + Exit Sub + End If If DAKOSY_Worker.cDakosyFunftions.sendDataByKdNr(KUNDE.KundenNr) Then ' Application.StartupPath & "\Dakosy_SEND\") ' init(KUNDE.KundenNr) MsgBox("Daten gesendet!") @@ -1354,4 +1354,62 @@ Public Class frmKundenUebersichtZOLL f.ShowDialog(Me) End If End Sub + + Function getList_RK_ID() As List(Of Integer) + Dim listRgNr As New List(Of Integer) + Dim list As New List(Of Integer) + If dgvRg.SelectedRows.Count > 0 Then + For Each r As DataGridViewRow In dgvRg.SelectedRows + If listRgNr.FindIndex((Function(x) x.ToString = r.Cells("RechnungsNr").Value)) < 0 Then + list.Add(r.Cells("RK_ID").Value) + listRgNr.Add(r.Cells("RechnungsNr").Value) + End If + Next + End If + Return list + End Function + + + Private Sub Button9_Click(sender As Object, e As EventArgs) Handles btnRgPdf.Click + Me.Cursor = Cursors.WaitCursor + Try + For Each RK_ID In getList_RK_ID() + Dim RG_PATH = "" + cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 4, RG_PATH,,, True) + Process.Start(RG_PATH) + Next + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + Me.Cursor = Cursors.Default + End Sub + + Private Sub DateiHochladenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiHochladenToolStripMenuItem.Click + Me.Cursor = Cursors.WaitCursor + Try + + Dim list As New List(Of String) + + For Each RK_ID In getList_RK_ID() + Dim RG_PATH = "" + cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 4, RG_PATH,,, True) + list.Add(RG_PATH) + Next + + 'Zwischenablage + Clipboard.Clear() + Dim d As New DataObject(DataFormats.FileDrop, list.ToArray) + Clipboard.SetDataObject(d, True) + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + Me.Cursor = Cursors.Default + End Sub + + Private Sub dgvrg_SelectionChanged(sender As Object, e As EventArgs) Handles dgvRg.SelectionChanged + btnRgPdf.Enabled = (dgvRg.SelectedRows.Count > 0) + End Sub + End Class + + diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 90cbc390..232b3de4 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -22,6 +22,7 @@ Partial Class usrCntlKundenuebersicht 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + 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() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -35,7 +36,7 @@ Partial Class usrCntlKundenuebersicht Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip() + Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() Me.lblInaktiv = New System.Windows.Forms.Label() @@ -79,6 +80,7 @@ Partial Class usrCntlKundenuebersicht Me.Label15 = New System.Windows.Forms.Label() Me.lblAviso = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() + Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.lblAbfertigungsverbot = New System.Windows.Forms.Label() Me.Label45 = New System.Windows.Forms.Label() Me.txtSammelrechnung = New System.Windows.Forms.TextBox() @@ -97,7 +99,7 @@ Partial Class usrCntlKundenuebersicht Me.Label33 = New System.Windows.Forms.Label() Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label29 = New System.Windows.Forms.Label() - Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox() + Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.lblFisk = New System.Windows.Forms.Label() Me.txtAbf_ErsteAbfertigung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label41 = New System.Windows.Forms.Label() @@ -146,6 +148,7 @@ Partial Class usrCntlKundenuebersicht Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.tbKontaktSpez = New System.Windows.Forms.TabPage() + Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() Me.Label38 = New System.Windows.Forms.Label() Me.txtDebitorennr = New System.Windows.Forms.TextBox() Me.lblFwlFiskal = New System.Windows.Forms.LinkLabel() @@ -191,6 +194,7 @@ Partial Class usrCntlKundenuebersicht Me.Button8 = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() Me.tbAvisoMail = New System.Windows.Forms.TabPage() + Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.tbKdSpez = New System.Windows.Forms.TabPage() Me.Label14 = New System.Windows.Forms.Label() Me.Label43 = New System.Windows.Forms.Label() @@ -215,25 +219,25 @@ Partial Class usrCntlKundenuebersicht Me.lblUid = New System.Windows.Forms.TextBox() Me.lblEORI = New System.Windows.Forms.TextBox() Me.lblEORINr = New System.Windows.Forms.Label() - Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.lblFirma = New System.Windows.Forms.Label() - Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() @@ -242,9 +246,9 @@ Partial Class usrCntlKundenuebersicht Me.GültigungültigToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnReloadOP = New System.Windows.Forms.Button() Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() + Me.txtVerzolltBeiExport = New System.Windows.Forms.TextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.Panel9 = New System.Windows.Forms.Panel() Me.cntxtAddVM.SuspendLayout() Me.tbWeitereKundenDetails.SuspendLayout() Me.tbOfferten.SuspendLayout() @@ -293,6 +297,7 @@ Partial Class usrCntlKundenuebersicht Me.ContextMenuStrip3.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip4.SuspendLayout() + Me.Panel9.SuspendLayout() Me.SuspendLayout() ' 'cntxtAddVM @@ -800,13 +805,13 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.grpAbfertigung.BackColor = System.Drawing.Color.White + Me.grpAbfertigung.Controls.Add(Me.Panel9) Me.grpAbfertigung.Controls.Add(Me.rtbInfo) Me.grpAbfertigung.Controls.Add(Me.txtNeutralisierung) Me.grpAbfertigung.Controls.Add(Me.lblNeutralisierung) Me.grpAbfertigung.Controls.Add(Me.lklGanzerText) Me.grpAbfertigung.Controls.Add(Me.lblNoGespr) Me.grpAbfertigung.Controls.Add(Me.txtVorauskasse) - Me.grpAbfertigung.Controls.Add(Me.Label15) Me.grpAbfertigung.Controls.Add(Me.lblAviso) Me.grpAbfertigung.Controls.Add(Me.Label2) Me.grpAbfertigung.Controls.Add(Me.UsrCntlKundenBesonderheiten1) @@ -833,7 +838,6 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.Controls.Add(Me.Panel5) Me.grpAbfertigung.Controls.Add(Me.Panel7) Me.grpAbfertigung.Controls.Add(Me.lblVorkasse) - Me.grpAbfertigung.Controls.Add(Me.txtVerzolltBei) Me.grpAbfertigung.Cursor = System.Windows.Forms.Cursors.Default Me.grpAbfertigung.Location = New System.Drawing.Point(509, 3) Me.grpAbfertigung.Name = "grpAbfertigung" @@ -916,7 +920,7 @@ Partial Class usrCntlKundenuebersicht 'Label15 ' Me.Label15.AutoSize = True - Me.Label15.Location = New System.Drawing.Point(11, 237) + Me.Label15.Location = New System.Drawing.Point(3, 4) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(61, 13) Me.Label15.TabIndex = 15 @@ -945,6 +949,16 @@ Partial Class usrCntlKundenuebersicht Me.Label2.Text = "Aviso:" Me.Label2.Visible = False ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32) + Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" + Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) + Me.UsrCntlKundenBesonderheiten1.TabIndex = 6 + Me.UsrCntlKundenBesonderheiten1.Visible = False + ' 'lblAbfertigungsverbot ' Me.lblAbfertigungsverbot.BackColor = System.Drawing.Color.Red @@ -1781,14 +1795,14 @@ Partial Class usrCntlKundenuebersicht ' 'txtVerzolltBei ' - Me.txtVerzolltBei.BackColor = System.Drawing.Color.White + Me.txtVerzolltBei.BackColor = System.Drawing.Color.WhiteSmoke Me.txtVerzolltBei.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtVerzolltBei.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtVerzolltBei.ForeColor = System.Drawing.Color.Black - Me.txtVerzolltBei.Location = New System.Drawing.Point(78, 237) + Me.txtVerzolltBei.Location = New System.Drawing.Point(70, 4) Me.txtVerzolltBei.Name = "txtVerzolltBei" Me.txtVerzolltBei.ReadOnly = True - Me.txtVerzolltBei.Size = New System.Drawing.Size(295, 13) + Me.txtVerzolltBei.Size = New System.Drawing.Size(128, 13) Me.txtVerzolltBei.TabIndex = 16 ' 'grpAdresse @@ -2021,6 +2035,14 @@ Partial Class usrCntlKundenuebersicht Me.tbKontaktSpez.Text = "Spezifisch" Me.tbKontaktSpez.UseVisualStyleBackColor = True ' + 'ucKundenKontakte + ' + Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) + Me.ucKundenKontakte.Name = "ucKundenKontakte" + Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158) + Me.ucKundenKontakte.TabIndex = 0 + ' 'Label38 ' Me.Label38.AutoSize = True @@ -2647,6 +2669,15 @@ Partial Class usrCntlKundenuebersicht Me.tbAvisoMail.Text = "Aviso E-Mails" Me.tbAvisoMail.UseVisualStyleBackColor = True ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0 + ' 'tbKdSpez ' Me.tbKdSpez.Controls.Add(Me.Label14) @@ -3178,32 +3209,39 @@ Partial Class usrCntlKundenuebersicht Me.cboFirmaFMZOLL.TabIndex = 10 Me.cboFirmaFMZOLL.Visible = False ' - 'UsrCntlKundenBesonderheiten1 + 'txtVerzolltBeiExport ' - Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32) - Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" - Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) - Me.UsrCntlKundenBesonderheiten1.TabIndex = 6 - Me.UsrCntlKundenBesonderheiten1.Visible = False + Me.txtVerzolltBeiExport.BackColor = System.Drawing.Color.WhiteSmoke + Me.txtVerzolltBeiExport.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtVerzolltBeiExport.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtVerzolltBeiExport.ForeColor = System.Drawing.Color.Black + Me.txtVerzolltBeiExport.Location = New System.Drawing.Point(243, 4) + Me.txtVerzolltBeiExport.Name = "txtVerzolltBeiExport" + Me.txtVerzolltBeiExport.ReadOnly = True + Me.txtVerzolltBeiExport.Size = New System.Drawing.Size(106, 13) + Me.txtVerzolltBeiExport.TabIndex = 44 ' - 'ucKundenKontakte + 'Label3 ' - Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) - Me.ucKundenKontakte.Name = "ucKundenKontakte" - Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158) - Me.ucKundenKontakte.TabIndex = 0 + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(197, 4) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(40, 13) + Me.Label3.TabIndex = 45 + Me.Label3.Text = "Export:" ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 + 'Panel9 ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0 + Me.Panel9.BackColor = System.Drawing.Color.WhiteSmoke + Me.Panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel9.Controls.Add(Me.Label3) + Me.Panel9.Controls.Add(Me.Label15) + Me.Panel9.Controls.Add(Me.txtVerzolltBeiExport) + Me.Panel9.Controls.Add(Me.txtVerzolltBei) + Me.Panel9.Location = New System.Drawing.Point(7, 231) + Me.Panel9.Name = "Panel9" + Me.Panel9.Size = New System.Drawing.Size(356, 24) + Me.Panel9.TabIndex = 46 ' 'usrCntlKundenuebersicht ' @@ -3288,6 +3326,8 @@ Partial Class usrCntlKundenuebersicht Me.ContextMenuStrip3.ResumeLayout(False) Me.ContextMenuStrip2.ResumeLayout(False) Me.ContextMenuStrip4.ResumeLayout(False) + Me.Panel9.ResumeLayout(False) + Me.Panel9.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -3503,4 +3543,7 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents Panel7 As Panel Friend WithEvents btnVMhinzufuegen As Button Friend WithEvents Panel8 As Panel + Friend WithEvents Panel9 As Panel + Friend WithEvents Label3 As Label + Friend WithEvents txtVerzolltBeiExport As TextBox End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 4d46f1e1..21b6b01f 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -175,7 +175,9 @@ Public Class usrCntlKundenuebersicht Try tbWeitereKundenDetails.TabPages.Remove(tbUmsatz) - tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten) + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OP_LISTE", "SDL") Then + tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten) + End If tbcntrAllg.TabPages.Remove(tbAvisoMail) tbcntrAllg.TabPages.Remove(tbKdSpez) Catch ex As Exception @@ -272,10 +274,13 @@ Public Class usrCntlKundenuebersicht If ADRESSE IsNot Nothing AndAlso ADRESSE.LandKz = "TR" Then tbWeitereKundenDetails.TabPages.Add(tbUmsatz) tbWeitereKundenDetails.TabPages.Add(tbOffenePosten) + ElseIf VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OP_LISTE", "SDL") Then + tbWeitereKundenDetails.TabPages.Remove(tbOffenePosten) End If End If + initDGVUmsatz() initDGVOffenePosten() initDGVVollmachten() @@ -362,6 +367,10 @@ Public Class usrCntlKundenuebersicht End If End If End If + + If (VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" AndAlso ADRESSE IsNot Nothing AndAlso ADRESSE.LandKz = "TR") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OP_LISTE", "SDL") Then + dgvOffenePosten.Visible = True + End If Else lblFirma.Visible = False End If @@ -522,7 +531,15 @@ Public Class usrCntlKundenuebersicht txtVerzolltBei.BackColor = Color.Yellow Else txtVerzolltBei.Text = "" - txtVerzolltBei.BackColor = Color.White + txtVerzolltBei.BackColor = Color.WhiteSmoke + End If + + If KUNDE_ERW.kde_KundeFremdspeditionExport Then + txtVerzolltBeiExport.Text = If(KUNDE_ERW.kde_verzolltBeiExport, "FREMD") + txtVerzolltBeiExport.BackColor = Color.Yellow + Else + txtVerzolltBeiExport.Text = "" + txtVerzolltBeiExport.BackColor = Color.WhiteSmoke End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index ed0aa612..db2bedcf 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -317,6 +317,10 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtERROR = New System.Windows.Forms.TextBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.cboFremdspeditionExport = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -370,6 +374,10 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbAbfertigung ' + Me.tbAbfertigung.Controls.Add(Me.cbxVerzolltBeiExport) + Me.tbAbfertigung.Controls.Add(Me.txtAbf_Planzahl) + Me.tbAbfertigung.Controls.Add(Me.Label42) + Me.tbAbfertigung.Controls.Add(Me.cboFremdspeditionExport) Me.tbAbfertigung.Controls.Add(Me.lblHinweisKdNr) Me.tbAbfertigung.Controls.Add(Me.cboFremdspedition) Me.tbAbfertigung.Controls.Add(Me.cbxVerzolltBei) @@ -377,8 +385,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAbfertigung.Controls.Add(Me.UsrCntlKundenBesonderheiten1) Me.tbAbfertigung.Controls.Add(Me.tbcntrAbf) Me.tbAbfertigung.Controls.Add(Me.cbxAbf_Ausfuhr) - Me.tbAbfertigung.Controls.Add(Me.txtAbf_Planzahl) - Me.tbAbfertigung.Controls.Add(Me.Label42) Me.tbAbfertigung.Controls.Add(Me.txtAbf_Euroeinführung) Me.tbAbfertigung.Controls.Add(Me.txtAbf_ErsteAbfertigung) Me.tbAbfertigung.Controls.Add(Me.cbxAbf_Fiskal) @@ -388,6 +394,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAbfertigung.Controls.Add(Me.Label41) Me.tbAbfertigung.Controls.Add(Me.Label37) Me.tbAbfertigung.Controls.Add(Me.rtbAbf_Besonderheiten) + Me.tbAbfertigung.Controls.Add(Me.Panel1) Me.tbAbfertigung.Location = New System.Drawing.Point(4, 22) Me.tbAbfertigung.Name = "tbAbfertigung" Me.tbAbfertigung.Padding = New System.Windows.Forms.Padding(3) @@ -466,6 +473,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'TabPage4 ' + Me.TabPage4.Controls.Add(Me.FlowLayoutPanel1) Me.TabPage4.Controls.Add(Me.UsrCntlKundenAvisoMailBenachrichtigung1) Me.TabPage4.Controls.Add(Me.rtbLKWFreigabeSenden) Me.TabPage4.Controls.Add(Me.Label18) @@ -756,7 +764,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Planzahl._Waehrung = False Me.txtAbf_Planzahl._WaehrungZeichen = True Me.txtAbf_Planzahl.ForeColor = System.Drawing.Color.Black - Me.txtAbf_Planzahl.Location = New System.Drawing.Point(526, 225) + Me.txtAbf_Planzahl.Location = New System.Drawing.Point(526, 248) Me.txtAbf_Planzahl.MaxLineLength = -1 Me.txtAbf_Planzahl.MaxLines_Warning = "" Me.txtAbf_Planzahl.MaxLines_Warning_Label = Nothing @@ -768,7 +776,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label42.AutoSize = True Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label42.Location = New System.Drawing.Point(470, 228) + Me.Label42.Location = New System.Drawing.Point(470, 251) Me.Label42.Name = "Label42" Me.Label42.Size = New System.Drawing.Size(50, 13) Me.Label42.TabIndex = 14 @@ -4306,6 +4314,45 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'cboFremdspeditionExport + ' + Me.cboFremdspeditionExport._allowedValuesFreiText = Nothing + Me.cboFremdspeditionExport._allowFreiText = False + Me.cboFremdspeditionExport._value = "" + Me.cboFremdspeditionExport.Enabled = False + Me.cboFremdspeditionExport.FormattingEnabled = True + Me.cboFremdspeditionExport.Items.AddRange(New Object() {"SEBERT", "SCHENKER", "AS-SPED", "NIETEN", "BUCHAUER"}) + Me.cboFremdspeditionExport.Location = New System.Drawing.Point(526, 222) + Me.cboFremdspeditionExport.Name = "cboFremdspeditionExport" + Me.cboFremdspeditionExport.Size = New System.Drawing.Size(126, 21) + Me.cboFremdspeditionExport.TabIndex = 240 + Me.cboFremdspeditionExport.Text = "SEBERT" + ' + 'cbxVerzolltBeiExport + ' + Me.cbxVerzolltBeiExport.AutoSize = True + Me.cbxVerzolltBeiExport.Location = New System.Drawing.Point(465, 224) + Me.cbxVerzolltBeiExport.Name = "cbxVerzolltBeiExport" + Me.cbxVerzolltBeiExport.Size = New System.Drawing.Size(59, 17) + Me.cbxVerzolltBeiExport.TabIndex = 241 + Me.cbxVerzolltBeiExport.Text = "Export:" + Me.cbxVerzolltBeiExport.UseVisualStyleBackColor = True + ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke + Me.Panel1.Location = New System.Drawing.Point(167, 219) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(499, 26) + Me.Panel1.TabIndex = 242 + ' + 'FlowLayoutPanel1 + ' + Me.FlowLayoutPanel1.Location = New System.Drawing.Point(249, 94) + Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1" + Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100) + Me.FlowLayoutPanel1.TabIndex = 7 + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4677,4 +4724,8 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents CheckBox1 As CheckBox Friend WithEvents btnUIDPruef As Button Friend WithEvents Button13 As Button + Friend WithEvents cbxVerzolltBeiExport As CheckBox + Friend WithEvents cboFremdspeditionExport As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel + Friend WithEvents Panel1 As Panel End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index f1042813..3ada9bd2 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -367,6 +367,8 @@ Public Class usrcntlKundeBearbeitenFull cbxVerzolltBei.Checked = KUNDE_ERW.kde_KundeFremdspedition cboFremdspedition.Text = If(KUNDE_ERW.kde_verzolltBei, "") + cbxVerzolltBeiExport.Checked = KUNDE_ERW.kde_KundeFremdspeditionExport + cboFremdspeditionExport.Text = If(KUNDE_ERW.kde_verzolltBeiExport, "") initBesonderheitenNEU() @@ -585,6 +587,14 @@ Public Class usrcntlKundeBearbeitenFull KUNDE_ERW.kde_verzolltBei = Nothing End If + ' ----- Fremdsped ----- + KUNDE_ERW.kde_KundeFremdspeditionExport = cbxVerzolltBeiExport.Checked + If KUNDE_ERW.kde_KundeFremdspeditionExport Then + KUNDE_ERW.kde_verzolltBeiExport = cboFremdspeditionExport.Text + Else + KUNDE_ERW.kde_verzolltBeiExport = Nothing + End If + ' ----- Abfertigungsverbot ----- KUNDE.Abfertigungsverbot = cboAbfVerb_Abfertigungsverbot.Checked @@ -1303,6 +1313,10 @@ Public Class usrcntlKundeBearbeitenFull cboFremdspedition.Enabled = cbxVerzolltBei.Checked End Sub + Private Sub cbxVerzolltBeiExport_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVerzolltBeiExport.CheckedChanged + cboFremdspeditionExport.Enabled = cbxVerzolltBeiExport.Checked + End Sub + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Dim WunschKdnr = InputBox("Bitte geben Sie die gewünschte Kundennummer ein:") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 6f5c38cc..fdb4f190 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -63,6 +63,8 @@ Public Class cKundenErweitert Property kde_InfoAuftragsNr As Object = Nothing Property kde_KundeFremdspedition As Boolean = False Property kde_verzolltBei As Object = Nothing + Property kde_KundeFremdspeditionExport As Boolean = False + Property kde_verzolltBeiExport As Object = Nothing Property kde_API_Tradeshift As Boolean = False Property kde_FakturierungSR_Details As Boolean = False Property kde_Fakturierung_Sprache As Object = Nothing @@ -129,6 +131,8 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_InfoAuftragsNr", kde_InfoAuftragsNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_KundeFremdspedition", kde_KundeFremdspedition)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_verzolltBei", kde_verzolltBei)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_KundeFremdspeditionExport", kde_KundeFremdspeditionExport)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_verzolltBeiExport", kde_verzolltBeiExport)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_API_Tradeshift", kde_API_Tradeshift)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_FakturierungSR_Details", kde_FakturierungSR_Details)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Fakturierung_Sprache", kde_Fakturierung_Sprache)) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index 3485b6d5..a1f89c91 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb @@ -43,11 +43,11 @@ Public Class cMessenger Public Shared Function GET_NewMSG_COUNT(Optional maId = -1) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND [chatMgSt_art]='STATUS' AND chatMgSt_gelesen=0 ", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_CHATID(maId, chat_Id) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chatMg_chatId='" & chat_Id & "'", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND [chatMgSt_art]='STATUS' AND chatMgSt_gelesen=0 AND chatMg_chatId='" & chat_Id & "'", "ADMIN",,, 0) End Function Public Shared Function SET_LKWCHAT_INAKTIV(AvisoId) As Integer @@ -56,11 +56,11 @@ Public Class cMessenger Public Shared Function GET_NewMSG_COUNT_ART(maId, chat_art) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "'", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND [chatMgSt_art]='STATUS' AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "'", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_ART_INAKTIV(maId, chat_art) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_aktiv=0 AND chat_art='" & chat_art & "'", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND [chatMgSt_art]='STATUS' AND chatMgSt_gelesen=0 AND chat_aktiv=0 AND chat_art='" & chat_art & "'", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_AVISOID(AvisoId As Integer) As Integer @@ -354,7 +354,7 @@ Public Class cMessenger End Function Public Function READ_ALL_MESSAGES() As Boolean - Dim sqlstr = "UPDATE tblMessenger_ChatMessageStatus SET chatMgSt_gelesen=1 FROM [tblMessenger_Chat] INNER JOIN tblMessenger_ChatMessages ON [chat_id]=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chat_id=" & Me.chat_id & " AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 " + Dim sqlstr = "UPDATE tblMessenger_ChatMessageStatus SET chatMgSt_gelesen=1 FROM [tblMessenger_Chat] INNER JOIN tblMessenger_ChatMessages ON [chat_id]=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chat_id=" & Me.chat_id & " AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 AND [chatMgSt_art]='STATUS' " Return SQL.doSQL(sqlstr, "ADMIN") End Function @@ -588,6 +588,7 @@ Public Class cMessenger Property chatMgSt_chatMsgId As Integer Property chatMgSt_MaId As Integer + Property chatMgSt_art As String = "STATUS" Property chatMgSt_gelesen As Boolean = False Property chatMgSt_datetime As Date = Now @@ -616,7 +617,7 @@ Public Class cMessenger Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMessenger_ChatMessages WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId) " & + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMessenger_ChatMessages WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & @@ -628,9 +629,10 @@ Public Class cMessenger Public Sub LOAD() Try Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() - Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessages WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ", conn) + Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessages WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ", conn) cmd.Parameters.AddWithValue("@chatMgSt_chatMsgId", chatMgSt_chatMsgId) cmd.Parameters.AddWithValue("@chatMgSt_MaId", chatMgSt_MaId) + cmd.Parameters.AddWithValue("@chatMgSt_art", chatMgSt_art) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -665,7 +667,7 @@ Public Class cMessenger End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblMessenger_ChatMessages SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ") + Return (" UPDATE tblMessenger_ChatMessages SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -923,8 +925,10 @@ Public Class cMessenger Property chatMgSt_chatMsgId As Integer Property chatMgSt_MaId As Integer + Property chatMgSt_art As String = "STATUS" Property chatMgSt_datetime As Date = Now Property chatMgSt_gelesen As Boolean = False + Property chatMgSt_flag As Boolean = False Property chatMgSt_bestaetigt As Boolean = False Property chatMgSt_RM_Option As Object = Nothing Property chatMgSt_RM_Text As Object = Nothing @@ -939,10 +943,12 @@ Public Class cMessenger LOAD() End Sub - Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen) + Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, Optional chatMgSt_art = "STAT", Optional chatMgSt_flag = False) Me.chatMgSt_chatMsgId = chatMgSt_chatMsgId Me.chatMgSt_MaId = chatMgSt_MaId Me.chatMgSt_gelesen = chatMgSt_gelesen + Me.chatMgSt_art = chatMgSt_art + Me.chatMgSt_flag = chatMgSt_flag Me.chatMgSt_bestaetigt = chatMgSt_bestaetigt End Sub @@ -960,7 +966,9 @@ Public Class cMessenger Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_chatMsgId", chatMgSt_chatMsgId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_MaId", chatMgSt_MaId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_art", chatMgSt_art)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetime", chatMgSt_datetime)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_flag", chatMgSt_flag)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_gelesen", chatMgSt_gelesen)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_bestaetigt", chatMgSt_bestaetigt)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_RM_Option", chatMgSt_RM_Option)) @@ -982,7 +990,7 @@ Public Class cMessenger Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId) " & + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & @@ -990,13 +998,20 @@ Public Class cMessenger Return SQL.doSQLVarList(sqlstr, "ADMIN", , list) End Function + Public Function INSERT() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + MsgBox(getInsertCmd) + Return SQL.doSQLVarList(getInsertCmd, "ADMIN", , list) + End Function Public Sub LOAD() Try Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() - Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ", conn) + Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ", conn) cmd.Parameters.AddWithValue("@chatMgSt_chatMsgId", chatMgSt_chatMsgId) cmd.Parameters.AddWithValue("@chatMgSt_MaId", chatMgSt_MaId) + cmd.Parameters.AddWithValue("@chatMgSt_art", chatMgSt_art) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -1031,7 +1046,7 @@ Public Class cMessenger End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblMessenger_ChatMessageStatus SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ") + Return (" UPDATE tblMessenger_ChatMessageStatus SET " & str & " WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId AND chatMgSt_art=@chatMgSt_art ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -1062,7 +1077,7 @@ Public Class cMessenger Public Function DELETE([chatMgSt_MaId]) As Boolean 'obj As Object, tablename As String, where As String) As Boolean - Dim sqlstr = " DELETE FROM tblMessenger_ChatMessageStatus WHERE [chatMgSt_chatMsgId]=" & Me.chatMgSt_chatMsgId & " AND [chatMgSt_MaId]=" & Me.chatMgSt_MaId & " " + Dim sqlstr = " DELETE FROM tblMessenger_ChatMessageStatus WHERE [chatMgSt_chatMsgId]=" & Me.chatMgSt_chatMsgId & " AND [chatMgSt_MaId]=" & Me.chatMgSt_MaId & " AND chatMgSt_art=@chatMgSt_art= '" & Me.chatMgSt_art & "' " Return SQL.doSQL(sqlstr, "ADMIN") End Function diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 052449fe..71d97d2e 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -41,6 +41,7 @@ Partial Class frmMessenger Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() + Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() @@ -51,7 +52,6 @@ Partial Class frmMessenger Me.Button9 = New System.Windows.Forms.Button() Me.btnTEST = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() - Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChatsSpecial = New System.Windows.Forms.CheckBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() @@ -95,6 +95,7 @@ Partial Class frmMessenger Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -235,6 +236,20 @@ Partial Class frmMessenger Me.Panel6.Size = New System.Drawing.Size(275, 21) Me.Panel6.TabIndex = 7 ' + 'lblLKWChat_MsgCntInaktiv + ' + Me.lblLKWChat_MsgCntInaktiv.BackColor = System.Drawing.Color.Red + Me.lblLKWChat_MsgCntInaktiv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D + Me.lblLKWChat_MsgCntInaktiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblLKWChat_MsgCntInaktiv.ForeColor = System.Drawing.Color.White + Me.lblLKWChat_MsgCntInaktiv.Location = New System.Drawing.Point(104, -1) + Me.lblLKWChat_MsgCntInaktiv.Name = "lblLKWChat_MsgCntInaktiv" + Me.lblLKWChat_MsgCntInaktiv.Size = New System.Drawing.Size(26, 23) + Me.lblLKWChat_MsgCntInaktiv.TabIndex = 106 + Me.lblLKWChat_MsgCntInaktiv.Text = "99" + Me.lblLKWChat_MsgCntInaktiv.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.lblLKWChat_MsgCntInaktiv.Visible = False + ' 'cbxInaktiveChats ' Me.cbxInaktiveChats.AutoSize = True @@ -398,20 +413,6 @@ Partial Class frmMessenger Me.Panel2.Size = New System.Drawing.Size(275, 23) Me.Panel2.TabIndex = 6 ' - 'lblLKWChat_MsgCntInaktiv - ' - Me.lblLKWChat_MsgCntInaktiv.BackColor = System.Drawing.Color.Red - Me.lblLKWChat_MsgCntInaktiv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - Me.lblLKWChat_MsgCntInaktiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblLKWChat_MsgCntInaktiv.ForeColor = System.Drawing.Color.White - Me.lblLKWChat_MsgCntInaktiv.Location = New System.Drawing.Point(104, -1) - Me.lblLKWChat_MsgCntInaktiv.Name = "lblLKWChat_MsgCntInaktiv" - Me.lblLKWChat_MsgCntInaktiv.Size = New System.Drawing.Size(26, 23) - Me.lblLKWChat_MsgCntInaktiv.TabIndex = 106 - Me.lblLKWChat_MsgCntInaktiv.Text = "99" - Me.lblLKWChat_MsgCntInaktiv.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.lblLKWChat_MsgCntInaktiv.Visible = False - ' 'cbxInaktiveChatsSpecial ' Me.cbxInaktiveChatsSpecial.AutoSize = True @@ -935,16 +936,22 @@ Partial Class frmMessenger 'cntxt ' Me.cntxt.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChatDeaktivierenToolStripMenuItem}) + Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ChatDeaktivierenToolStripMenuItem, Me.toolChatReminder}) Me.cntxt.Name = "cntxt" - Me.cntxt.Size = New System.Drawing.Size(167, 26) + Me.cntxt.Size = New System.Drawing.Size(181, 70) ' 'ChatDeaktivierenToolStripMenuItem ' Me.ChatDeaktivierenToolStripMenuItem.Name = "ChatDeaktivierenToolStripMenuItem" - Me.ChatDeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(166, 22) + Me.ChatDeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ChatDeaktivierenToolStripMenuItem.Text = "Chat deaktivieren" ' + 'toolChatReminder + ' + Me.toolChatReminder.Name = "toolChatReminder" + Me.toolChatReminder.Size = New System.Drawing.Size(180, 22) + Me.toolChatReminder.Text = "Reminder ein/aus" + ' 'DataGridViewTextBoxColumn1 ' Me.DataGridViewTextBoxColumn1.HeaderText = "Column1" @@ -1085,4 +1092,5 @@ Partial Class frmMessenger Friend WithEvents UsrCntlChat_Art_Btn_LKWCHAT As usrCntlChat_Art_Btn Friend WithEvents UsrCntlChat_Art_Btn_SNDCHAT As usrCntlChat_Art_Btn Friend WithEvents lblLKWChat_MsgCntInaktiv As Label + Friend WithEvents toolChatReminder As ToolStripMenuItem End Class diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index 7a27c7f7..f45aab89 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -1,7 +1,10 @@ Imports System.Drawing Imports System.IO Imports System.Threading +Imports System.Web.UI.WebControls.WebParts Imports System.Windows.Forms +Imports Util +Imports VERAG_PROG_ALLGEMEIN.cMessenger Public Class frmMessenger Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -1310,4 +1313,31 @@ Public Class frmMessenger Private Sub UsrCntlChat_Art_snd_Load(ctl As usrCntlChat_Art_Btn) Handles UsrCntlChat_Art_Btn_SNDCHAT.CLICKED End Sub + + Private Sub toolChatReminder_Click(sender As Object, e As EventArgs) Handles toolChatReminder.Click + If dgvChats.SelectedRows.Count > 0 Then + + 'Prüfen, ob bereits ein Reminder aktiv ist.... + Dim RemidnerMsgId As Integer = SQL.getValueTxtBySql("SELECT TOP (1) [chatMg_id] FROM tblMessenger_Chat INNER JOIN tblMessenger_ChatMessages ON chat_id=chatMg_chatId INNER JOIN [tblMessenger_ChatMessageStatus] on chatmg_id=[chatMgSt_chatMsgId] where [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "' AND [chatMgSt_flag]=0 and chat_id='" & dgvChats.SelectedRows(0).Cells("chat_id").Value & "'", "ADMIN",,, -1) + + If RemidnerMsgId > 0 Then '...wenn JA, Reminder zurücksetzen + + ' SQL.doSQL("UPDATE [tblMessenger_ChatMessageStatus] set [chatMgSt_flag]=1, [chatMgSt_gelesen]=1 WHERE [chatMgSt_chatMsgId] = '" & RemidnerMsgId & "' AND [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN") + SQL.doSQL("DELETE [tblMessenger_ChatMessageStatus] WHERE [chatMgSt_chatMsgId] = '" & RemidnerMsgId & "' AND [chatMgSt_art]='REMINDER' AND [chatMgSt_MaId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN") + intiDGVChats() + + Else '...wenn NEIN, Reminder setzen + + Dim MsgId As Integer = SQL.getValueTxtBySql("SELECT TOP (1) [chatMg_id] FROM [tblMessenger_ChatMessages] where chatMg_chatid='" & dgvChats.SelectedRows(0).Cells("chat_id").Value & "' order by [chatMg_datetime] desc", "ADMIN",,, -1) + If MsgId > 0 Then + Dim STAT As New cMessenger_ChatMessageStatus(MsgId, VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, False, "REMINDER", False) + STAT.SAVE() + + intiDGVChats() + + End If + End If + + End If + End Sub End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb index 31b22f2a..a1d5999f 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb @@ -47,11 +47,11 @@ End Function - Public Shared Function genDatensatzCSV_Stammdaten(Optional OpenFile As Boolean = False) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean + Public Shared Function genDatensatzCSV_Stammdaten(Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean Try Dim bool_DatenVorhanden As Boolean = False - Dim Geschaeftsjahr = Now.Year 'If(Now.Month = 1, Now.Year - 1, Now.Year) --> Bei IMEX ist das GJ=Wirtschaftsjahr + If Geschaeftsjahr <= 0 Then Geschaeftsjahr = Now.Year 'If(Now.Month = 1, Now.Year - 1, Now.Year) --> Bei IMEX ist das GJ=Wirtschaftsjahr 'DATEIPFAD für Stammdaten '------------------------------------------------------------------------------------------- @@ -118,24 +118,24 @@ - Public Shared Function genDatensatzCSV_ALL(Optional OpenFile As Boolean = False, Optional boolKunden As Boolean = True, Optional boolBuchungen As Boolean = True) As Boolean + Public Shared Function genDatensatzCSV_ALL(Optional OpenFile As Boolean = False, Optional boolKunden As Boolean = True, Optional boolBuchungen As Boolean = True, Optional Geschaeftsjahr As Integer = -1) As Boolean genDatensatzCSV_ALL = True If boolKunden Then - If Not genDatensatzCSV_Stammdaten(OpenFile) Then genDatensatzCSV_ALL = False + If Not genDatensatzCSV_Stammdaten(OpenFile, Geschaeftsjahr) Then genDatensatzCSV_ALL = False End If If boolBuchungen Then - If Not genDatensatzCSV_Buchungen(21, OpenFile) Then genDatensatzCSV_ALL = False - If Not genDatensatzCSV_Buchungen(22, OpenFile) Then genDatensatzCSV_ALL = False - If Not genDatensatzCSV_Buchungen(23, OpenFile) Then genDatensatzCSV_ALL = False + If Not genDatensatzCSV_Buchungen(21, OpenFile, Geschaeftsjahr) Then genDatensatzCSV_ALL = False + If Not genDatensatzCSV_Buchungen(22, OpenFile, Geschaeftsjahr) Then genDatensatzCSV_ALL = False + If Not genDatensatzCSV_Buchungen(23, OpenFile, Geschaeftsjahr) Then genDatensatzCSV_ALL = False End If End Function - Public Shared Function genDatensatzCSV_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean + Public Shared Function genDatensatzCSV_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean Try Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID) Dim bool_DatenVorhanden As Boolean = False - Dim Geschaeftsjahr = Now.Year 'If(Now.Month = 1, Now.Year - 1, Now.Year) --> Bei IMEX ist das GJ=Wirtschaftsjahr + If Geschaeftsjahr <= 0 Then Geschaeftsjahr = Now.Year 'If(Now.Month = 1, Now.Year - 1, Now.Year) --> Bei IMEX ist das GJ=Wirtschaftsjahr 'nur UNISPED!! 'DATEIPFAD für Buchungsdaten diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb index b0a39d74..964357b8 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb @@ -18,7 +18,8 @@ Public Class cTherefore Case 1, 11, 20, 17 ', 15 ' Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import an Jänner 2019", "Import ab Jänner 2019", deleteFileAfterImport) 'Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2021", "Import ab Jänner 2021", deleteFileAfterImport) - Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2022", "Import ab Jänner 2022", deleteFileAfterImport) + 'Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2022", "Import ab Jänner 2022", deleteFileAfterImport) + Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2023", "Import ab Jänner 2023", deleteFileAfterImport) ' Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2020", "Import ab Jänner 2020", deleteFileAfterImport) Case Else Return False