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

merge

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-08-28 14:24:27 +02:00
parent 85af0323b0 6d663578ba
commit d31cb7878a
7 changed files with 493 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Aviso/Anhänge/frmAddSendnung.vb
View File

@@ -5,6 +5,7 @@
Dim AvisoId As Integer Dim AvisoId As Integer
Dim AVISOFUNC As New AvisoStatusFunctions Dim AVISOFUNC As New AvisoStatusFunctions
Public SendungsId As Integer = -1 Public SendungsId As Integer = -1
Public frmName As String = "Sendung hinzufügen"
Sub New(AvisoId) Sub New(AvisoId)
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
@@ -23,7 +24,24 @@
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
End Sub End Sub
Sub New(AvisoId, SENDUNG, frmName)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
Me.AvisoId = AvisoId
Me.Sendung = SENDUNG
Me.frmName = frmName
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
End Sub
Private Sub frmAddSendnung_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmAddSendnung_Load(sender As Object, e As EventArgs) Handles Me.Load
'Me.Text = frmName
cboAbfertigungsart.fillWithSQL("SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ", True, "FMZOLL", True) cboAbfertigungsart.fillWithSQL("SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ", True, "FMZOLL", True)
txtEmpfaenger.initKdBox(Me) txtEmpfaenger.initKdBox(Me)
txtEmpfaenger.usrcntlWIDTH = 360 txtEmpfaenger.usrcntlWIDTH = 360

1
Aviso/frmAddSendungsvermerkShort.vb
View File

@@ -58,6 +58,7 @@ Public Class frmAddSendungsvermerkShort
End Sub End Sub
Private Sub frmEintragVermerk_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load Private Sub frmEintragVermerk_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
'cboDokumente.Items.Clear() 'cboDokumente.Items.Clear()
' cboDokumente.Items.Add(New MyListItem("nachgefordert", CStr(0))) ' cboDokumente.Items.Add(New MyListItem("nachgefordert", CStr(0)))
'cboDokumente.Items.Add(New MyListItem("erhalten", CStr(1))) 'cboDokumente.Items.Add(New MyListItem("erhalten", CStr(1)))

13
Aviso/frmAvisoAnhangsarten.Designer.vb generated
View File

@@ -26,6 +26,7 @@ Partial Class frmAvisoAnhangsarten
Me.btnOK = New System.Windows.Forms.Button() Me.btnOK = New System.Windows.Forms.Button()
Me.Label2 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label()
Me.txtSuche = New System.Windows.Forms.TextBox() Me.txtSuche = New System.Windows.Forms.TextBox()
Me.Button1 = New System.Windows.Forms.Button()
CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout() Me.SuspendLayout()
' '
@@ -46,7 +47,6 @@ Partial Class frmAvisoAnhangsarten
Me.btnOK.TabIndex = 16 Me.btnOK.TabIndex = 16
Me.btnOK.Text = "Speichern" Me.btnOK.Text = "Speichern"
Me.btnOK.UseVisualStyleBackColor = True Me.btnOK.UseVisualStyleBackColor = True
Me.btnOK.Visible = False
' '
'Label2 'Label2
' '
@@ -64,11 +64,21 @@ Partial Class frmAvisoAnhangsarten
Me.txtSuche.Size = New System.Drawing.Size(150, 20) Me.txtSuche.Size = New System.Drawing.Size(150, 20)
Me.txtSuche.TabIndex = 18 Me.txtSuche.TabIndex = 18
' '
'Button1
'
Me.Button1.Location = New System.Drawing.Point(605, 12)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(193, 23)
Me.Button1.TabIndex = 19
Me.Button1.Text = "fehlende Anhangsarten"
Me.Button1.UseVisualStyleBackColor = True
'
'frmAvisoAnhangsarten 'frmAvisoAnhangsarten
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(810, 481) Me.ClientSize = New System.Drawing.Size(810, 481)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label2)
Me.Controls.Add(Me.txtSuche) Me.Controls.Add(Me.txtSuche)
Me.Controls.Add(Me.btnOK) Me.Controls.Add(Me.btnOK)
@@ -85,4 +95,5 @@ Partial Class frmAvisoAnhangsarten
Friend WithEvents btnOK As Button Friend WithEvents btnOK As Button
Friend WithEvents Label2 As Label Friend WithEvents Label2 As Label
Friend WithEvents txtSuche As TextBox Friend WithEvents txtSuche As TextBox
Friend WithEvents Button1 As Button
End Class End Class

53
Aviso/frmAvisoAnhangsarten.vb
View File

