Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024
This commit is contained in:
@@ -346,6 +346,7 @@ Public Class cIDS
|
||||
Dim savedTrans As Integer = 0
|
||||
Dim MDMEinarb As New cMDMEinarbeitung("IDS", Now())
|
||||
|
||||
Dim isTransactionDetail As Boolean = False
|
||||
|
||||
Do While (objFileRead.Peek() > -1)
|
||||
Dim currentRow As String()
|
||||
@@ -354,140 +355,114 @@ Public Class cIDS
|
||||
lngRecordCount = lngRecordCount + 1
|
||||
|
||||
If lngRecordCount = 1 Then
|
||||
If Not (isleernothing((currentRow(0))) = "Year Month Day" AndAlso isleernothing((currentRow(14))) = "OBO Number") Then
|
||||
If Not (isleernothing((currentRow(0))) = "Year Month Day") Then
|
||||
Return False
|
||||
End If
|
||||
|
||||
If isleernothing((currentRow(14))) = "OBO Number" Then isTransactionDetail = False
|
||||
|
||||
If isleernothing((currentRow(14))) = "Transaction Volume" Then isTransactionDetail = True
|
||||
|
||||
|
||||
Else
|
||||
Try
|
||||
|
||||
|
||||
Dim ymd = isleernothing((currentRow(0)))
|
||||
Dim cc = isleernothing((currentRow(1)))
|
||||
Dim pyn = isleernothing((currentRow(2)))
|
||||
Dim occ = isleernothing((currentRow(5)))
|
||||
Dim oc = isleernothing((currentRow(6)))
|
||||
Dim ptc = isleernothing((currentRow(7)))
|
||||
If Not isTransactionDetail Then
|
||||
|
||||
Dim vr = isleernothing((currentRow(13)))
|
||||
Dim obo = isleernothing((currentRow(14)))
|
||||
|
||||
'.VRNumber = isleernothing((currentRow(13)))
|
||||
'.OBONumber = isleernothing((currentRow(14)))
|
||||
|
||||
|
||||
Dim zusParam = ""
|
||||
Dim isOBO As Boolean = False
|
||||
If vr IsNot Nothing AndAlso vr <> "" Then
|
||||
zusParam = vr
|
||||
ElseIf obo IsNot Nothing AndAlso obo <> "" Then
|
||||
zusParam = obo
|
||||
isOBO = True
|
||||
End If
|
||||
|
||||
Dim ids As New cIDS(ymd, pyn, cc, occ, oc, ptc, zusParam, isOBO)
|
||||
|
||||
Dim avprive = isleernothing((currentRow(12)))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
With ids
|
||||
.YearMonthDay = isleernothing((currentRow(0)))
|
||||
.CustomerCode = isleernothing((currentRow(1)))
|
||||
.Paymentsummarynumber = isleernothing((currentRow(2)))
|
||||
.CustomerName = isleernothing((currentRow(3)))
|
||||
.OutletCountry = isleernothing((currentRow(4)))
|
||||
.OutletCountryCode = isleernothing((currentRow(5)))
|
||||
.OutletCode = isleernothing((currentRow(6)))
|
||||
.ProductTypeCode = isleernothing((currentRow(7)))
|
||||
Dim ymd = isleernothing((currentRow(0)))
|
||||
Dim cc = isleernothing((currentRow(1)))
|
||||
Dim pyn = isleernothing((currentRow(2)))
|
||||
Dim occ = isleernothing((currentRow(5)))
|
||||
Dim oc = isleernothing((currentRow(6)))
|
||||
Dim ptc = isleernothing((currentRow(7)))
|
||||
Dim vr = isleernothing((currentRow(13)))
|
||||
Dim obo = isleernothing((currentRow(14)))
|
||||
|
||||
If lngRecordCount = 2 Then
|
||||
MDMEinarb.invoicedate = CDate(.YearMonthDay)
|
||||
Dim MDMEinarb_check As New cMDMEinarbeitung("IDS", ymd)
|
||||
If MDMEinarb_check.hasEntry AndAlso MDMEinarb_check.completed Then Return False
|
||||
End If
|
||||
|
||||
'Dim transVol_old = .TransactionVolume
|
||||
'Dim transVol_new = isleernothing((currentRow(8)))
|
||||
|
||||
'If transVol_old IsNot Nothing AndAlso IsNumeric(transVol_old) AndAlso transVol_new IsNot Nothing AndAlso IsNumeric(transVol_new) Then
|
||||
Dim zusParam = ""
|
||||
Dim isOBO As Boolean = False
|
||||
If vr IsNot Nothing AndAlso vr <> "" Then
|
||||
zusParam = vr
|
||||
ElseIf obo IsNot Nothing AndAlso obo <> "" Then
|
||||
zusParam = obo
|
||||
isOBO = True
|
||||
End If
|
||||
|
||||
' Dim AmininclVat_old = CDbl(.AmminclVAT)
|
||||
' Dim AmininclVat_new = CDbl(isleernothing((currentRow(9)).Replace(".", ",")))
|
||||
Dim ids As New cIDS(ymd, pyn, cc, occ, oc, ptc, zusParam, isOBO)
|
||||
|
||||
' Dim TotalNetAmount_old = CDbl(.TotalNetAmount)
|
||||
' Dim TotalNetAmount_new = CDbl(isleernothing((currentRow(10)).Replace(".", ",")))
|
||||
|
||||
' Dim VATAmount_old = CDbl(.VATAmount)
|
||||
' Dim VATAmount_new = CDbl(isleernothing((currentRow(11)).Replace(".", ",")))
|
||||
Dim avprive = isleernothing((currentRow(12)))
|
||||
|
||||
|
||||
' If (CDec(transVol_old) <> CDec(transVol_new)) AndAlso Math.Abs(CDbl(transVol_old)) = Math.Abs(CDbl(transVol_new.replace(".", ","))) Then 'case1: gleiche Transaktionshohe -> nicht abziehen, sondern nur Preis anpassen!
|
||||
With ids
|
||||
.YearMonthDay = isleernothing((currentRow(0)))
|
||||
.CustomerCode = isleernothing((currentRow(1)))
|
||||
.Paymentsummarynumber = isleernothing((currentRow(2)))
|
||||
.CustomerName = isleernothing((currentRow(3)))
|
||||
.OutletCountry = isleernothing((currentRow(4)))
|
||||
.OutletCountryCode = isleernothing((currentRow(5)))
|
||||
.OutletCode = isleernothing((currentRow(6)))
|
||||
.ProductTypeCode = isleernothing((currentRow(7)))
|
||||
|
||||
' If AmininclVat_old <> AmininclVat_new Then
|
||||
|
||||
' .TransactionVolume = transVol_old + transVol_new
|
||||
' .AmminclVAT = AmininclVat_old + AmininclVat_new
|
||||
' .TotalNetAmount = TotalNetAmount_old + TotalNetAmount_new
|
||||
' .VATAmount = VATAmount_old + VATAmount_new
|
||||
If lngRecordCount = 2 Then
|
||||
MDMEinarb.invoicedate = CDate(.YearMonthDay)
|
||||
End If
|
||||
|
||||
|
||||
' End If
|
||||
.TransactionVolume = isleernothing((currentRow(8)))
|
||||
.AmminclVAT = isleernothing((currentRow(9)))
|
||||
.TotalNetAmount = isleernothing((currentRow(10)))
|
||||
.VATAmount = isleernothing((currentRow(11)))
|
||||
.avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0)
|
||||
|
||||
Console.WriteLine("IDS: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10))))
|
||||
|
||||
' ElseIf Math.Abs(CDbl(transVol_old)) > Math.Abs(CDbl(transVol_new.replace(".", ","))) AndAlso (CDec(transVol_old) <> CDec(transVol_new)) Then 'case2: alte Transaktionshohe höher als neue, abziehen!
|
||||
If isOBO Then
|
||||
If .SAVE_OBO() Then counTrans += 1
|
||||
Else
|
||||
If .SAVE_VR() Then counTrans += 1
|
||||
End If
|
||||
|
||||
End With
|
||||
|
||||
' If AmininclVat_old <> AmininclVat_new Then
|
||||
' .TransactionVolume = transVol_old + transVol_new
|
||||
' .AmminclVAT = AmininclVat_old + AmininclVat_new
|
||||
' .TotalNetAmount = TotalNetAmount_old + TotalNetAmount_new
|
||||
' .VATAmount = VATAmount_old + VATAmount_new
|
||||
|
||||
' 'If .TransactionVolume < 0 Then .TransactionVolume = .TransactionVolume * -1
|
||||
|
||||
' End If
|
||||
|
||||
' ElseIf Math.Abs(CDbl(transVol_old)) < Math.Abs(CDbl(transVol_new.replace(".", ","))) AndAlso (CDec(transVol_old) <> CDec(transVol_new)) Then 'case3: alte Transaktionshohe niedriger als neue, dazuzählen (weil die "Stornierung" vor der eig. Transk. importiert werden kann)!
|
||||
|
||||
|
||||
' If AmininclVat_old <> AmininclVat_new Then
|
||||
|
||||
' .TransactionVolume = transVol_old + transVol_new
|
||||
' .AmminclVAT = AmininclVat_old + AmininclVat_new
|
||||
' .TotalNetAmount = TotalNetAmount_old + TotalNetAmount_new
|
||||
' .VATAmount = VATAmount_old + VATAmount_new
|
||||
|
||||
' 'If .TransactionVolume < 0 Then .TransactionVolume = .TransactionVolume * -1
|
||||
|
||||
' End If
|
||||
|
||||
' End If
|
||||
|
||||
'Else
|
||||
.TransactionVolume = isleernothing((currentRow(8)))
|
||||
.AmminclVAT = isleernothing((currentRow(9)))
|
||||
.TotalNetAmount = isleernothing((currentRow(10)))
|
||||
.VATAmount = isleernothing((currentRow(11)))
|
||||
.avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0)
|
||||
|
||||
' End If
|
||||
|
||||
|
||||
'.VRNumber = isleernothing((currentRow(13)))
|
||||
'.OBONumber = isleernothing((currentRow(14)))
|
||||
|
||||
Console.WriteLine("IDS: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10))))
|
||||
|
||||
If isOBO Then
|
||||
If .SAVE_OBO() Then counTrans += 1
|
||||
Else
|
||||
If .SAVE_VR() Then counTrans += 1
|
||||
|
||||
Dim ymd = isleernothing((currentRow(0)))
|
||||
Dim cc = isleernothing((currentRow(1)))
|
||||
Dim cn = isleernothing((currentRow(2)))
|
||||
Dim occ = isleernothing((currentRow(8)))
|
||||
Dim oc = isleernothing((currentRow(9)))
|
||||
Dim ptc = isleernothing((currentRow(11)))
|
||||
Dim tv = isleernothing((currentRow(14)))
|
||||
Dim t_time = isleernothing((currentRow(13)))
|
||||
Dim t_date = isleernothing((currentRow(12)))
|
||||
Dim tna = isleernothing((currentRow(16)))
|
||||
|
||||
If lngRecordCount = 2 Then
|
||||
Dim MDMEinarb_check As New cMDMEinarbeitung("IDS_Details", ymd)
|
||||
If MDMEinarb_check.hasEntry AndAlso MDMEinarb_check.completed Then Return False
|
||||
End If
|
||||
|
||||
'.SAVE()
|
||||
|
||||
End With
|
||||
Dim ids_detail As New cIDSDetails(ymd, cc, cn, occ, oc, ptc, t_time, t_date, tv, tna)
|
||||
ids_detail.AmminclVAT = isleernothing((currentRow(15)))
|
||||
ids_detail.VATAmount = isleernothing((currentRow(17)))
|
||||
ids_detail.avpriceexclVAT = isleernothing((currentRow(18)))
|
||||
ids_detail.Paymentsummarynumber = ""
|
||||
If ids_detail.SAVE() Then counTrans += 1
|
||||
|
||||
If lngRecordCount = 2 Then
|
||||
MDMEinarb.invoicedate = CDate(ids_detail.YearMonthDay)
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
@@ -496,20 +471,47 @@ Public Class cIDS
|
||||
End If
|
||||
|
||||
Loop
|
||||
cnt = CInt(lngRecordCount)
|
||||
MDMEinarb.ds_total += cnt - 1
|
||||
MDMEinarb.ds_count += counTrans
|
||||
MDMEinarb.import_date = Now()
|
||||
MDMEinarb.importfilename = fi.Name
|
||||
If Not isTransactionDetail Then
|
||||
MDMEinarb.supplier = "IDS"
|
||||
cnt = CInt(lngRecordCount)
|
||||
MDMEinarb.ds_total += cnt - 1
|
||||
MDMEinarb.ds_count += counTrans
|
||||
MDMEinarb.import_date = Now()
|
||||
MDMEinarb.importfilename = fi.Name
|
||||
|
||||
If MDMEinarb.ds_total = MDMEinarb.ds_count Then
|
||||
MDMEinarb.completed = True
|
||||
MDMEinarb.completed_date = Now()
|
||||
End If
|
||||
|
||||
MDMEinarb.SAVE()
|
||||
Else
|
||||
'LKW-Kennzeichen aktualisieren!
|
||||
SQL.doSQL("UPDATE det SET det.LicencePlateNumber = s.KfzKennzeichen FROM tblIDSTransactionsNew_Details det INNER JOIN SDL.dbo.SDL s
|
||||
ON s.KartenNr =
|
||||
CAST(det.CustomerCode AS varchar(50)) + CAST(det.CardNumber AS varchar(50))
|
||||
WHERE s.SDLNr = 100 AND ISNULL(s.Gesperrt,0) = 0 AND det.LicencePlateNumber is null", "FMZOLL")
|
||||
|
||||
MDMEinarb.supplier = "IDS_Details"
|
||||
cnt = CInt(lngRecordCount)
|
||||
MDMEinarb.ds_total += cnt - 1
|
||||
MDMEinarb.ds_count += counTrans
|
||||
MDMEinarb.import_date = Now()
|
||||
MDMEinarb.importfilename = fi.Name
|
||||
|
||||
If MDMEinarb.ds_total = MDMEinarb.ds_count Then
|
||||
MDMEinarb.completed = True
|
||||
MDMEinarb.completed_date = Now()
|
||||
MDMEinarb.completed_date = Now()
|
||||
|
||||
|
||||
MDMEinarb.SAVE()
|
||||
End If
|
||||
|
||||
MDMEinarb.SAVE()
|
||||
|
||||
|
||||
objFileRead.Close()
|
||||
Return True
|
||||
Return True
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1319,6 +1321,160 @@ Public Class cIDSDieselpreisRW
|
||||
|
||||
End Class
|
||||
|
||||
Public Class cIDSDetails
|
||||
|
||||
Property YearMonthDay As Object = Nothing
|
||||
Property CustomerCode As Object = Nothing
|
||||
Property CardNumber As Object = Nothing
|
||||
Property Paymentsummarynumber As Object = Nothing
|
||||
Property OutletCountryCode As Object = Nothing
|
||||
Property OutletCode As Object = Nothing
|
||||
Property ProductTypeCode As Object = Nothing
|
||||
Property TransactionVolume As Object = Nothing
|
||||
Property AmminclVAT As Object = Nothing
|
||||
Property TotalNetAmount As Object = Nothing
|
||||
Property VATAmount As Object = Nothing
|
||||
Property avpriceexclVAT As Object = Nothing
|
||||
Property Transactiondate As Object = Nothing
|
||||
Property Transactiontime As Object = Nothing
|
||||
|
||||
Public hasEntry = False
|
||||
|
||||
Dim SQL As New SQL
|
||||
|
||||
Sub New()
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
Sub New(YearMonthDay, CustomerCode, cardNumber, OutletCountryCode, OutletCode, ProductTypeCode, Transactiontime, Transactiondate, TransactionVolume, TotalNetAmount)
|
||||
Me.YearMonthDay = YearMonthDay
|
||||
Me.CardNumber = cardNumber
|
||||
Me.CustomerCode = CustomerCode
|
||||
Me.OutletCountryCode = OutletCountryCode
|
||||
Me.OutletCode = OutletCode
|
||||
Me.ProductTypeCode = ProductTypeCode
|
||||
Me.Transactiontime = Transactiontime
|
||||
Me.TransactionVolume = TransactionVolume
|
||||
Me.TotalNetAmount = TotalNetAmount
|
||||
Me.Transactiondate = Transactiondate
|
||||
LOAD()
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("YearMonthDay", YearMonthDay))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CustomerCode", CustomerCode))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OutletCountryCode", OutletCountryCode))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OutletCode", OutletCode))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ProductTypeCode", ProductTypeCode))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TransactionVolume", TransactionVolume))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AmminclVAT", AmminclVAT))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TotalNetAmount", TotalNetAmount))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VATAmount", VATAmount))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("avpriceexclVAT", avpriceexclVAT))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CardNumber", CardNumber))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Transactiondate", Transactiondate))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Transactiontime", Transactiontime))
|
||||
Return list
|
||||
End Function
|
||||
|
||||
Public Sub LOAD()
|
||||
Try
|
||||
|
||||
hasEntry = False
|
||||
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
|
||||
Using cmd As New SqlCommand("SELECT * FROM tblIDSTransactionsNew_Details WHERE YearMonthDay=@YearMonthDay AND cardNumber=@cardNumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode AND Transactiontime=@Transactiontime AND TransactionVolume=@TransactionVolume AND Transactiondate=@Transactiondate ", conn)
|
||||
cmd.Parameters.AddWithValue("@YearMonthDay", YearMonthDay)
|
||||
cmd.Parameters.AddWithValue("@CustomerCode", CustomerCode)
|
||||
cmd.Parameters.AddWithValue("@OutletCountryCode", OutletCountryCode)
|
||||
cmd.Parameters.AddWithValue("@OutletCode", OutletCode)
|
||||
cmd.Parameters.AddWithValue("@ProductTypeCode", ProductTypeCode)
|
||||
cmd.Parameters.AddWithValue("@cardNumber", CardNumber)
|
||||
cmd.Parameters.AddWithValue("@Transactiontime", Transactiontime)
|
||||
cmd.Parameters.AddWithValue("@TransactionVolume", TransactionVolume)
|
||||
cmd.Parameters.AddWithValue("@TotalNetAmount", TotalNetAmount)
|
||||
cmd.Parameters.AddWithValue("@Transactiondate", Transactiondate)
|
||||
Dim dr = cmd.ExecuteReader()
|
||||
If dr.Read Then
|
||||
For Each li In getParameterList()
|
||||
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
|
||||
|
||||
If dr.Item(li.Text) Is DBNull.Value Then
|
||||
propInfo.SetValue(Me, Nothing)
|
||||
Else
|
||||
propInfo.SetValue(Me, dr.Item(li.Text))
|
||||
End If
|
||||
Next
|
||||
hasEntry = True
|
||||
End If
|
||||
dr.Close()
|
||||
End Using
|
||||
End Using
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
|
||||
Public Function SAVE() As Boolean
|
||||
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
|
||||
|
||||
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblIDSTransactionsNew_Details WHERE YearMonthDay=@YearMonthDay AND cardNumber=@cardNumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode AND Transactiontime=@Transactiontime AND TransactionVolume=@TransactionVolume AND Transactiondate=@Transactiondate) " &
|
||||
" BEGIN " & getUpdateCmd() & " END " &
|
||||
" Else " &
|
||||
" BEGIN " & getInsertCmd() & " END " &
|
||||
" commit tran "
|
||||
|
||||
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
|
||||
End Function
|
||||
|
||||
Public Function getUpdateCmd(Optional PARAM As String = "", Optional VALUE As String = "") As String
|
||||
Try
|
||||
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
|
||||
|
||||
Dim str As String = ""
|
||||
For Each i In list
|
||||
If Not i.isPrimaryParam Then
|
||||
str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
End If
|
||||
Next
|
||||
str = str.Substring(0, str.Length - 1) 'wg. ','
|
||||
Return (" UPDATE [tblIDSTransactionsNew_Details] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND cardNumber=@cardNumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode AND Transactiontime=@Transactiontime AND TransactionVolume=@TransactionVolume AND Transactiondate=@Transactiondate ")
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
Return ""
|
||||
End Function
|
||||
|
||||
|
||||
Public Function getInsertCmd() As String
|
||||
Try
|
||||
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
|
||||
Dim str As String = ""
|
||||
Dim values As String = ""
|
||||
For Each i In list
|
||||
If Not i.isPrimaryParam Then
|
||||
str &= "[" & i.Text & "],"
|
||||
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
End If
|
||||
Next
|
||||
str = str.Substring(0, str.Length - 1) 'wg. ','
|
||||
values = values.Substring(0, values.Length - 1) 'wg. ','
|
||||
Return (" INSERT INTO tblIDSTransactionsNew_Details (" & str & ") VALUES(" & values & ") ")
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
Return ""
|
||||
End Function
|
||||
|
||||
End Class
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -297,36 +297,6 @@ Public Class cMitarbeiter
|
||||
End Function
|
||||
|
||||
|
||||
|
||||
'Public Sub LOAD(Optional topMax As String = "")
|
||||
' Try
|
||||
' Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
|
||||
' Using cmd As New SqlCommand("Select * FROM tblMitarbeiter WHERE mit_id=@mit_id ", conn)
|
||||
' cmd.Parameters.AddWithValue("@mit_id", mit_id)
|
||||
' Dim dr = cmd.ExecuteReader()
|
||||
' If dr.Read Then
|
||||
' For Each l In getParameterList()
|
||||
' Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable)
|
||||
|
||||
' If dr.Item(l.Text) Is DBNull.Value Then
|
||||
' propInfo.SetValue(Me, Nothing)
|
||||
' Else
|
||||
' propInfo.SetValue(Me, dr.Item(l.Text))
|
||||
' End If
|
||||
|
||||
' Next
|
||||
' Me.LOAD_MEMBERS()
|
||||
' Me.LOAD_MESSAGES(topMax)
|
||||
' End If
|
||||
' dr.Close()
|
||||
' End Using
|
||||
' End Using
|
||||
' Catch ex As Exception
|
||||
' MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
|
||||
' End Try
|
||||
'End Sub
|
||||
|
||||
|
||||
Public Function LOAD(ByVal id As Integer, Optional isTimas As Boolean = False) As Boolean
|
||||
Dim sqlstr As String = "SELECT * FROM tblMitarbeiter WHERE " & IIf(isTimas, "mit_timasId = " & id & "", "mit_id = " & id & "")
|
||||
' adasdas()
|
||||
@@ -367,11 +337,8 @@ Public Class cMitarbeiter
|
||||
If Not dr.Item("mit_DpUserStandardDP") Is DBNull.Value Then Me.mit_DpUserStandardDP = dr.Item("mit_DpUserStandardDP")
|
||||
If Not dr.Item("mit_DpUserStandardFirma") Is DBNull.Value Then Me.mit_DpUserStandardFirma = dr.Item("mit_DpUserStandardFirma")
|
||||
If Not dr.Item("mit_DpUserStandardFirma2") Is DBNull.Value Then Me.mit_DpUserStandardFirma2 = dr.Item("mit_DpUserStandardFirma2")
|
||||
|
||||
|
||||
If Not dr.Item("mit_standartFiliale") Is DBNull.Value Then Me.mit_standartFiliale = dr.Item("mit_standartFiliale")
|
||||
If Not dr.Item("mit_standardPreisliste") Is DBNull.Value Then Me.mit_standardPreisliste = dr.Item("mit_standardPreisliste")
|
||||
|
||||
Me.mit_info = dr.Item("mit_info")
|
||||
If Not dr.Item("mit_einstiegsdatum") Is DBNull.Value Then Me.mit_einstiegsdatum = dr.Item("mit_einstiegsdatum")
|
||||
Me.mit_gekuendigt = dr.Item("mit_gekuendigt")
|
||||
@@ -387,7 +354,6 @@ Public Class cMitarbeiter
|
||||
If Not dr.Item("mit_DAKOSY_SBFull") Is DBNull.Value Then Me.mit_DAKOSY_SBFull = dr.Item("mit_DAKOSY_SBFull")
|
||||
If Not dr.Item("mit_TESTonly") Is DBNull.Value Then Me.mit_TESTonly = dr.Item("mit_TESTonly")
|
||||
If Not dr.Item("mit_PasswortChanged") Is DBNull.Value Then Me.mit_PasswortChanged = dr.Item("mit_PasswortChanged")
|
||||
|
||||
If Not dr.Item("mit_FirmenDatenAnzeige") Is DBNull.Value Then Me.mit_FirmenDatenAnzeige = dr.Item("mit_FirmenDatenAnzeige")
|
||||
If Not dr.Item("mit_TELOTEC_SB") Is DBNull.Value Then Me.mit_TELOTEC_SB = dr.Item("mit_TELOTEC_SB")
|
||||
If Not dr.Item("mit_AliasAD_Domain") Is DBNull.Value Then Me.mit_AliasAD_Domain = dr.Item("mit_AliasAD_Domain")
|
||||
@@ -395,20 +361,16 @@ Public Class cMitarbeiter
|
||||
If Not dr.Item("mit_AliasAD_Domain2") Is DBNull.Value Then Me.mit_AliasAD_Domain2 = dr.Item("mit_AliasAD_Domain2")
|
||||
If Not dr.Item("mit_AliasAD_Username2") Is DBNull.Value Then Me.mit_AliasAD_Username2 = dr.Item("mit_AliasAD_Username2")
|
||||
If Not dr.Item("mit_teamId") Is DBNull.Value Then Me.mit_teamId = dr.Item("mit_teamId")
|
||||
|
||||
Me.mit_ChatBenutzer = dr.Item("mit_ChatBenutzer")
|
||||
Me.mit_ChatEasteregg = dr.Item("mit_ChatEasteregg")
|
||||
Me.mit_ChatEasteregg2 = dr.Item("mit_ChatEasteregg2")
|
||||
|
||||
If Not dr.Item("mit_FirmaHaupt") Is DBNull.Value Then Me.mit_FirmaHaupt = dr.Item("mit_FirmaHaupt")
|
||||
|
||||
If Not dr.Item("mit_MAVerzeichnis_SettingsTstmp") Is DBNull.Value Then Me.mit_MAVerzeichnis_SettingsTstmp = dr.Item("mit_MAVerzeichnis_SettingsTstmp")
|
||||
Me.mit_MAVerzeichnis_allowGebDat = dr.Item("mit_MAVerzeichnis_allowGebDat")
|
||||
Me.mit_MAVerzeichnis_allowGebDatOhneJahr = dr.Item("mit_MAVerzeichnis_allowGebDatOhneJahr")
|
||||
Me.mit_MAVerzeichnis_allowWohnadresse = dr.Item("mit_MAVerzeichnis_allowWohnadresse")
|
||||
Me.mit_MAVerzeichnis_allowHandynummer = dr.Item("mit_MAVerzeichnis_allowHandynummer")
|
||||
Me.mit_MAVerzeichnis_allowFoto = dr.Item("mit_MAVerzeichnis_allowFoto")
|
||||
|
||||
If Not dr.Item("mit_foto_DocId") Is DBNull.Value Then Me.mit_foto_DocId = dr.Item("mit_foto_DocId")
|
||||
If Not dr.Item("mit_fotoHover1_DocId") Is DBNull.Value Then Me.mit_fotoHover1_DocId = dr.Item("mit_fotoHover1_DocId")
|
||||
If Not dr.Item("mit_fotoHover2_DocId") Is DBNull.Value Then Me.mit_fotoHover2_DocId = dr.Item("mit_fotoHover2_DocId")
|
||||
@@ -429,7 +391,6 @@ Public Class cMitarbeiter
|
||||
Me.mit_ausstempelnBeiBeenden = dr.Item("mit_ausstempelnBeiBeenden")
|
||||
If Not dr.Item("mit_timasFirmen") Is DBNull.Value Then Me.mit_timasFirmen = dr.Item("mit_timasFirmen")
|
||||
Me.mit_timasMehrereFirmen = dr.Item("mit_timasMehrereFirmen")
|
||||
|
||||
If Not dr.Item("mit_Notfall_Handy") Is DBNull.Value Then Me.mit_Notfall_Handy = dr.Item("mit_Notfall_Handy")
|
||||
If Not dr.Item("mit_Notfall_Name") Is DBNull.Value Then Me.mit_Notfall_Name = dr.Item("mit_Notfall_Name")
|
||||
If Not dr.Item("mit_Notfall_Mail") Is DBNull.Value Then Me.mit_Notfall_Mail = dr.Item("mit_Notfall_Mail")
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
|
||||
Imports System.Data.SqlClient
|
||||
Imports System.Reflection
|
||||
Imports jdk.nashorn.internal.ir
|
||||
|
||||
Public Class cOfferteList
|
||||
Property KundenNr As Object = Nothing
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
Imports System.Data.SqlClient
|
||||
Imports javax.xml.bind.annotation
|
||||
|
||||
Public Class cSendungen
|
||||
Implements ICloneable
|
||||
|
||||
@@ -133,6 +133,7 @@ Public Class cSpeditionsbuch
|
||||
Property AbfertigungsanzahlPos As Object = Nothing
|
||||
Property Barzahlungsbetrag As Double = 0
|
||||
' Property Sachbearbeiter As String = ""
|
||||
|
||||
<VBFixedString(15)> Public Sachbearbeiter As String = ""
|
||||
Property Personalnummer As Object = Nothing 'int=-1
|
||||
Property PersonalnummerQS As Object = Nothing 'int=-1
|
||||
@@ -517,7 +518,6 @@ Public Class cSpeditionsbuch
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zollsystem_Land", Zollsystem_Land))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SB_CMRNr", SB_CMRNr))
|
||||
|
||||
|
||||
Return list
|
||||
End Function
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
Imports System.Data.SqlClient
|
||||
Imports System.IO
|
||||
Imports System.Reflection
|
||||
Imports com.sun.xml.internal.rngom.digested
|
||||
|
||||
Public Class cUTA
|
||||
|
||||
@@ -1055,8 +1056,9 @@ Public Class cUTA
|
||||
|
||||
Dim counTrans As Integer = 0
|
||||
Dim savedTrans As Integer = 0
|
||||
Dim MDMEinarb As New cMDMEinarbeitung("UTA", Now())
|
||||
MDMEinarb.setInvoicingDate(Now(), MDMEinarb)
|
||||
Dim Einarbeitung_Lief = "UTA"
|
||||
Dim MDMEinarb As New cMDMEinarbeitung(Einarbeitung_Lief, Now())
|
||||
'MDMEinarb.setInvoicingDate(Now(), MDMEinarb)
|
||||
|
||||
Dim lngRecordCount As Long
|
||||
Try
|
||||
@@ -1116,18 +1118,6 @@ Public Class cUTA
|
||||
Dim lngPKLine As Long = 0
|
||||
lngRecordCount = 0
|
||||
|
||||
'gleicher PKFileName wird nun aus CLFHeader gelöscht. CASCADE löscht dann zugehörige CLFBody und CLFTrailer.
|
||||
'If Not SQL.doSQL("DELETE tblUTAHeaderNew.ErstellDatumUhrzeit, tblUTAHeaderNew.Übertragungsnummer FROM tblUTAHeaderNew WHERE (((tblUTAHeaderNew.ErstellDatumUhrzeit)=" & Format$(dtmErstellDatumUhrzeit, "\#mm\/dd\/yyyy hh\:nn\:ss AM/PM\#") & ") AND ((tblUTAHeaderNew.Übertragungsnummer)=" & lngÜbertragungsnummer, "FMZOLL") Then
|
||||
' MsgBox("Fehler beim Löschen des CLF-Headers")
|
||||
' objFileRead.Close()
|
||||
' Return False
|
||||
'End If
|
||||
|
||||
'If Not SQL.doSQL("UPDATE CLF SET PKFileName = '" & fi.Name.ToString & "'", "FMZOLL") Then
|
||||
' MsgBox("Fehler beim Update der CLF-Nr")
|
||||
' objFileRead.Close()
|
||||
' Return False
|
||||
'End If
|
||||
objFileRead.DiscardBufferedData()
|
||||
objFileRead.BaseStream.Seek(0, System.IO.SeekOrigin.Begin)
|
||||
|
||||
@@ -1268,8 +1258,20 @@ Public Class cUTA
|
||||
.[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ]
|
||||
End Select
|
||||
|
||||
If lngRecordCount = 2 Then
|
||||
MDMEinarb.invoicedate = .[Rechnungsdatum]
|
||||
Dim KdNr = .[Kundennummer]
|
||||
|
||||
If KdNr = 170582 Then
|
||||
Einarbeitung_Lief = "UTA_VERAG"
|
||||
End If
|
||||
|
||||
Dim MDMEinarb_check As New cMDMEinarbeitung(Einarbeitung_Lief, .[Rechnungsdatum])
|
||||
If MDMEinarb_check.hasEntry AndAlso MDMEinarb_check.completed Then Return False
|
||||
End If
|
||||
|
||||
|
||||
If onlyTestkunedn Then
|
||||
'nur KundenNr 100964 und 825040 speichern:
|
||||
If .[Kundennummer] = 100964 Or .[Kundennummer] = 825040 Then
|
||||
.SAVE()
|
||||
End If
|
||||
@@ -1277,97 +1279,6 @@ Public Class cUTA
|
||||
If .SAVE() Then savedTrans += 1
|
||||
End If
|
||||
|
||||
|
||||
|
||||
'Dim clfArchiv As New cUTA.UTAArchiv(.Belegdatum, .UTA_Beleg_ID)
|
||||
'clfArchiv.Übertragungsnummer = .Übertragungsnummer
|
||||
'clfArchiv.ErstellDatumUhrzeit = .ErstellDatumUhrzeit
|
||||
'clfArchiv.Übertragungsposition = .Übertragungsposition
|
||||
'clfArchiv.Abrechnungsnummer = .Abrechnungsnummer
|
||||
'clfArchiv.Datum_für_Lieferungen_und_Leistungen_bis = .Datum_für_Lieferungen_und_Leistungen_bis
|
||||
'clfArchiv.Rechnungsempfänger_Kundennummer = .Rechnungsempfänger_Kundennummer
|
||||
'clfArchiv.Abrechnungsdatum = .Abrechnungsdatum
|
||||
'clfArchiv.Kundennummer = .Kundennummer
|
||||
'clfArchiv.Kartennummer = .Kartennummer
|
||||
'clfArchiv.Akzeptanzstellennummer = .Akzeptanzstellennummer
|
||||
'clfArchiv.Standort_der_Akzeptanzstelle = .Standort_der_Akzeptanzstelle
|
||||
'clfArchiv.Lieferland = .Lieferland
|
||||
'clfArchiv.Belegnummer_des_Lieferanten = .Belegnummer_des_Lieferanten
|
||||
'clfArchiv.Kilometerstand = .Kilometerstand
|
||||
'clfArchiv.Fakturierwarenart = .Fakturierwarenart
|
||||
'clfArchiv.Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen = .Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen
|
||||
'clfArchiv.Menge = .Menge
|
||||
'clfArchiv.SB_BT = .SB_BT
|
||||
'clfArchiv.Umsatzsteuerprozentsatz = .Umsatzsteuerprozentsatz
|
||||
'clfArchiv.Lieferlandwährung_ISO = .Lieferlandwährung_ISO
|
||||
'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung = .Einzelpreis_Netto_in_Lieferlandwährung
|
||||
'clfArchiv.Einzelpreis_Brutto_in_Lieferlandwährung = .Einzelpreis_Brutto_in_Lieferlandwährung
|
||||
'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung = .Einzelpreis_Netto_in_Lieferlandwährung
|
||||
'clfArchiv.Betrag_Service_in_Lieferlandwährung = .Betrag_Service_in_Lieferlandwährung
|
||||
'clfArchiv.Betrag_Nachlass_in_Lieferlandwährung = .Betrag_Nachlass_in_Lieferlandwährung
|
||||
'clfArchiv.Gesamtbetrag_Netto_in_Lieferlandwährung = .Gesamtbetrag_Netto_in_Lieferlandwährung
|
||||
'clfArchiv.Gesamtbetrag_Brutto_in_Lieferlandwährung = .Gesamtbetrag_Brutto_in_Lieferlandwährung
|
||||
'clfArchiv.Darstellwährung_ISO = .Darstellwährung_ISO
|
||||
'clfArchiv.Betrag_Service_in_Darstellwährung = .Betrag_Service_in_Darstellwährung
|
||||
'clfArchiv.Betrag_Nachlass_in_Darstellwährung = .Betrag_Nachlass_in_Darstellwährung
|
||||
'clfArchiv.Gesamtbetrag_Netto_in_Darstellwährung = .Gesamtbetrag_Netto_in_Darstellwährung
|
||||
'clfArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung = .Gesamtbetrag_Umsatzsteuer_in_Darstellwährung
|
||||
'clfArchiv.Gesamtbetrag_Brutto_in_Darstellwährung = .Gesamtbetrag_Brutto_in_Darstellwährung
|
||||
'clfArchiv.Prägetext_i_d_R_KFZ_Kennzeichen = .Prägetext_i_d_R_KFZ_Kennzeichen
|
||||
'clfArchiv.Kunden_Kostenstelle_1 = .Kunden_Kostenstelle_1
|
||||
'clfArchiv.Kartentyp = .Kartentyp
|
||||
'clfArchiv.Filler_Feld_35 = .Filler_Feld_35
|
||||
'clfArchiv.Filler_Feld_36 = .Filler_Feld_36
|
||||
'clfArchiv.KZ_Autobahn = .KZ_Autobahn
|
||||
'clfArchiv.INFO_Feld = .INFO_Feld
|
||||
'clfArchiv.KFZ_Kennzeichen = .KFZ_Kennzeichen
|
||||
'clfArchiv.Filler_Feld_40 = .Filler_Feld_40
|
||||
'clfArchiv.Buchungsart = .Buchungsart
|
||||
'clfArchiv.Buchungsgrund = .Buchungsgrund
|
||||
'clfArchiv.Filler_Feld_43 = .Filler_Feld_43
|
||||
'clfArchiv.Informationsbeleg = .Informationsbeleg
|
||||
'clfArchiv.Belegherkunft = .Belegherkunft
|
||||
'clfArchiv.Filler_Feld_46 = .Filler_Feld_46
|
||||
'clfArchiv.Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen = .Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen
|
||||
'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen = .Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen
|
||||
'clfArchiv.Rechnungsdatum = .Rechnungsdatum
|
||||
'clfArchiv.Umsatzsteuerprozentsatz_informativ = .Umsatzsteuerprozentsatz_informativ
|
||||
'clfArchiv.Betrag_Nachlass_in_Lieferlandwährung = .Betrag_Nachlass_in_Lieferlandwährung
|
||||
'clfArchiv.Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ = .Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ
|
||||
'clfArchiv.Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ = .Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ
|
||||
'clfArchiv.Fälligkeitsdatum = .Fälligkeitsdatum
|
||||
'clfArchiv.Zahlungsziel_in_Tagen = .Zahlungsziel_in_Tagen
|
||||
'clfArchiv.Zahlungsart = .Zahlungsart
|
||||
'clfArchiv.TC_Rechnungsnummer_gegenüber_dem_Nutzer = .TC_Rechnungsnummer_gegenüber_dem_Nutzer
|
||||
'clfArchiv.TC_Rechnungsdatum = .TC_Rechnungsdatum
|
||||
'clfArchiv.Zahlungszielgruppe = .Zahlungszielgruppe
|
||||
'clfArchiv.Kunden_Kostenstelle_2 = .Kunden_Kostenstelle_2
|
||||
'clfArchiv.Lieferzeit = .Lieferzeit
|
||||
'clfArchiv.Fremdkartennummer = .Fremdkartennummer
|
||||
'clfArchiv.OnBoardUnitID = .OnBoardUnitID
|
||||
'clfArchiv.KFZ_Kennzeichen_komprimiert = .KFZ_Kennzeichen_komprimiert
|
||||
'clfArchiv.Kartenkategorie = .Kartenkategorie
|
||||
'clfArchiv.Rechnungsnummer_pro_Lieferland = .Rechnungsnummer_pro_Lieferland
|
||||
'clfArchiv.Autobahnauffahrt = .Autobahnauffahrt
|
||||
'clfArchiv.Autobahnausfahrt = .Autobahnausfahrt
|
||||
'clfArchiv.Rabattschlüssel_der_französischen_Autobahngesellschaften = .Rabattschlüssel_der_französischen_Autobahngesellschaften
|
||||
'clfArchiv.Nummer_Belastungsanzeige = .Nummer_Belastungsanzeige
|
||||
'clfArchiv.Betreuungsstelle = .Betreuungsstelle
|
||||
'clfArchiv.Filler_Feld_72 = .Filler_Feld_72
|
||||
'clfArchiv.Akzeptanz_Medium = .Akzeptanz_Medium
|
||||
'clfArchiv.Steuerkategorie = .Steuerkategorie
|
||||
'clfArchiv.UTA_Normalbeleg_ID = .UTA_Normalbeleg_ID
|
||||
'clfArchiv.Gebühren_Bescheinigung_von = .Gebühren_Bescheinigung_von
|
||||
'clfArchiv.Gebühren_Bescheinigung_bis = .Gebühren_Bescheinigung_bis
|
||||
'clfArchiv.Herausgeber_Nutzer_Nummer = .Herausgeber_Nutzer_Nummer
|
||||
'clfArchiv.Maßeinheit = .Maßeinheit
|
||||
'clfArchiv.Land_der_Akzeptanzstelle = .Land_der_Akzeptanzstelle
|
||||
'clfArchiv.Postleitzahl_der_Akzeptanzstelle = .Postleitzahl_der_Akzeptanzstelle
|
||||
'clfArchiv.Steuerliches_Lieferland = .Steuerliches_Lieferland
|
||||
'clfArchiv.Steuerliche_Produktgruppe = .Steuerliche_Produktgruppe
|
||||
'clfArchiv.Leistungsort_verlagerbar = .Leistungsort_verlagerbar
|
||||
'clfArchiv.SAVE()
|
||||
|
||||
End With
|
||||
|
||||
Case "90"
|
||||
@@ -1400,6 +1311,12 @@ Public Class cUTA
|
||||
|
||||
Loop
|
||||
|
||||
If Einarbeitung_Lief <> "UTA" Then
|
||||
Dim ts_total = MDMEinarb.ds_total
|
||||
MDMEinarb = New cMDMEinarbeitung(Einarbeitung_Lief, MDMEinarb.invoicedate)
|
||||
MDMEinarb.ds_total = ts_total
|
||||
End If
|
||||
|
||||
MDMEinarb.ds_count += savedTrans
|
||||
MDMEinarb.import_date = Now()
|
||||
MDMEinarb.importfilename = fi.Name
|
||||
|
||||
@@ -51,7 +51,7 @@ Public Class frmMitarbeitersuche
|
||||
End If
|
||||
|
||||
|
||||
sbMitarbeiter.initSearchBox(Me.FindForm, " [mit_id] ,[mit_username] ,(mit_vname + ' ' + mit_nname ) AS Name , CASE WHEN mit_firma='ALL' THEN mit_firmaHaupt ELSE mit_firma END as Firma, mit_niederlassung as Niederlassung FROM tblMitarbeiter", {"mit_vname", "mit_nname"}, " 1=1 AND mit_gekuendigt=0 AND [mit_TESTonly]=0 AND [mit_pseudoUser]=0 ", "mit_id", "mit_id", "Name", "ADMIN", , 400, 200, {"mit_id", "mit_username"})
|
||||
sbMitarbeiter.initSearchBox(Me.FindForm, " [mit_id] ,[mit_username] ,(mit_vname + ' ' + mit_nname ) AS Name , CASE WHEN mit_firma='ALL' THEN mit_firmaHaupt ELSE mit_firma END as Firma, mit_niederlassung as Niederlassung FROM tblMitarbeiter", {"mit_vname", "mit_nname"}, " 1=1 AND mit_gekuendigt=0 AND [mit_TESTonly]=0 AND [mit_pseudoUser]=0 AND isnull([mit_kundenportal], 0) <> 1 ", "mit_id", "mit_id", "Name", "ADMIN", , 400, 200, {"mit_id", "mit_username"})
|
||||
initMA()
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -237,7 +237,7 @@ Public Class cMSEAPI
|
||||
Return "FEHLER im TransaktionArray"
|
||||
End If
|
||||
|
||||
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"), onlyBilledTransactions, savedTrans)
|
||||
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"), savedTrans,, onlyBilledTransactions)
|
||||
|
||||
|
||||
Catch ex As WebException
|
||||
@@ -1214,6 +1214,7 @@ Public Class cMSEAPI
|
||||
|
||||
If lngRecordCount = 2 Then
|
||||
MDMEinarb.invoicedate = invoiceDate
|
||||
If MDMEinarb.hasEntry AndAlso MDMEinarb.completed Then Return False
|
||||
End If
|
||||
|
||||
inv.total_amount_euro = total_amount_euro
|
||||
|
||||
Reference in New Issue
Block a user