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

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-01-12 14:00:35 +01:00
parent 6b58e32397 eb334c3256
commit cf4e17bcdb
7 changed files with 106 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb generated
View File

@@ -197,7 +197,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.Label45 = New System.Windows.Forms.Label()
Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.VerbringungsnachweisSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
Me.pnlRechts.SuspendLayout()
CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -235,15 +234,15 @@ Partial Class usrCntlSpeditionsBuchSuche
'cntxtCntxtSpeditionsbuch
'
Me.cntxtCntxtSpeditionsbuch.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EintragLöschenToolStripMenuItem, Me.VerbringungsnachweisSetzenToolStripMenuItem})
Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EintragLöschenToolStripMenuItem})
Me.cntxtCntxtSpeditionsbuch.Name = "cntxtCntxtSpeditionsbuch"
Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(230, 70)
Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(181, 48)
Me.cntxtCntxtSpeditionsbuch.Text = "cntxtSpeditionsbuch"
'
'EintragLöschenToolStripMenuItem
'
Me.EintragLöschenToolStripMenuItem.Name = "EintragLöschenToolStripMenuItem"
Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.EintragLöschenToolStripMenuItem.Text = "Eintrag löschen"
'
'txtAvisoId
@@ -2760,12 +2759,6 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.SplitContainer.SplitterWidth = 2
Me.SplitContainer.TabIndex = 3
'
'VerbringungsnachweisSetzenToolStripMenuItem
'
Me.VerbringungsnachweisSetzenToolStripMenuItem.Name = "VerbringungsnachweisSetzenToolStripMenuItem"
Me.VerbringungsnachweisSetzenToolStripMenuItem.Size = New System.Drawing.Size(229, 22)
Me.VerbringungsnachweisSetzenToolStripMenuItem.Text = "Verbringungsnachweis setzen"
'
'usrCntlSpeditionsBuchSuche
'
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -2977,5 +2970,4 @@ Partial Class usrCntlSpeditionsBuchSuche
Friend WithEvents FlenderBocholtZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents txtVermerk As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label48 As Label
Friend WithEvents VerbringungsnachweisSetzenToolStripMenuItem As ToolStripMenuItem
End Class

22
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

@@ -713,6 +713,10 @@ Public Class usrCntlSpeditionsBuchSuche
Private Sub EintragLöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EintragLöschenToolStripMenuItem.Click
If DataGridView.SelectedRows.Count > 0 Then
If DataGridView.SelectedRows.Count > 1 Then
MsgBox("Einträge können nur einzeln gelöscht werden!")
Exit Sub
End If
If vbYes = MsgBox("Möchten Sie den Eintrag wirklich löschen?", vbYesNoCancel) Then
Dim r As DataGridViewRow = DataGridView.SelectedRows(0)
SQL.doSQL("DELETE FROM [Speditionsbuch] WHERE [FilialenNr]='" & r.Cells("FilialenNr").Value & "' AND [AbfertigungsNr] ='" & r.Cells("AbfertigungsNr").Value & "' AND [UnterNr]='" & r.Cells("UnterNr").Value & "' ", "FMZOLL")
@@ -1846,10 +1850,6 @@ Public Class usrCntlSpeditionsBuchSuche
End Sub
Private Sub DataGridView_CellContentClick(sender As Object, e As DataGridViewCellEventArgs)
End Sub
Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click
getrHandlingAussenstellen(, cboHandlingssatz._value)
End Sub
@@ -2374,18 +2374,4 @@ Public Class usrCntlSpeditionsBuchSuche
End Function
Private Sub VerbringungsnachweisSetzenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerbringungsnachweisSetzenToolStripMenuItem.Click
'cbxCMR.Checked = SPEDITIONSBUCH.SB_CMR
'txtCMRDatum.Text = If(SPEDITIONSBUCH.SB_CMRDatum, "")
'txtCMRNr.Text = If(SPEDITIONSBUCH.SB_CMRNr, "")
'If pnlFiskal.Visible Then
' SPEDITIONSBUCH.SB_CMR = cbxCMR.Checked
' If txtCMRDatum.Text <> "" Then SPEDITIONSBUCH.SB_CMRDatum = txtCMRDatum.Text
' SPEDITIONSBUCH.SB_CMRNr = txtCMRNr.Text
'End If
End Sub
End Class

3
SDL/cProgramFunctions.vb
View File

@@ -215,7 +215,8 @@ Public Class cProgramFunctions
If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat395] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat397] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
Else
docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].TheCat889 WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].TheCat1083 WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat889] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat398] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat291] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")
If Not IsNumeric(docid) OrElse docid <= 0 Then docid = SQL_VERAG.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1) FROM [Therefore].[dbo].[TheCat153] WHERE [String] LIKE '" & abfertNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON")

87
SDL/mdm/usrCntlMDMAuswertungen.vb
View File