@@ -1,5 +1,8 @@
Imports iText.Forms.Xfdf 
Imports DocumentFormat.OpenXml.Wordprocessing
Imports iText.Forms.Xfdf
Imports iText.Kernel.Pdf Imports iText.Kernel.Pdf
Imports System.Runtime.Remoting
Imports System.Web.UI Imports System.Web.UI
Public Class frmAvisoAnhangsarten Public Class frmAvisoAnhangsarten
@@ -92,6 +95,7 @@ Public Class frmAvisoAnhangsarten
Try Try
e.Row.Cells("aa_aktiv").Value = True e.Row.Cells("aa_aktiv").Value = True
e.Row.Cells("aa_isBrexti").Value = False
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message) MsgBox(ex.Message)
@@ -110,6 +114,7 @@ Public Class frmAvisoAnhangsarten
SPRACHENBind.updateBinding() SPRACHENBind.updateBinding()
End If End If
End Sub End Sub
@@ -126,5 +131,51 @@ Public Class frmAvisoAnhangsarten
End If End If
End Sub End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim dtAnhaenge As DataTable = sql.loadDgvBySql("SELECT distinct([anh_Art]) as bezeichnung FROM [tblAvisoAnhaenge]", "AVISO")
Dim dtAnhangsarten As DataTable = sql.loadDgvBySql("SELECT distinct([aa_bezeichnung]) as bezeichnung FROM " & table, "AVISO")
If dtAnhaenge.Rows.Count = 0 Or dtAnhangsarten.Rows.Count = 0 Then Exit Sub
Dim resultsTable As New DataTable
resultsTable.Columns.Add("bezeichnung", GetType(String))
For Each rowAnhang As DataRow In dtAnhaenge.Rows
If rowAnhang(0) <> "" Then
Dim isExisting As Boolean = False
For Each rowArt As DataRow In dtAnhangsarten.Rows
If rowArt(0) = rowAnhang(0) Then
isExisting = True
Exit For
End If
Next
If Not isExisting Then
Dim R As DataRow = resultsTable.NewRow
R(0) = rowAnhang(0)
resultsTable.Rows.Add(R)
End If
End If
Next
If resultsTable.Rows.Count > 0 Then
Dim b = New System.Text.StringBuilder()
For Each resultRow In resultsTable.Rows
b.Append(resultRow(0) & vbNewLine)
Next
MsgBox(resultsTable.Rows.Count & " fehlende Anhangsarten:" & vbNewLine & b.ToString)
Else
MsgBox("keine fehlenden Anhangsarten")
End If
End Sub
End Class End Class

736
Aviso/frmHauptfenster.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

8
Aviso/frmHauptfenster.vb
View File

@@ -2224,7 +2224,7 @@ Public Class frmHauptfenster
GridZeichnenAviso() GridZeichnenAviso()
End Sub End Sub
Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, Button7.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnNeu.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, btnUmrechnungskurse.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnNeu.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter
Try Try
Dim cF As Color = DirectCast(sender, Button).ForeColor Dim cF As Color = DirectCast(sender, Button).ForeColor
Dim cB As Color = DirectCast(sender, Button).BackColor Dim cB As Color = DirectCast(sender, Button).BackColor
@@ -2235,7 +2235,7 @@ Public Class frmHauptfenster
End Try End Try
End Sub End Sub
Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, Button7.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnNeu.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, btnUmrechnungskurse.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnNeu.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave
Try Try
Dim cF As Color = DirectCast(sender, Button).ForeColor Dim cF As Color = DirectCast(sender, Button).ForeColor
Dim cB As Color = DirectCast(sender, Button).BackColor Dim cB As Color = DirectCast(sender, Button).BackColor
@@ -3469,7 +3469,7 @@ Public Class frmHauptfenster
Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click Private Sub Button7_Click(sender As Object, e As EventArgs) Handles btnUmrechnungskurse.Click
'Process.Start("http://www.zoll.de/DE/Fachthemen/Zoelle/Zollwert/Aktuelle-Umrechnungskurse/Datenbankanwendung/datenbankanwendung_node.html") 'Process.Start("http://www.zoll.de/DE/Fachthemen/Zoelle/Zollwert/Aktuelle-Umrechnungskurse/Datenbankanwendung/datenbankanwendung_node.html")
'Process.Start("http://www.zoll.de/SiteGlobals/Forms/KursSuche/KurseSuche_Formular_NotierteWaehrung.html?method=post&iso2code2=TR") 'Process.Start("http://www.zoll.de/SiteGlobals/Forms/KursSuche/KurseSuche_Formular_NotierteWaehrung.html?method=post&iso2code2=TR")
@@ -4208,7 +4208,7 @@ Public Class frmHauptfenster
End If End If
End Sub End Sub
Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click Private Sub Button9_Click(sender As Object, e As EventArgs) Handles btnKontakt.Click
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Telefonliste") Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Telefonliste")
'MsgBox(DS.da_id) 'MsgBox(DS.da_id)
DS.OPEN_SINGLE() DS.OPEN_SINGLE()

