Prüfung bei AZET Zollanmeldungen über DAKOSY -> wird VERIMEX Defaultuser verwendet.

2024-08-29 10:43:12 +02:00
parent 780ad79c28
commit add7ac39a9
6 changed files with 124 additions and 28 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -1426,7 +1426,7 @@ Public Class frmMitarbDetails


                Dim dtbereitsausgezahlteUE As DataTable
-                Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (isnull([uest_ignorePayoutDate],0) as bit) as 'Auszahlungsdatum ignoriert'
+                Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) as ignoreAuszahlungsdatum
                FROM [ADMIN].[dbo].[tblUeberstunden] 
                where uest_deleted = 0 and uest_maId = " & mitarbeiter.mit_id & "
                Order by uest_date"
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
@@ -68,7 +68,7 @@ Public Class usrCntlMitarbeiter



-        Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze, cast (case when isnull([mit_DAKOSY_SB],'')<> '' and isnull([mit_DAKOSY_SBFull],'')<>'' then 1 else 0 end as bit) as mit_DAKOSY, mit_durchwahl,mit_gekuendigt, isnull(mit_foto_DocId,'') as mit_foto_DocId  FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "' )) "
+        Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze, cast (case when isnull([mit_DAKOSY_SB],'')<> '' and isnull([mit_DAKOSY_SBFull],'')<>'' then 1 else 0 end as bit) mit_DAKOSY, mit_durchwahl,mit_gekuendigt, isnull(mit_foto_DocId,'') as mit_foto_DocId  FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "' )) "

        If txtSuche.Text <> "" Then
            sql &= " AND (mit_username LIKE '%" & txtSuche.Text & "%' OR mit_nname LIKE '%" & txtSuche.Text & "%' OR mit_vname LIKE '%" & txtSuche.Text & "%') "
--- a/UID/Programme/frmSprachen.Designer.vb
+++ b/UID/Programme/frmSprachen.Designer.vb
@@ -38,6 +38,10 @@ Partial Class frmSprachen
        Me.Label7 = New System.Windows.Forms.Label()
        Me.txtProgramm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.btnOK = New System.Windows.Forms.Button()
+        Me.txtOption = New System.Windows.Forms.TextBox()
+        Me.txtFirmaID = New System.Windows.Forms.TextBox()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.Label9 = New System.Windows.Forms.Label()
        CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -67,7 +71,7 @@ Partial Class frmSprachen
        Me.DataGridView.Location = New System.Drawing.Point(15, 82)
        Me.DataGridView.MultiSelect = False
        Me.DataGridView.Name = "DataGridView"
-        Me.DataGridView.Size = New System.Drawing.Size(974, 452)
+        Me.DataGridView.Size = New System.Drawing.Size(1144, 452)
        Me.DataGridView.TabIndex = 14
        '
        'txtObject
@@ -121,7 +125,7 @@ Partial Class frmSprachen
        'Label5
        '
        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(715, 40)
+        Me.Label5.Location = New System.Drawing.Point(756, 40)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(46, 13)
        Me.Label5.TabIndex = 8
@@ -129,15 +133,15 @@ Partial Class frmSprachen
        '
        'txtDE
        '
-        Me.txtDE.Location = New System.Drawing.Point(718, 56)
+        Me.txtDE.Location = New System.Drawing.Point(756, 56)
        Me.txtDE.Name = "txtDE"
-        Me.txtDE.Size = New System.Drawing.Size(218, 20)
+        Me.txtDE.Size = New System.Drawing.Size(280, 20)
        Me.txtDE.TabIndex = 13
        '
        'Label6
        '
        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(502, 40)
+        Me.Label6.Location = New System.Drawing.Point(467, 40)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(67, 13)
        Me.Label6.TabIndex = 7
@@ -145,15 +149,15 @@ Partial Class frmSprachen
        '
        'txttranslate
        '
-        Me.txttranslate.Location = New System.Drawing.Point(505, 56)
+        Me.txttranslate.Location = New System.Drawing.Point(470, 56)
        Me.txttranslate.Name = "txttranslate"
-        Me.txttranslate.Size = New System.Drawing.Size(207, 20)
+        Me.txttranslate.Size = New System.Drawing.Size(280, 20)
        Me.txttranslate.TabIndex = 12
        '
        'Label7
        '
        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(829, 14)
+        Me.Label7.Location = New System.Drawing.Point(967, 14)
        Me.Label7.Name = "Label7"
        Me.Label7.Size = New System.Drawing.Size(57, 13)
        Me.Label7.TabIndex = 2
@@ -174,7 +178,7 @@ Partial Class frmSprachen
        Me.txtProgramm._Waehrung = False
        Me.txtProgramm._WaehrungZeichen = True
        Me.txtProgramm.ForeColor = System.Drawing.Color.Black
