ATILLA Status 2 (VERIMEX, INDONESIEN), Login Warenort, Sprache div.

2022-12-06 08:41:13 +01:00
parent 074e999003
commit eb090f8b37
24 changed files with 653 additions and 481 deletions
--- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
+++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
@@ -101,7 +101,7 @@ Public Class frmAvisoWeiterleiten
    End Sub


-    Sub btnWeiterleitung_Clicked(WLart As String, id As String, bezeichnung As String, Optional bezeichnungFirma As String = "")
+    Sub btnWeiterleitung_Clicked(WLart As String, id As String, bezeichnung As String, Optional bezeichnungFirma As String = "", Optional WL_Text As String = "")
        Dim text = ""
        Dim WeiterleitungTextTV = ""
        Dim code = 3
@@ -123,6 +123,9 @@ Public Class frmAvisoWeiterleiten
                WeiterleitungTextTV = bezeichnung
        End Select

+
+
+
        'Anhänge:
        Dim collAnhIds = ""
        Try
@@ -151,7 +154,12 @@ Public Class frmAvisoWeiterleiten
        Else
            ASF.insertVermerkAllg(AvisoId, text, 46)
            If rtbVermerk.Text.Trim <> "" Then ASF.insertVermerkAllg(AvisoId, "WL: " & rtbVermerk.Text.Trim, 46)
-            ASF.AktUebernehmen_Zuruecksetzen(AvisoId, WeiterleitungTextTV)
+            If WL_Text <> "" Then
+                ASF.AktUebernehmen_Zuruecksetzen(AvisoId, WeiterleitungTextTV, WL_Text)
+            Else
+                ASF.AktUebernehmen_Zuruecksetzen(AvisoId, WeiterleitungTextTV)
+            End If
+
        End If


@@ -162,10 +170,10 @@ Public Class frmAvisoWeiterleiten
            End If
        End If

-            ' Me.Close()
-            '  End If
+        ' Me.Close()
+        '  End If

-            Me.Close()
+        Me.Close()
        Me.DialogResult = DialogResult.OK
    End Sub

@@ -189,7 +197,11 @@ Public Class frmAvisoWeiterleiten
        btn.Enabled = enabled

        AddHandler btn.Click, Sub()
-                                  btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma)
+                                  Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                                      Case "ATILLA" : btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma, "WL: " & If(bezeichnungFirma <> "ATILLA", "[" & bezeichnungFirma & "] ", "") & bezeichnung)
+                                      Case Else : btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma)
+                                  End Select
+
                                  initButtons(flpFirma, btn)
                              End Sub

@@ -263,6 +275,12 @@ Public Class frmAvisoWeiterleiten
            addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE", True)
        ElseIf sender Is btnATILLA Then
            addBtn(flpFirma, "F", "ATILLA", "ATILLA", True)
+            Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='ATILLA' order by team_id", "ADMIN")
+            If dt IsNot Nothing Then
+                For Each t In dt.Rows
+                    addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung"),, "ATILLA")
+                Next
+            End If
        ElseIf sender Is btnVERIMEX Then
            'addBtn(flpFirma, "F", "VERIMEX", "VERIMEX", True)
            Dim whereTeams = ""
--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb
@@ -23,18 +23,19 @@ Partial Class usrCntlBenachrichtigungen
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.Panel2 = New System.Windows.Forms.Panel()
        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.cbxNeukunden = New System.Windows.Forms.CheckBox()
        Me.Button10 = New System.Windows.Forms.Button()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.cbxCluster = New System.Windows.Forms.CheckBox()
        Me.cbxTeams = New System.Windows.Forms.CheckBox()
        Me.Label22 = New System.Windows.Forms.Label()
        Me.Label25 = New System.Windows.Forms.Label()
-        Me.cbxNeukunden = New System.Windows.Forms.CheckBox()
+        Me.txtVermerk = New System.Windows.Forms.TextBox()
        Me.Panel2.SuspendLayout()
        CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel4.SuspendLayout()