68
Aviso/usrcntlAktDetails.vb
View File

@@ -783,42 +783,50 @@ Public Class usrcntlAktDetails
End If End If
Button18.Visible = True Button18.Visible = True
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] 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 & " ' WHERE [anh_AvisoId]='" & AvisoID & "' " & AktSndAnhaenge & " " & WhereWO & "
ORDER BY anh_SendungsId desc, ' ORDER BY anh_SendungsId desc,
case ' case
when [anh_Art] = 'ATR' then 0 ' when [anh_Art] = 'ATR' then 0
when [anh_Art] = 'ATR-EUR1' then 0 ' when [anh_Art] = 'ATR-EUR1' then 0
when [anh_Art] = 'EUR1' then 0.1 ' when [anh_Art] = 'EUR1' then 0.1
when [anh_Art] = 'Rechnung' then 1 ' when [anh_Art] = 'Rechnung' then 1
when [anh_Art] = 'eFatura' then 1.1 ' when [anh_Art] = 'eFatura' then 1.1
when [anh_Art] = 'CMR' then 2 ' when [anh_Art] = 'CMR' then 2
when [anh_Art] = 'Ausfuhr' then 3 ' when [anh_Art] = 'Ausfuhr' then 3
when [anh_Art] = 'Vorpapier' then 4 ' when [anh_Art] = 'Vorpapier' then 4
when [anh_Art] = 'Packliste' then 5 ' when [anh_Art] = 'Packliste' then 5
when [anh_Art] = 'Auftrag' then 6 ' when [anh_Art] = 'Auftrag' then 6
when [anh_Art] = 'Auftrag' then 7 ' when [anh_Art] = 'Auftrag' then 7
when [anh_Art] = 'Dispoliste' then 8 ' when [anh_Art] = 'Dispoliste' then 8
when [anh_Art] = 'Vorkasse' then 9 ' when [anh_Art] = 'Vorkasse' then 9
when [anh_Art] = 'Überweisungsbeleg' then 10 ' when [anh_Art] = 'Überweisungsbeleg' then 10
when [anh_Art] = 'Vollmacht' then 11 ' when [anh_Art] = 'Vollmacht' then 11
when [anh_Art] = 'ATB' then 12 ' when [anh_Art] = 'ATB' then 12
when [anh_Art] = 'ATA' then 13 ' when [anh_Art] = 'ATA' then 13
when [anh_Art] = 'GGED_D' then 40 ' when [anh_Art] = 'GGED_D' then 40
when [anh_Art] = 'GGED_PP' then 41 ' when [anh_Art] = 'GGED_PP' then 41
when [anh_Art] = 'GGED_P' then 42 ' when [anh_Art] = 'GGED_P' then 42
when [anh_Art] = 'GGED_A' then 43 ' when [anh_Art] = 'GGED_A' then 43
when [anh_Art] = 'PHYTO' then 44 ' when [anh_Art] = 'PHYTO' then 44
when [anh_Art] = 'CONFORM' then 45 ' when [anh_Art] = 'CONFORM' then 45
when [anh_Art] = 'Sonstiges' then 99 ' when [anh_Art] = 'Sonstiges' then 99
when [anh_Art] ='' then 15 ' when [anh_Art] ='' then 15
'END, [anh_Reihenfolge],[anh_id]"
hSQL = "SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND isnull(aa_name,'')='' THEN '***' ELSE [aa_name] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen, anh_markiert , anh_cmrId
FROM [tblAvisoAnhaenge]
left join tblAvisoAnhangsArten on aa_bezeichnung = anh_Art
WHERE anh_AvisoId='" & AvisoID & "'" & AktSndAnhaenge & " " & WhereWO & "
ORDER BY anh_SendungsId desc, case when aa_sort = NULL THEN 15 else aa_sort END, [anh_Reihenfolge],[anh_id]"
END, [anh_Reihenfolge],[anh_id]"
' order by [anh_Reihenfolge],[anh_id] ' order by [anh_Reihenfolge],[anh_id]
gridVermerke.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL) gridVermerke.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL)