Logik Verag360

2025-01-10 16:01:46 +01:00
parent c36bfbcb45
commit 092bcf8697
4 changed files with 57 additions and 8 deletions
--- a/SDL/Fakturierung/frmAbrechnungsMaske.vb
+++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb
@@ -49,6 +49,12 @@ Public Class frmAbrechnungsMaske
            FirmaTmp = "VERAGIMEX"
        End If

+        If Not IsDBNull(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) AndAlso CInt(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) = 19 Then
+            FirmaTmp = "VERAG360"
+        End If
+
+
+
        'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
        'FirmaTmp = "AMBAR"
        'End If
@@ -90,6 +96,12 @@ Public Class frmAbrechnungsMaske
                cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE FIRMENGRUPPE IN ('AMBAR') ", False, "FMZOLL")
                cboFirma.changeItem("24")
                MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  mit_firma='AMBAR'  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
+
+            Case "VERAG360"
+                cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID=19", False, "FMZOLL")
+                cboFirma.changeItem("19")
+                MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  isnull(mit_firmaFMZoll,0)=19  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
+
            Case "VERAGIMEX"
                Dim whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') "
                If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb
@@ -58,6 +58,7 @@ Partial Class frmFaktSammelRgDrucken
        Me.Label6 = New System.Windows.Forms.Label()
        Me.cboAbfertigungsart = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Button2 = New System.Windows.Forms.Button()
+        Me.RadioButton5 = New System.Windows.Forms.RadioButton()
        Me.pnl.SuspendLayout()
        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
@@ -66,6 +67,7 @@ Partial Class frmFaktSammelRgDrucken
        '
        Me.pnl.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.RadioButton5)
        Me.pnl.Controls.Add(Me.RadioButton6)
        Me.pnl.Controls.Add(Me.RadioButton4)
        Me.pnl.Controls.Add(Me.RadioButton3)
@@ -74,13 +76,13 @@ Partial Class frmFaktSammelRgDrucken
        Me.pnl.Controls.Add(Me.RadioButton)
        Me.pnl.Location = New System.Drawing.Point(12, 12)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(113, 145)
+        Me.pnl.Size = New System.Drawing.Size(113, 167)
        Me.pnl.TabIndex = 0
        '
        'RadioButton6
        '
        Me.RadioButton6.AutoSize = True
-        Me.RadioButton6.Location = New System.Drawing.Point(8, 122)
+        Me.RadioButton6.Location = New System.Drawing.Point(8, 141)
        Me.RadioButton6.Name = "RadioButton6"
        Me.RadioButton6.Size = New System.Drawing.Size(76, 17)
        Me.RadioButton6.TabIndex = 5
@@ -92,7 +94,7 @@ Partial Class frmFaktSammelRgDrucken
        'RadioButton4
        '
        Me.RadioButton4.AutoSize = True
-        Me.RadioButton4.Location = New System.Drawing.Point(8, 99)
+        Me.RadioButton4.Location = New System.Drawing.Point(8, 95)
        Me.RadioButton4.Name = "RadioButton4"
        Me.RadioButton4.Size = New System.Drawing.Size(91, 17)
        Me.RadioButton4.TabIndex = 4
@@ -104,7 +106,7 @@ Partial Class frmFaktSammelRgDrucken
        'RadioButton3
        '
        Me.RadioButton3.AutoSize = True
-        Me.RadioButton3.Location = New System.Drawing.Point(8, 76)
+        Me.RadioButton3.Location = New System.Drawing.Point(8, 74)
        Me.RadioButton3.Name = "RadioButton3"
        Me.RadioButton3.Size = New System.Drawing.Size(72, 17)
        Me.RadioButton3.TabIndex = 3
@@ -498,6 +500,19 @@ Partial Class frmFaktSammelRgDrucken
        Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.Button2.UseVisualStyleBackColor = True
        '
+        'RadioButton5
+        '
+        Me.RadioButton5.AutoSize = True
+        Me.RadioButton5.Enabled = False
+        Me.RadioButton5.Location = New System.Drawing.Point(8, 118)
+        Me.RadioButton5.Name = "RadioButton5"
+        Me.RadioButton5.Size = New System.Drawing.Size(92, 17)
+        Me.RadioButton5.TabIndex = 6
+        Me.RadioButton5.TabStop = True
+        Me.RadioButton5.Tag = "6"
+        Me.RadioButton5.Text = "6 Maut/Diesel"
+        Me.RadioButton5.UseVisualStyleBackColor = True
+        '
        'frmFaktSammelRgDrucken
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -578,4 +593,5 @@ Partial Class frmFaktSammelRgDrucken
    Friend WithEvents Label6 As Label
    Friend WithEvents cboAbfertigungsart As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Button2 As Button
+    Friend WithEvents RadioButton5 As RadioButton
 End Class
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
@@ -104,6 +104,10 @@ Public Class frmFaktSammelRgDrucken
            FirmaTmp = "VERAGIMEX"
        End If

+        If Not IsDBNull(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) AndAlso CInt(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) = 19 Then
+            FirmaTmp = "VERAG360"
+        End If
+
        Label5.Visible = True
        cboFaktGrp.Visible = True

@@ -133,6 +137,10 @@ Public Class frmFaktSammelRgDrucken
                cboSB.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  mit_firma='AMBAR'  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
                Label5.Visible = False
                cboFaktGrp.Visible = False
+            Case "VERAG360"
+                cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID=19", False, "FMZOLL")
+                cboFirma.changeItem("19")
+                cboSB.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  isnull(mit_firmaFMZoll,0)=19  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
        End Select
        '  cboFirma.fillWithSQL("SELECT  [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) ORDER BY Firma_ID  ", True, "FMZOLL")
        cboFirma.changeItem(Firma)
@@ -140,8 +148,10 @@ Public Class frmFaktSammelRgDrucken


        cboFaktGrp.Items.Clear()
-        cboFaktGrp.fillWithSQL("SELECT [Code],[Bezeichnung] FROM tblFakturierungsgruppe", False, "ADMIN", False)
-        cboFaktGrp.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_fakturierungsgruppe)
+        If FirmaTmp <> "VERAG360" Then
+            cboFaktGrp.fillWithSQL("SELECT [Code],[Bezeichnung] FROM tblFakturierungsgruppe", False, "ADMIN", False)
+            cboFaktGrp.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_fakturierungsgruppe)
+        End If

        cProgramFunctions.initDrucker(cboPrinter)

--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -559,6 +559,10 @@ Public Class usrCntlFaktAbrechnung
            FirmaTmp = "VERAGIMEX"
        End If

+        If Not IsDBNull(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) AndAlso CInt(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) = 19 Then
+            FirmaTmp = "VERAG360"
+        End If
+
        'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
        'FirmaTmp = "AMBAR"
        'End If
@@ -594,8 +598,15 @@ Public Class usrCntlFaktAbrechnung
                End If
        End Select

-        cboFirma.fillWithSQL("SELECT  [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID  ", True, "FMZOLL", firstEmpty)
-        cboFirma.SelectedIndex = 0
+        Select Case FirmaTmp
+
+            Case "VERAG360"
+                cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID=19", False, "FMZOLL")
+                cboFirma.changeItem("19")
+            Case Else
+                cboFirma.fillWithSQL("SELECT  [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID  ", True, "FMZOLL", firstEmpty)
+                cboFirma.SelectedIndex = 0
+        End Select

        If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "" And Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER And FirmaTmp <> "VERAGIMEX" Then
            If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then