@@ -77,8 +78,8 @@ Partial Class usrCntlBenachrichtigungen
        Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False
        Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True
        Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
-        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+        Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White
        Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill
@@ -92,6 +93,7 @@ Partial Class usrCntlBenachrichtigungen
        'Panel4
        '
        Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel4.Controls.Add(Me.txtVermerk)
        Me.Panel4.Controls.Add(Me.cbxNeukunden)
        Me.Panel4.Controls.Add(Me.Button10)
        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -100,6 +102,18 @@ Partial Class usrCntlBenachrichtigungen
        Me.Panel4.Size = New System.Drawing.Size(284, 38)
        Me.Panel4.TabIndex = 5
        '
+        'cbxNeukunden
+        '
+        Me.cbxNeukunden.AutoSize = True
+        Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black
+        Me.cbxNeukunden.Location = New System.Drawing.Point(7, 19)
+        Me.cbxNeukunden.Name = "cbxNeukunden"
+        Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17)
+        Me.cbxNeukunden.TabIndex = 30
+        Me.cbxNeukunden.Text = "Neukunden"
+        Me.cbxNeukunden.UseVisualStyleBackColor = True
+        Me.cbxNeukunden.Visible = False
+        '
        'Button10
        '
        Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -175,17 +189,15 @@ Partial Class usrCntlBenachrichtigungen
        Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen"
        Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
-        'cbxNeukunden
+        'txtVermerk
        '
-        Me.cbxNeukunden.AutoSize = True
-        Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black
-        Me.cbxNeukunden.Location = New System.Drawing.Point(7, 3)
-        Me.cbxNeukunden.Name = "cbxNeukunden"
-        Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17)
-        Me.cbxNeukunden.TabIndex = 30
-        Me.cbxNeukunden.Text = "Neukunden"
-        Me.cbxNeukunden.UseVisualStyleBackColor = True
-        Me.cbxNeukunden.Visible = False
+        Me.txtVermerk.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtVermerk.Location = New System.Drawing.Point(7, -1)
+        Me.txtVermerk.Name = "txtVermerk"
+        Me.txtVermerk.ReadOnly = True
+        Me.txtVermerk.Size = New System.Drawing.Size(146, 20)
+        Me.txtVermerk.TabIndex = 31
        '
        'usrCntlBenachrichtigungen
        '
@@ -215,4 +227,5 @@ Partial Class usrCntlBenachrichtigungen
    Friend WithEvents cbxTeams As CheckBox
    Friend WithEvents cbxCluster As CheckBox
    Friend WithEvents cbxNeukunden As CheckBox
+    Friend WithEvents txtVermerk As TextBox
 End Class
--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
@@ -61,7 +61,7 @@

                whereMA &= " ) "

-                Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & "  ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC"
+                Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status  FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & "  ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC"


                Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -120,6 +120,11 @@
                '.Columns("ab_Beschreibung").DefaultCellStyle.ForeColor = Color.White
                .Columns("ab_Beschreibung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill

+                '.Columns("ab_Vermerk").MinimumWidth = 50
+                '.Columns("ab_Vermerk").HeaderText = "Vermerk"
+                ''.Columns("ab_Beschreibung").DefaultCellStyle.ForeColor = Color.White
+                '.Columns("ab_Vermerk").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+
                If .RowCount = 0 Then .Columns.Clear() : Exit Sub


@@ -286,6 +291,11 @@

    Private Sub usrCntlBenachrichtigungen_SelectionChanged() Handles gridAvisoBenachrichtigungen.SelectionChanged
        Button10.Enabled = (gridAvisoBenachrichtigungen.SelectedRows.Count = 1)
+        txtVermerk.Text = ""
+        If gridAvisoBenachrichtigungen.SelectedRows.Count > 0 Then
+            txtVermerk.Text = If(gridAvisoBenachrichtigungen.SelectedRows(0).Cells("ab_vermerk").Value, "")
+        End If
+
    End Sub

    Private Sub usrCntlBenachrichtigungen_SelectionChanged(sender As Object, e As EventArgs) Handles gridAvisoBenachrichtigungen.SelectionChanged