From 865ab8938dd78ea4504889299425718e546e9517 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 4 Feb 2025 13:22:07 +0100 Subject: [PATCH 1/3] NCTS TR ; OpenAI --- SDL/My Project/AssemblyInfo.vb | 4 +- .../EXGestellung/usrCntlATLAS_EXGestellung.vb | 8 +-- .../ATEZ/NCTS_API/cATEZ_ncts_api.vb | 13 ++-- .../Schnittstellen/OPEN_AI/cOpenAI.vb | 70 +++++++++++++++++++ .../VERAG_PROG_ALLGEMEIN.vbproj | 1 + 5 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 VERAG_PROG_ALLGEMEIN/Schnittstellen/OPEN_AI/cOpenAI.vb diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index ed58abde..f4340317 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/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb index 145e792b..e5610191 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb @@ -91,17 +91,17 @@ Public Class usrCntlATLAS_EXGestellung 'MRN Prüfung: For Each l In rtbMRN.Lines If l.Trim <> "" Then - If l.Length >= 18 And dblcheck.Contains(l) Then + If l.Trim.Length >= 18 And dblcheck.Contains(l.Trim) Then MsgBox("Doppelte MRN !: " & l) Me.Cursor = Cursors.Default Exit Sub End If - If Not IsValidMRN(l) Then + If Not IsValidMRN(l.Trim) Then MsgBox("Ungültige MRN (Format): " & l) Me.Cursor = Cursors.Default Exit Sub End If - dblcheck &= l + dblcheck &= l.Trim End If Next @@ -111,7 +111,7 @@ Public Class usrCntlATLAS_EXGestellung For Each l In rtbMRN.Lines If l.Trim <> "" Then - If Not sendEXP_MRN(l, sbAbgangZollstelle._value, cnt, exg_list) Then + If Not sendEXP_MRN(l.Trim, sbAbgangZollstelle._value, cnt, exg_list) Then MsgBox("Sendefehler bei " & l) err = True End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/NCTS_API/cATEZ_ncts_api.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/NCTS_API/cATEZ_ncts_api.vb index d27e17b3..fad251be 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/NCTS_API/cATEZ_ncts_api.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/NCTS_API/cATEZ_ncts_api.vb @@ -49,14 +49,14 @@ Public Class cATEZ_ncts_api If Not checkDY_NCTS(NCTS_TMP.Mrn) Then - Dim NCTS_FREMD = VERAG_PROG_ALLGEMEIN.cNCTS_FREMD.LOADByMRN(NCTS_TMP.Mrn, True) - If NCTS_FREMD Is Nothing Then NCTS_FREMD = New cNCTS_FREMD - NCTS_FREMD.ncts_Partnersystem = "ATEZ" - NCTS_FREMD.ncts_MRN = NCTS_TMP.Mrn + If checkDY_NCTSStatus60(NCTS_TMP.Mrn) And OverrideNCTSFin = False Then - If NCTS_FREMD.ncts_Status = 60 And OverrideNCTSFin = False Then 'Wenn NCTS beretis Erledigt und kein Flag fürs überschreiben, mach nix.... Else + Dim NCTS_FREMD = VERAG_PROG_ALLGEMEIN.cNCTS_FREMD.LOADByMRN(NCTS_TMP.Mrn, True) + If NCTS_FREMD Is Nothing Then NCTS_FREMD = New cNCTS_FREMD + NCTS_FREMD.ncts_Partnersystem = "ATEZ" + NCTS_FREMD.ncts_MRN = NCTS_TMP.Mrn NCTS_FREMD.ncts_Eroeffnung = NCTS_TMP.MrnDate @@ -162,6 +162,9 @@ Public Class cATEZ_ncts_api Public Shared Function checkDY_NCTS(MRN As String) As Boolean Return ((New VERAG_PROG_ALLGEMEIN.SQL).DLookup("COUNT(*)", "[tblDakosy_NCTSOut004]", "ncts_MRN='" & MRN & "'", "FMZOLL", 0)) > 0 End Function + Public Shared Function checkDY_NCTSStatus60(MRN As String) As Boolean + Return ((New VERAG_PROG_ALLGEMEIN.SQL).DLookup("COUNT(*)", "[tblDakosy_NCTSOut004]", "ncts_MRN='" & MRN & "' AND ncts_Status=60 ", "FMZOLL", 0)) > 0 + End Function Public Shared Function checkDY_TC(MRN As String) As Boolean diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/OPEN_AI/cOpenAI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/OPEN_AI/cOpenAI.vb new file mode 100644 index 00000000..1037ab91 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/OPEN_AI/cOpenAI.vb @@ -0,0 +1,70 @@ +Imports System.Net.Http +Imports System.Text +Imports System.Threading.Tasks +Imports Newtonsoft.Json.Linq + +Public Class cOpenAI + + Shared apiKey As String = "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" + Shared apiUrl As String = "https://api.openai.com/v1/chat/completions" + + Shared Sub doFirstAI() + 'Dim frage As String = "Wie viele Tage braucht ein Versandschein von Istanbul nach München? Gib nur die Zahl zurück." + Dim frage As String = "Schreibe ein HAIKO über AI." + + + ' API-Aufruf und Ausgabe der Antwort + Dim antwort As String = AskOpenAI(frage) + + Console.WriteLine("Antwort von OpenAI: " & antwort) + + ' Console.WriteLine("Drücke eine beliebige Taste zum Beenden...") + ' Console.ReadKey() + End Sub + + + + ' Funktion zur Kommunikation mit OpenAI API (synchrones Verhalten) + Shared Function AskOpenAI(question As String) As String + + Try + Using client As New HttpClient() + client.DefaultRequestHeaders.Add("Authorization", $"Bearer {apiKey}") + + ' JSON-Body für die API-Anfrage mit GPT-4o + Dim requestBody As String = " + { + ""model"": ""gpt-4o-mini"", + ""messages"": [ + {""role"": ""user"", ""content"": """ & question & """} + ], + ""max_tokens"": 10, + ""temperature"": 0 + }" + + Dim content As New StringContent(requestBody, Encoding.UTF8, "application/json") + + ' POST-Anfrage senden und Antwort synchron verarbeiten + Dim response As HttpResponseMessage = client.PostAsync(apiUrl, content).Result + + If response.IsSuccessStatusCode Then + Dim responseBody As String = response.Content.ReadAsStringAsync().Result + + ' JSON-Antwort parsen, um die OpenAI-Antwort zu extrahieren + Dim jsonResponse As JObject = JObject.Parse(responseBody) + Dim answer As String = jsonResponse("choices")(0)("message")("content").ToString().Trim() + + Return answer ' Antwort zurückgeben + Else + ' Fehlerausgabe bei API-Problemen + Return $"Fehler: {response.StatusCode} - {response.Content.ReadAsStringAsync().Result}" + End If + End Using + Catch ex As Exception + ' Allgemeine Fehlerbehandlung + Return $"Fehler: {ex.Message}" + End Try + End Function + + +End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 0f633211..1020f880 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -641,6 +641,7 @@ + From aa3149d468011d557c4735a27e963f6a4f413549 Mon Sep 17 00:00:00 2001 From: "m.ilhan" Date: Tue, 4 Feb 2025 16:08:50 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Zusatz=20=C3=BCber=20Strasse=20<-=20Kundenu?= =?UTF-8?q?ebersicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usrCntlKundenuebersicht.Designer.vb | 196 +++++++++--------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index e11661a6..46e46701 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht 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() - 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 DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht)) - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - 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() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() @@ -74,10 +74,10 @@ Partial Class usrCntlKundenuebersicht Me.Label13 = New System.Windows.Forms.Label() Me.grpAbfertigung = New System.Windows.Forms.GroupBox() Me.Panel9 = New System.Windows.Forms.Panel() + Me.txtVerzolltBei = New System.Windows.Forms.TextBox() Me.Label3 = New System.Windows.Forms.Label() Me.Label15 = New System.Windows.Forms.Label() Me.txtVerzolltBeiExport = New System.Windows.Forms.TextBox() - Me.txtVerzolltBei = New System.Windows.Forms.TextBox() Me.rtbInfo = New System.Windows.Forms.RichTextBox() Me.txtNeutralisierung = New System.Windows.Forms.TextBox() Me.lblNeutralisierung = New System.Windows.Forms.Label() @@ -86,6 +86,7 @@ Partial Class usrCntlKundenuebersicht Me.txtVorauskasse = New System.Windows.Forms.TextBox() 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.pnlVERAGSnspr = New System.Windows.Forms.Panel() @@ -157,6 +158,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() @@ -204,6 +206,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() @@ -260,9 +263,6 @@ Partial Class usrCntlKundenuebersicht Me.btnOP = New System.Windows.Forms.Button() Me.ContextMenuStrip5 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.cntxtAddVM.SuspendLayout() Me.tbWeitereKundenDetails.SuspendLayout() Me.tbOfferten.SuspendLayout() @@ -425,8 +425,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -446,8 +446,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True Me.dgvOffertenSperrliste.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -457,10 +457,10 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True Me.dgvOffertenSperrliste.RowHeadersVisible = False - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257) Me.dgvOffertenSperrliste.TabIndex = 0 @@ -598,8 +598,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffenePosten.AllowUserToAddRows = False Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill @@ -679,8 +679,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill @@ -742,8 +742,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvAnhaenge.AllowUserToAddRows = False Me.dgvAnhaenge.AllowUserToDeleteRows = False Me.dgvAnhaenge.AllowUserToResizeRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -899,6 +899,19 @@ Partial Class usrCntlKundenuebersicht Me.Panel9.Size = New System.Drawing.Size(356, 24) Me.Panel9.TabIndex = 46 ' + 'txtVerzolltBei + ' + 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(62, 4) + Me.txtVerzolltBei.Name = "txtVerzolltBei" + Me.txtVerzolltBei.ReadOnly = True + Me.txtVerzolltBei.Size = New System.Drawing.Size(155, 13) + Me.txtVerzolltBei.TabIndex = 16 + Me.txtVerzolltBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' 'Label3 ' Me.Label3.AutoSize = True @@ -930,19 +943,6 @@ Partial Class usrCntlKundenuebersicht Me.txtVerzolltBeiExport.TabIndex = 44 Me.txtVerzolltBeiExport.TextAlign = System.Windows.Forms.HorizontalAlignment.Center ' - 'txtVerzolltBei - ' - 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(62, 4) - Me.txtVerzolltBei.Name = "txtVerzolltBei" - Me.txtVerzolltBei.ReadOnly = True - Me.txtVerzolltBei.Size = New System.Drawing.Size(155, 13) - Me.txtVerzolltBei.TabIndex = 16 - Me.txtVerzolltBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - ' 'rtbInfo ' Me.rtbInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1037,6 +1037,17 @@ Partial Class usrCntlKundenuebersicht Me.Label2.Text = "Aviso:" Me.Label2.Visible = False ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.AutoScroll = True + 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 @@ -2187,6 +2198,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 @@ -2273,7 +2292,7 @@ Partial Class usrCntlKundenuebersicht Me.lblStrasse.BackColor = System.Drawing.Color.White Me.lblStrasse.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStrasse.Location = New System.Drawing.Point(6, 91) + Me.lblStrasse.Location = New System.Drawing.Point(6, 65) Me.lblStrasse.Name = "lblStrasse" Me.lblStrasse.ReadOnly = True Me.lblStrasse.Size = New System.Drawing.Size(491, 19) @@ -2308,7 +2327,7 @@ Partial Class usrCntlKundenuebersicht Me.lblAdressZusatz.BackColor = System.Drawing.Color.White Me.lblAdressZusatz.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblAdressZusatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAdressZusatz.Location = New System.Drawing.Point(6, 62) + Me.lblAdressZusatz.Location = New System.Drawing.Point(6, 91) Me.lblAdressZusatz.Name = "lblAdressZusatz" Me.lblAdressZusatz.ReadOnly = True Me.lblAdressZusatz.Size = New System.Drawing.Size(353, 19) @@ -2470,8 +2489,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVollmachten.AllowUserToDeleteRows = False Me.dgvVollmachten.AllowUserToOrderColumns = True Me.dgvVollmachten.AllowUserToResizeRows = False - DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill @@ -2524,8 +2543,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVertraege.AllowUserToDeleteRows = False Me.dgvVertraege.AllowUserToOrderColumns = True Me.dgvVertraege.AllowUserToResizeRows = False - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill @@ -2700,8 +2719,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvGestGarantie.AllowUserToDeleteRows = False Me.dgvGestGarantie.AllowUserToOrderColumns = True Me.dgvGestGarantie.AllowUserToResizeRows = False - DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill @@ -2837,6 +2856,16 @@ Partial Class usrCntlKundenuebersicht Me.tbAvisoMail.Text = "Aviso E-Mails" Me.tbAvisoMail.UseVisualStyleBackColor = True ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True + 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) @@ -3145,24 +3174,24 @@ Partial Class usrCntlKundenuebersicht Me.dgvAufschub.AllowUserToResizeColumns = False Me.dgvAufschub.AllowUserToResizeRows = False Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN}) - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle24 Me.dgvAufschub.Location = New System.Drawing.Point(13, 61) Me.dgvAufschub.MultiSelect = False Me.dgvAufschub.Name = "dgvAufschub" @@ -3189,8 +3218,8 @@ Partial Class usrCntlKundenuebersicht ' 'HZA ' - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - Me.HZA.DefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + Me.HZA.DefaultCellStyle = DataGridViewCellStyle23 Me.HZA.HeaderText = "HZA" Me.HZA.Name = "HZA" Me.HZA.ReadOnly = True @@ -3408,35 +3437,6 @@ Partial Class usrCntlKundenuebersicht Me.ToolStripMenuItem12.Size = New System.Drawing.Size(150, 30) Me.ToolStripMenuItem12.Text = "Schnelldruck" ' - 'UsrCntlKundenBesonderheiten1 - ' - Me.UsrCntlKundenBesonderheiten1.AutoScroll = True - 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 - ' - '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 - ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 - ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True - 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 - ' 'usrCntlKundenuebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) From dc9966ac79a8023462c9de49a8d15f390915d22c Mon Sep 17 00:00:00 2001 From: "m.ilhan" Date: Tue, 4 Feb 2025 16:42:13 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Zusatz=20=C3=BCber=20Stra=C3=9Fe=20<-=20Kun?= =?UTF-8?q?den=C3=BCbersicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usrCntlKundenuebersicht.Designer.vb | 120 ++++++++---------- SDL/kunden/usrCntlKundenuebersicht.vb | 10 +- 2 files changed, 61 insertions(+), 69 deletions(-) diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 46e46701..f48d72e6 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht)) - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + 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.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() @@ -169,7 +169,6 @@ Partial Class usrCntlKundenuebersicht Me.lblStrasse = New System.Windows.Forms.TextBox() Me.lblFirmenname2 = New System.Windows.Forms.TextBox() Me.lblTESTSystem = New System.Windows.Forms.Label() - Me.lblAdressZusatz = New System.Windows.Forms.TextBox() Me.grpSonstiges = New System.Windows.Forms.GroupBox() Me.Button14 = New System.Windows.Forms.Button() Me.Button13 = New System.Windows.Forms.Button() @@ -425,8 +424,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -446,8 +445,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True Me.dgvOffertenSperrliste.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -457,10 +456,10 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True Me.dgvOffertenSperrliste.RowHeadersVisible = False - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257) Me.dgvOffertenSperrliste.TabIndex = 0 @@ -598,8 +597,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffenePosten.AllowUserToAddRows = False Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill @@ -679,8 +678,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill @@ -742,8 +741,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvAnhaenge.AllowUserToAddRows = False Me.dgvAnhaenge.AllowUserToDeleteRows = False Me.dgvAnhaenge.AllowUserToResizeRows = False - DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -1981,7 +1980,6 @@ Partial Class usrCntlKundenuebersicht Me.grpAdresse.Controls.Add(Me.lblStrasse) Me.grpAdresse.Controls.Add(Me.lblFirmenname2) Me.grpAdresse.Controls.Add(Me.lblTESTSystem) - Me.grpAdresse.Controls.Add(Me.lblAdressZusatz) Me.grpAdresse.Location = New System.Drawing.Point(3, 17) Me.grpAdresse.Name = "grpAdresse" Me.grpAdresse.Size = New System.Drawing.Size(499, 348) @@ -2292,10 +2290,11 @@ Partial Class usrCntlKundenuebersicht Me.lblStrasse.BackColor = System.Drawing.Color.White Me.lblStrasse.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStrasse.Location = New System.Drawing.Point(6, 65) + Me.lblStrasse.Location = New System.Drawing.Point(6, 70) + Me.lblStrasse.Multiline = True Me.lblStrasse.Name = "lblStrasse" Me.lblStrasse.ReadOnly = True - Me.lblStrasse.Size = New System.Drawing.Size(491, 19) + Me.lblStrasse.Size = New System.Drawing.Size(491, 43) Me.lblStrasse.TabIndex = 5 Me.lblStrasse.Text = "Strasse" ' @@ -2322,18 +2321,6 @@ Partial Class usrCntlKundenuebersicht Me.lblTESTSystem.TabIndex = 4 Me.lblTESTSystem.Text = "! TESTSYSTEM !" ' - 'lblAdressZusatz - ' - Me.lblAdressZusatz.BackColor = System.Drawing.Color.White - Me.lblAdressZusatz.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lblAdressZusatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAdressZusatz.Location = New System.Drawing.Point(6, 91) - Me.lblAdressZusatz.Name = "lblAdressZusatz" - Me.lblAdressZusatz.ReadOnly = True - Me.lblAdressZusatz.Size = New System.Drawing.Size(353, 19) - Me.lblAdressZusatz.TabIndex = 11 - Me.lblAdressZusatz.Text = "Zusatz" - ' 'grpSonstiges ' Me.grpSonstiges.BackColor = System.Drawing.Color.White @@ -2489,8 +2476,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVollmachten.AllowUserToDeleteRows = False Me.dgvVollmachten.AllowUserToOrderColumns = True Me.dgvVollmachten.AllowUserToResizeRows = False - DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill @@ -2543,8 +2530,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVertraege.AllowUserToDeleteRows = False Me.dgvVertraege.AllowUserToOrderColumns = True Me.dgvVertraege.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill @@ -2719,8 +2706,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvGestGarantie.AllowUserToDeleteRows = False Me.dgvGestGarantie.AllowUserToOrderColumns = True Me.dgvGestGarantie.AllowUserToResizeRows = False - DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9 Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill @@ -3174,24 +3161,24 @@ Partial Class usrCntlKundenuebersicht Me.dgvAufschub.AllowUserToResizeColumns = False Me.dgvAufschub.AllowUserToResizeRows = False Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10 Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN}) - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle12 Me.dgvAufschub.Location = New System.Drawing.Point(13, 61) Me.dgvAufschub.MultiSelect = False Me.dgvAufschub.Name = "dgvAufschub" @@ -3218,8 +3205,8 @@ Partial Class usrCntlKundenuebersicht ' 'HZA ' - DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - Me.HZA.DefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + Me.HZA.DefaultCellStyle = DataGridViewCellStyle11 Me.HZA.HeaderText = "HZA" Me.HZA.Name = "HZA" Me.HZA.ReadOnly = True @@ -3741,7 +3728,6 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents btnCreditsafe As Button Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents SessionService1 As VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService - Friend WithEvents lblAdressZusatz As TextBox Friend WithEvents picVertrag As PictureBox Friend WithEvents PictureBox6 As PictureBox Friend WithEvents txtOVK As VERAG_PROG_ALLGEMEIN.MyTextBox diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index f041abfa..4f2c10b0 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -408,9 +408,15 @@ Public Class usrCntlKundenuebersicht lblFirmenname1.Text = checkNullStr(ADRESSE.Name_1) lblFirmenname2.Text = checkNullStr(ADRESSE.Name_2) - lblAdressZusatz.Text = checkNullStr(KUNDE_ERW.kde_AdressZusatz) + Dim zusatz As String = checkNullStr(KUNDE_ERW.kde_AdressZusatz) + Dim strasse As String = checkNullStr(ADRESSE.Straße) - lblStrasse.Text = checkNullStr(ADRESSE.Straße) + lblStrasse.Text = checkNullStr(KUNDE_ERW.kde_AdressZusatz) & checkNullStr(ADRESSE.Straße) + If zusatz <> "" Then + lblStrasse.Text = zusatz & vbCrLf & strasse + Else + lblStrasse.Text = vbCrLf & strasse + End If lblLandPlzOrt.Text = checkNullStr(ADRESSE.LandKz) & " - " & checkNullStr(ADRESSE.PLZ) & " - " & checkNullStr(ADRESSE.Ort) lblPostfach.Text = checkNullStr(ADRESSE.PLZPF) & " - " & checkNullStr(ADRESSE.Postfach)