edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NCTS 5

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-09-24 23:03:47 +02:00
parent 6e2166588b
commit 3f3b2ea783
5 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Aviso/Benachrichtigung/frmAvisoWeiterleiten.Designer.vb generated
View File

@@ -82,6 +82,7 @@ Partial Class frmAvisoWeiterleiten
Me.Button1 = New System.Windows.Forms.Button()
Me.Label5 = New System.Windows.Forms.Label()
Me.rtbVermerk = New System.Windows.Forms.RichTextBox()
Me.Button2 = New System.Windows.Forms.Button()
Me.pnl.SuspendLayout()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel2.SuspendLayout()
@@ -111,7 +112,7 @@ Partial Class frmAvisoWeiterleiten
Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
Me.pnl.Location = New System.Drawing.Point(0, 0)
Me.pnl.Name = "pnl"
Me.pnl.Size = New System.Drawing.Size(979, 37)
Me.pnl.Size = New System.Drawing.Size(1112, 37)
Me.pnl.TabIndex = 0
'
'Label3
@@ -119,7 +120,7 @@ Partial Class frmAvisoWeiterleiten
Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label3.AutoSize = True
Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
Me.Label3.Location = New System.Drawing.Point(823, 7)
Me.Label3.Location = New System.Drawing.Point(956, 7)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(109, 24)
Me.Label3.TabIndex = 8
@@ -129,7 +130,7 @@ Partial Class frmAvisoWeiterleiten
'
Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.pic.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1
Me.pic.Location = New System.Drawing.Point(935, 3)
Me.pic.Location = New System.Drawing.Point(1068, 3)
Me.pic.Name = "pic"
Me.pic.Size = New System.Drawing.Size(44, 32)
Me.pic.TabIndex = 7
@@ -229,10 +230,12 @@ Partial Class frmAvisoWeiterleiten
Me.MyTextBox1._DateTimeOnly = False
Me.MyTextBox1._numbersOnly = False
Me.MyTextBox1._numbersOnlyKommastellen = ""
Me.MyTextBox1._numbersOnlyTrennzeichen = True
Me.MyTextBox1._Prozent = False
Me.MyTextBox1._ShortDateNew = False
Me.MyTextBox1._ShortDateOnly = False
Me.MyTextBox1._TimeOnly = False
Me.MyTextBox1._TimeOnly_Seconds = False
Me.MyTextBox1._value = ""
Me.MyTextBox1._Waehrung = False
Me.MyTextBox1._WaehrungZeichen = True
@@ -255,7 +258,7 @@ Partial Class frmAvisoWeiterleiten
Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel4.Location = New System.Drawing.Point(320, 37)
Me.Panel4.Name = "Panel4"
Me.Panel4.Size = New System.Drawing.Size(659, 702)
Me.Panel4.Size = New System.Drawing.Size(792, 702)
Me.Panel4.TabIndex = 20
'
'Panel1
@@ -267,7 +270,7 @@ Partial Class frmAvisoWeiterleiten
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left
Me.Panel1.Location = New System.Drawing.Point(200, 57)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(449, 468)
Me.Panel1.Size = New System.Drawing.Size(577, 468)
Me.Panel1.TabIndex = 20
'
'flpFirma
@@ -275,7 +278,7 @@ Partial Class frmAvisoWeiterleiten
Me.flpFirma.Dock = System.Windows.Forms.DockStyle.Fill
Me.flpFirma.Location = New System.Drawing.Point(0, 28)
Me.flpFirma.Name = "flpFirma"
Me.flpFirma.Size = New System.Drawing.Size(447, 438)
Me.flpFirma.Size = New System.Drawing.Size(575, 438)
Me.flpFirma.TabIndex = 1
'
'Panel3
@@ -286,7 +289,7 @@ Partial Class frmAvisoWeiterleiten
Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel3.Location = New System.Drawing.Point(0, 0)
Me.Panel3.Name = "Panel3"
Me.Panel3.Size = New System.Drawing.Size(447, 28)
Me.Panel3.Size = New System.Drawing.Size(575, 28)
Me.Panel3.TabIndex = 2
'
'Label1
@@ -588,10 +591,11 @@ Partial Class frmAvisoWeiterleiten
Me.MyFlowLayoutPanel1.Controls.Add(Me.btnVERIMEX)
Me.MyFlowLayoutPanel1.Controls.Add(Me.btnAMBAR)
Me.MyFlowLayoutPanel1.Controls.Add(Me.btnATILLA)
Me.MyFlowLayoutPanel1.Controls.Add(Me.Button2)
Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top
Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1"
Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(657, 57)
Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(790, 57)
Me.MyFlowLayoutPanel1.TabIndex = 21
'
'btnVERAG
@@ -664,7 +668,7 @@ Partial Class frmAvisoWeiterleiten
'
Me.btnATILLA.FlatStyle = System.Windows.Forms.FlatStyle.Popup
Me.btnATILLA.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
Me.btnATILLA.Location = New System.Drawing.Point(3, 52)
Me.btnATILLA.Location = New System.Drawing.Point(657, 3)
Me.btnATILLA.Name = "btnATILLA"
Me.btnATILLA.Size = New System.Drawing.Size(120, 43)
Me.btnATILLA.TabIndex = 11
@@ -682,7 +686,7 @@ Partial Class frmAvisoWeiterleiten
Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
Me.Panel5.Location = New System.Drawing.Point(0, 525)
Me.Panel5.Name = "Panel5"
Me.Panel5.Size = New System.Drawing.Size(657, 175)
Me.Panel5.Size = New System.Drawing.Size(790, 175)
Me.Panel5.TabIndex = 22
'
'Label6
@@ -758,12 +762,23 @@ Partial Class frmAvisoWeiterleiten
Me.rtbVermerk.TabIndex = 0
Me.rtbVermerk.Text = ""
'
'Button2
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup
Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
Me.Button2.Location = New System.Drawing.Point(3, 52)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(120, 43)
Me.Button2.TabIndex = 12
Me.Button2.Text = "WARENORT"
Me.Button2.UseVisualStyleBackColor = True
'
'frmAvisoWeiterleiten
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(979, 739)
Me.ClientSize = New System.Drawing.Size(1112, 739)
Me.Controls.Add(Me.Panel4)
Me.Controls.Add(Me.Panel2)
Me.Controls.Add(Me.pnl)
@@ -854,4 +869,5 @@ Partial Class frmAvisoWeiterleiten
Friend WithEvents btnVERIMEX As Button
Friend WithEvents btnAMBAR As Button
Friend WithEvents btnATILLA As Button
Friend WithEvents Button2 As Button
End Class

