WARENORT-AVISO, EN-Anpassung, Benachrichtigungen, ATILLA-Indonesien, AVISO-TV
This commit is contained in:
@@ -163,13 +163,35 @@ Public Class frmAvisoWeiterleiten
|
||||
End If
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And WLart = "A" And bezeichnung = "VERIMEX" Then
|
||||
If vbYes = MsgBox("Akt auf Status 'VERIMEX' setzten?", vbYesNoCancel) Then
|
||||
Dim FUNC As New AvisoStatusFunctions
|
||||
FUNC.setVorbereitet(AvisoId)
|
||||
|
||||
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And WLart = "A" And bezeichnung = "VERIMEX" Then
|
||||
' If vbYes = MsgBox("Akt auf Status 'VERIMEX' setzten?", vbYesNoCancel) Then
|
||||
' Dim FUNC As New AvisoStatusFunctions
|
||||
' FUNC.setVorbereitet(AvisoId)
|
||||
' End If
|
||||
'End If
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("STATUS_ATILLA") Then
|
||||
If WLart = "T" And bezeichnungFirma = "VERIMEX" Or WLart = "F" And bezeichnung = "VERIMEX" Then
|
||||
If vbYes = MsgBox("Akt auf Status 'AN VERIMEX' setzten?", vbYesNoCancel) Then
|
||||
Dim FUNC As New AvisoStatusFunctions
|
||||
FUNC.setAnVERIMEX(AvisoId)
|
||||
End If
|
||||
End If
|
||||
If WLart = "T" And bezeichnung = "INDONESIEN" Then
|
||||
If vbYes = MsgBox("Akt auf Status 'AN INDONESIEN' setzten?", vbYesNoCancel) Then
|
||||
Dim FUNC As New AvisoStatusFunctions
|
||||
FUNC.setAnINDONESIEN(AvisoId)
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
|
||||
' Me.Close()
|
||||
' End If
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ Partial Class usrCntlBenachrichtigungen
|
||||
Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
Me.Panel4 = New System.Windows.Forms.Panel()
|
||||
Me.txtVermerk = New System.Windows.Forms.TextBox()
|
||||
Me.cbxNeukunden = New System.Windows.Forms.CheckBox()
|
||||
Me.Button10 = New System.Windows.Forms.Button()
|
||||
Me.Panel3 = New System.Windows.Forms.Panel()
|
||||
@@ -35,7 +36,7 @@ Partial Class usrCntlBenachrichtigungen
|
||||
Me.cbxTeams = New System.Windows.Forms.CheckBox()
|
||||
Me.Label22 = New System.Windows.Forms.Label()
|
||||
Me.Label25 = New System.Windows.Forms.Label()
|
||||
Me.txtVermerk = New System.Windows.Forms.TextBox()
|
||||
Me.cbxVerwarung = New System.Windows.Forms.CheckBox()
|
||||
Me.Panel2.SuspendLayout()
|
||||
CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.Panel4.SuspendLayout()
|
||||
@@ -93,6 +94,7 @@ Partial Class usrCntlBenachrichtigungen
|
||||
'Panel4
|
||||
'
|
||||
Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
|
||||
Me.Panel4.Controls.Add(Me.cbxVerwarung)
|
||||
Me.Panel4.Controls.Add(Me.txtVermerk)
|
||||
Me.Panel4.Controls.Add(Me.cbxNeukunden)
|
||||
Me.Panel4.Controls.Add(Me.Button10)
|
||||
@@ -102,6 +104,16 @@ Partial Class usrCntlBenachrichtigungen
|
||||
Me.Panel4.Size = New System.Drawing.Size(284, 38)
|
||||
Me.Panel4.TabIndex = 5
|
||||
'
|
||||
'txtVermerk
|
||||
'
|
||||
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
|
||||
'
|
||||
'cbxNeukunden
|
||||
'
|
||||
Me.cbxNeukunden.AutoSize = True
|
||||
@@ -189,15 +201,17 @@ Partial Class usrCntlBenachrichtigungen
|
||||
Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen"
|
||||
Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight
|
||||
'
|
||||
'txtVermerk
|
||||
'cbxVerwarung
|
||||
'
|
||||
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
|
||||
Me.cbxVerwarung.AutoSize = True
|
||||
Me.cbxVerwarung.ForeColor = System.Drawing.Color.Black
|
||||
Me.cbxVerwarung.Location = New System.Drawing.Point(85, 19)
|
||||
Me.cbxVerwarung.Name = "cbxVerwarung"
|
||||
Me.cbxVerwarung.Size = New System.Drawing.Size(83, 17)
|
||||
Me.cbxVerwarung.TabIndex = 32
|
||||
Me.cbxVerwarung.Text = "Verwahrung"
|
||||
Me.cbxVerwarung.UseVisualStyleBackColor = True
|
||||
Me.cbxVerwarung.Visible = False
|
||||
'
|
||||
'usrCntlBenachrichtigungen
|
||||
'
|
||||
@@ -228,4 +242,5 @@ Partial Class usrCntlBenachrichtigungen
|
||||
Friend WithEvents cbxCluster As CheckBox
|
||||
Friend WithEvents cbxNeukunden As CheckBox
|
||||
Friend WithEvents txtVermerk As TextBox
|
||||
Friend WithEvents cbxVerwarung As CheckBox
|
||||
End Class
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
Public Class usrCntlBenachrichtigungen
|
||||
Imports DAKOSY_Worker.SumAErledigungsinformationVorpapier
|
||||
|
||||
Public Class usrCntlBenachrichtigungen
|
||||
Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Dim ASF As New AvisoStatusFunctions
|
||||
|
||||
@@ -48,6 +50,12 @@
|
||||
whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') "
|
||||
End If
|
||||
|
||||
If cbxVerwarung.Checked Then
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Case "VERAG"
|
||||
whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='26') " 'TEAM_VERWARUNG --> VERAG
|
||||
End Select
|
||||
End If
|
||||
|
||||
If cbxTeams.Checked Then
|
||||
whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) "
|
||||
@@ -205,6 +213,10 @@
|
||||
'cbxNeukunden.Checked = True
|
||||
End If
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeVerwahrung", "AVISO") Then
|
||||
cbxVerwarung.Visible = True
|
||||
cbxVerwarung.Checked = True
|
||||
End If
|
||||
|
||||
|
||||
'NEIN; weils zB Waidhaus dann alles sieht und übernimmt
|
||||
|
||||
Reference in New Issue
Block a user