@@ -1241,8 +1241,7 @@ Public Class usrCntlMDMAuswertungen
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim frm As New Form
Dim dgv As New DataGridView()
Dim dt As DataTable = SQL.loadDgvBySql("SELECT
PKFileName,
FileCreationDate,
@@ -1256,19 +1255,81 @@ Public Class usrCntlMDMAuswertungen
GROUP BY PKFileName, FileCreationDate, Abrechnungsdatum, VATRate
ORDER BY PKFileName", "ASFINAG")
dgv.DataSource = dt
If dgv IsNot Nothing Then
frm.Size = New Size(1400, 1000)
dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50)
dgv.Dock = DockStyle.Fill
dgv.Anchor = AnchorStyles.Left
dgv.Anchor = AnchorStyles.Top
dgv.ReadOnly = True
frm.Controls.Add(dgv)
frm.StartPosition = FormStartPosition.CenterScreen
frm.ShowDialog()
If dt.Rows.Count = 0 Then
MsgBox("keine Daten vorhanden!")
Exit Sub
End If
Dim print As New frmPrintLayout
print.Text = "ASFINAG"
Dim rpt As New rptASFINAG_TransaktionenSumary
rpt.DataSource = dt
Dim sum = 0
rpt.lblUeberschrift.Text = "ASFINAG Transaktionssummen " & CDate(dat_Sum_Bis.Value.ToShortDateString)
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
rpt.Label10.Visible = False
Label1.Text = "Dateiname"
Label8.Text = "Erstellungsdatum"
'Dim cnt As Integer = 0
rpt.lblDat.Text = Now.ToLongDateString
Dim sumNetto As Double = 0
Dim sumMWST As Double = 0
Dim sumBrutto As Double = 0
Dim sumperKdNrNetto As Double = 0
Dim sumperKdNrMWST As Double = 0
Dim sumperKdNrBrutto As Double = 0
AddHandler rpt.Detail.Format, Sub()
rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("PKFileName").Value, "")
rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("FileCreationDate").Value, "")
rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Abrechnungsdatum").Value, "")
rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 2, "")
rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 2, "")
rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 2, "")
rpt.lblSumNet.Visible = False
rpt.lblSumVat.Visible = False
rpt.lblSumBrt.Visible = False
sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 4, 0)
sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 4, 0)
sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 4, 0)
End Sub
AddHandler rpt.ReportFooter1.Format, Sub()
rpt.lblSumNetto.Text = sumNetto.ToString("N2")
rpt.lblSumMwst.Text = sumMWST.ToString("N2")
rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
End Sub
print.Viewer.LoadDocument(rpt)
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
print.Show()
Catch ex As System.Exception

21
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
View File

@@ -338,6 +338,7 @@ Public Class frmMitarbeitersuche
Case Else
timestp = timestp.AddMinutes(1) 'NICHT ERLAUBT
End Select
Else
timestp = timestp.AddMinutes(1) 'NICHT ERLAUBT
End If
@@ -350,7 +351,23 @@ Public Class frmMitarbeitersuche
End If
ElseIf art = "akten" Then
Dim aktengang As DateTime = Now().AddMinutes(-10)
Dim minutesBeforeStart As Integer = 1
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung <> "" Then
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
Case "SUB" : minutesBeforeStart = 10
Case "NKN" : minutesBeforeStart = 45
Case Else
minutesBeforeStart = 1 'NICHT ERLAUBT
End Select
Else
minutesBeforeStart = 1 'NICHT ERLAUBT
End If
Dim aktengang As DateTime = Now().AddMinutes(-minutesBeforeStart)
Dim askPost As MsgBoxResult = MsgBox("Aktengang für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " eintragen?" & vbNewLine & aktengang.ToString(), vbYesNo)
If askPost = vbYes Then
Dim info
@@ -360,7 +377,7 @@ Public Class frmMitarbeitersuche
Dim isOnline = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, Nothing, timeEntryExisting)
If Not timeEntryExisting AndAlso Not isOnline Then
timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 10) 'Start 10 Aktengang
timestp = timestp.AddMinutes(10)
timestp = timestp.AddMinutes(minutesBeforeStart)
timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "out", 10) 'Ende 10 Aktengang
timestp = timestp.AddMinutes(1)
timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 0) ' Start

3
VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
View File

@@ -218,7 +218,7 @@ Public Class cTimasAPI
End Function
Public Function createEmployee(ByVal mitarbeiter As cMitarbeiter, ByRef info As String, ByRef datatableTimas As DataTable, Optional ByRef requestDone As Boolean = False)
Public Function createEmployee(ByVal mitarbeiter As cMitarbeiter, ByRef info As String, ByVal ClientNr As String, ByRef datatableTimas As DataTable, Optional ByRef requestDone As Boolean = False)
Try
rest.ClearAllHeaders()
@@ -263,6 +263,7 @@ Public Class cTimasAPI
success = json.UpdateString("phone1", mitarbeiter.mit_telefonnr & " " & mitarbeiter.mit_durchwahl)
success = json.UpdateString("phone2", mitarbeiter.mit_mobiltel)
success = json.UpdateString("password", mitarbeiter.mit_pwd)
success = json.UpdateString("clientNumber", IIf(ClientNr <> "", ClientNr, mitarbeiter.mit_firma & " - " & mitarbeiter.mit_abteilung))
success = json.UpdateBool("resetPassword", 0)
Dim i As Integer = 0

3
VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb
View File

@@ -19,7 +19,8 @@ Public Class cTherefore
' Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import an Jänner 2019", "Import ab Jänner 2019", deleteFileAfterImport)
'Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2021", "Import ab Jänner 2021", deleteFileAfterImport)
'Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2022", "Import ab Jänner 2022", deleteFileAfterImport)
Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2023", "Import ab Jänner 2023", deleteFileAfterImport)
'Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2023", "Import ab Jänner 2023", deleteFileAfterImport)
Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2024", "Import ab Jänner 2023", deleteFileAfterImport)
' Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import ab Jänner 2020", "Import ab Jänner 2020", deleteFileAfterImport)
Case Else
Return False