9
Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
View File

@@ -121,6 +121,9 @@ Public Class frmAvisoWeiterleiten
Case "B"
text = "An '" & bezeichnung & "' gegeben."
WeiterleitungTextTV = bezeichnung
Case "W"
text = "An '" & bezeichnung & "' gegeben."
WeiterleitungTextTV = bezeichnung
End Select
@@ -252,7 +255,7 @@ Public Class frmAvisoWeiterleiten
' initButtons(sender)
'End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnVERAG.Click, btnIMEX.Click, btnUNIPED.Click, btnFrontoffice.Click, btnVERIMEX.Click, btnAMBAR.Click, btnATILLA.Click
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnVERAG.Click, btnIMEX.Click, btnUNIPED.Click, btnFrontoffice.Click, btnVERIMEX.Click, btnAMBAR.Click, btnATILLA.Click, Button2.Click
'flpAbteilung.Controls.Clear()
flpTeams.Controls.Clear()
' flpNiederlassung.Controls.Clear()
@@ -316,6 +319,9 @@ Public Class frmAvisoWeiterleiten
ElseIf sender Is btnAMBAR Then
addBtn(flpFirma, "F", "AMBAR", "AMBAR", True)
ElseIf sender Is Button2 Then
addBtn(flpFirma, "W", "FO_WIHD", "KÖRFEZ 61", True, "VERAG")
End If
initButtonsTop(sender)
@@ -423,4 +429,5 @@ Public Class frmAvisoWeiterleiten
dgvAnmhaenge.ClearSelection()
End Sub
End Class

11
Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
View File

@@ -34,12 +34,18 @@ Public Class usrCntlBenachrichtigungen
Dim whereMA = " AND ( 1<>1 "
'WARENORT
If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
whereMA &= " OR (ab_TO_Art='W' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "') "
If cbxNeukunden.Checked Then
'NEUKUNDEN
ElseIf cbxNeukunden.Checked Then
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "VERAG"
whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='13') " 'TEAM_NEUKUNDEN --> VERAG
End Select
'SONST
Else
If cbxCluster.Checked Then
@@ -66,13 +72,14 @@ Public Class usrCntlBenachrichtigungen
End If
End If
End If
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 list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
' List.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
'If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '? vlt hilfts...

4
Aviso/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.9.1.9")>
<Assembly: AssemblyFileVersion("3.9.1.9")>
<Assembly: AssemblyVersion("3.9.2.4")>
<Assembly: AssemblyFileVersion("3.9.2.4")>

25
Aviso/usrcntlAktDetails.vb
View File

@@ -251,7 +251,8 @@ Public Class usrcntlAktDetails
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
btnOptionen.Enabled = False
btnLkwBeleg.Visible = False
tbcntlVermerke.TabPages.Remove(tbAnhang)
'tbcntlVermerke.TabPages.Remove(tbAnhang)
Button18.Visible = False
btnDipoListeEmail.Visible = False
btnLZDruckDIGITAL.Visible = False
@@ -768,10 +769,20 @@ Public Class usrcntlAktDetails
btnQuckScan.Visible = True
End If
Dim AktSndAnhaenge = " AND isnull(anh_SendungsId,0) <=0 "
If dgvSendungen.SelectedRows.Count > 0 Then
AktSndAnhaenge = " AND ( isnull(anh_SendungsId,0) <=0 OR isnull(anh_SendungsId,0)='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value & "' ) "
End If
Dim WhereWO = " "
If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
WhereWO = " AND isnull(anh_SendungsId,0) <> 0 "
End If
Button18.Visible = True
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],[anh_Art],[anh_Typ], anh_markiert FROM [tblAvisoAnhaenge]
WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0
ORDER BY
Dim hSQL As String = " Select [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ], anh_markiert FROM [tblAvisoAnhaenge]
WHERE [anh_AvisoId]='" & AvisoID & "' " & AktSndAnhaenge & " " & WhereWO & "
ORDER BY anh_SendungsId desc,
case
when [anh_Art] = 'ATR-EUR1' then 0
when [anh_Art] = 'Rechnung' then 1
@@ -1814,7 +1825,11 @@ Public Class usrcntlAktDetails
Private Sub dgvSendungen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSendungen.SelectionChanged
If sendAktiv Then
If dgvSendungen.SelectedRows.Count > 0 Then
If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2
If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
If tbcntlVermerke.SelectedIndex <> 2 And tbcntlVermerke.SelectedIndex <> 3 Then tbcntlVermerke.SelectedIndex = 2
Else
If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2 ' Wennnnciht WO, soll immer zu den Sendungsvermerken gesprungen werdne.
End If
Else
If tbcntlVermerke.SelectedIndex <> 0 Then tbcntlVermerke.SelectedIndex = 0
End If