-        Me.txtProgramm.Location = New System.Drawing.Point(892, 12)
+        Me.txtProgramm.Location = New System.Drawing.Point(1030, 12)
        Me.txtProgramm.MaxLineLength = -1
        Me.txtProgramm.MaxLines_Warning = ""
        Me.txtProgramm.MaxLines_Warning_Label = Nothing
@@ -186,7 +190,7 @@ Partial Class frmSprachen
        '
        'btnOK
        '
-        Me.btnOK.Location = New System.Drawing.Point(880, 540)
+        Me.btnOK.Location = New System.Drawing.Point(1030, 540)
        Me.btnOK.Name = "btnOK"
        Me.btnOK.Size = New System.Drawing.Size(109, 23)
        Me.btnOK.TabIndex = 15
@@ -194,11 +198,47 @@ Partial Class frmSprachen
        Me.btnOK.UseVisualStyleBackColor = True
        Me.btnOK.Visible = False
        '
+        'txtOption
+        '
+        Me.txtOption.Location = New System.Drawing.Point(1090, 56)
+        Me.txtOption.Name = "txtOption"
+        Me.txtOption.Size = New System.Drawing.Size(49, 20)
+        Me.txtOption.TabIndex = 16
+        '
+        'txtFirmaID
+        '
+        Me.txtFirmaID.Location = New System.Drawing.Point(1042, 56)
+        Me.txtFirmaID.Name = "txtFirmaID"
+        Me.txtFirmaID.Size = New System.Drawing.Size(42, 20)
+        Me.txtFirmaID.TabIndex = 17
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Location = New System.Drawing.Point(1039, 40)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(32, 13)
+        Me.Label8.TabIndex = 18
+        Me.Label8.Text = "Firma"
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(1093, 40)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(38, 13)
+        Me.Label9.TabIndex = 19
+        Me.Label9.Text = "Option"
+        '
        'frmSprachen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(998, 574)
+        Me.ClientSize = New System.Drawing.Size(1171, 574)
+        Me.Controls.Add(Me.Label9)
+        Me.Controls.Add(Me.Label8)
+        Me.Controls.Add(Me.txtFirmaID)
+        Me.Controls.Add(Me.txtOption)
        Me.Controls.Add(Me.btnOK)
        Me.Controls.Add(Me.txtProgramm)
        Me.Controls.Add(Me.Label7)
@@ -240,4 +280,8 @@ Partial Class frmSprachen
    Friend WithEvents Label7 As Label
    Friend WithEvents txtProgramm As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents btnOK As Button
+    Friend WithEvents txtOption As TextBox
+    Friend WithEvents txtFirmaID As TextBox
+    Friend WithEvents Label8 As Label
+    Friend WithEvents Label9 As Label
 End Class
--- a/UID/Programme/frmSprachen.vb
+++ b/UID/Programme/frmSprachen.vb
@@ -95,6 +95,10 @@ Public Class frmSprachen
                    .Columns("trs_textDE").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
                    .Columns("trs_active").HeaderText = "aktiv"
                    .Columns("trs_active").Width = 40
+                    .Columns("trs_firmaID").HeaderText = "Firma"
+                    .Columns("trs_firmaID").Width = 40
+                    .Columns("trs_option").HeaderText = "Option"
+                    .Columns("trs_option").Width = 40
                End If

            End With
@@ -107,7 +111,7 @@ Public Class frmSprachen

    End Sub

-    Private Sub TextBox1_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtObject.PreviewKeyDown, txtDE.PreviewKeyDown, txtSubcontrol.PreviewKeyDown, txtControl.PreviewKeyDown, txttranslate.PreviewKeyDown
+    Private Sub TextBox1_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtObject.PreviewKeyDown, txtDE.PreviewKeyDown, txtSubcontrol.PreviewKeyDown, txtControl.PreviewKeyDown, txttranslate.PreviewKeyDown, txtFirmaID.PreviewKeyDown, txtOption.PreviewKeyDown

        Dim sqladdon As String = ""

@@ -132,6 +136,14 @@ Public Class frmSprachen
                sqladdon &= " AND [trs_text] like '%" & txttranslate.Text & "%'"
            End If

+            If txtOption.Text <> "" Then
+                sqladdon &= " AND [trs_Option] like '%" & txtOption.Text & "%'"
+            End If
+
+            If txtFirmaID.Text <> "" Then
+                sqladdon &= " AND [trs_firmaID] = '" & txtFirmaID.Text & "'"
+            End If
+
            Dim sqlLanguage = " AND [trs_sprache] = '" & cbxSprachen.SelectedItem.ToString & "'"

            loadDGV(sqlLanguage, sqladdon)