This commit is contained in:
2019-11-26 14:42:17 +01:00
parent d4dfcd1744
commit de1d935624
13 changed files with 450 additions and 78 deletions

View File

@@ -48,7 +48,7 @@
If NCTS_TMP Is Nothing Then Return False
If NCTS_TMP.ncts_ObjectName Is Nothing Then Return False
If NCTS_TMP.ncts_ObjectName.ToString.StartsWith("DU") Then Return False
If NCTS_TMP.ncts_firma.ToString = "DURMAZ" Then Return False
If If(NCTS_TMP.ncts_firma, "").ToString = "DURMAZ" Then Return False
' Dim filePath = SQL.getValueTxtBySql("select [dySt_pfad] from [tblDakosy_Statusmeldungen] where dySt_BezugsNr='" & NCTS_TMP.ncts_ObjectName & "' and [dySt_status]=5 and [dySt_pfad] is not null ", "FMZOLL")
@@ -269,7 +269,9 @@
If Not IO.Directory.Exists(dir) Then IO.Directory.CreateDirectory(dir)
XMLFilePath = dir & "VERAG_NCTS_OUT_" & Now.ToString("ddMMyyyHHmmss") & "_" & Code & "_" & UniqueId & ".xml"
End If
VERAG_NCTS.SaveToFile(XMLFilePath)
If VERAG_NCTS IsNot Nothing Then
VERAG_NCTS.SaveToFile(XMLFilePath)
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
@@ -310,7 +312,7 @@
VERAG_NCTS.ProcessData.ReferenzNumber = If(NCTS_TMP.ncts_ObjectName, "")
VERAG_NCTS.ProcessData.ProcedureCode = If(NCTS_TMP.ncts_ArtAnmeldung, "")
VERAG_NCTS.NCTS_Data.DatDeterminationLimit = If(NCTS_TMP.ncts_Wiedergestellungsdatum, "")
If IsDate(If(NCTS_TMP.ncts_Wiedergestellungsdatum, "")) Then VERAG_NCTS.NCTS_Data.DatDeterminationLimit = CDate(If(NCTS_TMP.ncts_Wiedergestellungsdatum, ""))
VERAG_NCTS.NCTS_Data.LicensePlate = If(NCTS_TMP.ncts_Befoerderungsmittel_KennzeichenAbgang, "")
VERAG_NCTS.NCTS_Data.DepartureCustomsOffice = If(NCTS_TMP.ncts_AbgangsDienststellennummer, "")
VERAG_NCTS.NCTS_Data.DestinationCustomsOffice = If(NCTS_TMP.ncts_BestimmungsstelleDienststellennummer, "")
@@ -585,45 +587,45 @@
" WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ")" &
" ORDER BY GrteeID, GrteeRefID", "EZOLL")
If DTzsAnmGrteeGrteeRef.Rows().Count > 0 Then
VERAG_NCTS.NCTS_Data.Guarantee.Amount = 0
For Each DTzsAnmGrteeGrteeRef_row In DTzsAnmGrteeGrteeRef.Rows()
If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GRN")) Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = DTzsAnmGrteeGrteeRef_row.item("GRN")
If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GVal")) Then VERAG_NCTS.NCTS_Data.Guarantee.Amount += DTzsAnmGrteeGrteeRef_row.item("GVal")
Next
End If
If DTzsAnmGrteeGrteeRef.Rows().Count > 0 Then
VERAG_NCTS.NCTS_Data.Guarantee.Amount = 0
For Each DTzsAnmGrteeGrteeRef_row In DTzsAnmGrteeGrteeRef.Rows()
If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GRN")) Then VERAG_NCTS.NCTS_Data.Guarantee.GRN = DTzsAnmGrteeGrteeRef_row.item("GRN")
If Not SQL.IsNull(DTzsAnmGrteeGrteeRef_row.item("GVal")) Then VERAG_NCTS.NCTS_Data.Guarantee.Amount += DTzsAnmGrteeGrteeRef_row.item("GVal")
Next
End If
'POSITIONEN
Dim cntPos = 1
Dim DTzsAnmGdsitem As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmGdsitem WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") ORDER BY GdsItemID", "EZOLL")
If DTzsAnmGdsitem.Rows().Count > 0 Then
For Each DTzsAnmGdsitem_row In DTzsAnmGdsitem.Rows()
Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition
V_POS.PosNr = cntPos
Dim pkGes = 0
Dim pkArt = ""
'POSITIONEN
Dim cntPos = 1
Dim DTzsAnmGdsitem As DataTable = SQL.loadDgvBySql("SELECT * FROM zsAnmGdsitem WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") ORDER BY GdsItemID", "EZOLL")
If DTzsAnmGdsitem.Rows().Count > 0 Then
For Each DTzsAnmGdsitem_row In DTzsAnmGdsitem.Rows()
Dim V_POS As New VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS.VERAG_out_nctsNCTS_DataPosition
V_POS.PosNr = cntPos
Dim pkGes = 0
Dim pkArt = ""
Dim DTzsAnmGdsitemPk As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmGdsItemPack] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") AND GdsItemID='" & DTzsAnmGdsitem_row.Item("GdsItemID") & "' ORDER BY GdsItemID", "EZOLL")
If DTzsAnmGdsitemPk.Rows().Count > 0 Then
For Each DTzsAnmGdsitemPk_row In DTzsAnmGdsitemPk.Rows()
If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Kind")) Then pkArt = DTzsAnmGdsitemPk_row.item("Kind")
If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Nr")) Then pkGes += DTzsAnmGdsitemPk_row.item("Nr")
Next
End If
Dim DTzsAnmGdsitemPk As DataTable = SQL.loadDgvBySql("SELECT * FROM [zsAnmGdsItemPack] WHERE (LizenzNr = '" & r.Item("LizenzNr") & "') And (OperatorID = " & r.Item("OperatorID") & ") And (VorgangID = '" & r.Item("VorgangID") & "') And (AnmID = " & AnmID & ") AND GdsItemID='" & DTzsAnmGdsitem_row.Item("GdsItemID") & "' ORDER BY GdsItemID", "EZOLL")
If DTzsAnmGdsitemPk.Rows().Count > 0 Then
For Each DTzsAnmGdsitemPk_row In DTzsAnmGdsitemPk.Rows()
If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Kind")) Then pkArt = DTzsAnmGdsitemPk_row.item("Kind")
If Not SQL.IsNull(DTzsAnmGdsitemPk_row.item("Nr")) Then pkGes += DTzsAnmGdsitemPk_row.item("Nr")
Next
End If
V_POS.Quantity = pkGes
V_POS.Packaging = pkArt
If Not SQL.IsNull(DTzsAnmGdsitem_row.item("Gross")) Then V_POS.GrossWeight = DTzsAnmGdsitem_row.item("Gross")
V_POS.Quantity = pkGes
V_POS.Packaging = pkArt
If Not SQL.IsNull(DTzsAnmGdsitem_row.item("Gross")) Then V_POS.GrossWeight = DTzsAnmGdsitem_row.item("Gross")
V_POS.GoodsDescription = DTzsAnmGdsitem_row.item("GdsDes")
V_POS.GoodsDescription = DTzsAnmGdsitem_row.item("GdsDes")
VERAG_NCTS.NCTS_Data.Position.Add(V_POS)
cntPos += 1
Next
End If
VERAG_NCTS.NCTS_Data.Position.Add(V_POS)
cntPos += 1
Next
End If
UniqueId = AnmID
UniqueId = AnmID
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & vbNewLine & "BezugsNr: " & LRN, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return Nothing

View File

@@ -175,7 +175,14 @@ Public Class frmDYNachrichtenVerarbeitung
Return (character = 9 OrElse character = 10 OrElse character = 13 OrElse (character >= 32 AndAlso character <= 55295) OrElse (character >= 57344 AndAlso character <= 65533) OrElse (character >= 65536 AndAlso character <= 1114111))
End Function
Private Function getFilesInOrder() As String()
Dim myDirectory As New IO.DirectoryInfo(VERARBEITUNGS_PFAD)
'Dim myfiles() As String = myDirectory.GetFiles.OrderBy(Function(x) x.LastWriteTime).Select(Function(x) x.FullName).Take(40).ToArray
Dim myfiles() As String = myDirectory.GetFiles.OrderBy(Function(x) x.CreationTime).Select(Function(x) x.FullName).ToArray
' Dim myfiles As FileInfo() = myDirectory.GetFiles().OrderBy(Function(p) p.CreationTime).Select(Function(x) x.FullName).ToArray
Return myfiles
End Function
Sub DatenEinlesen()
@@ -187,7 +194,7 @@ Public Class frmDYNachrichtenVerarbeitung
Exit Sub
End If
For Each d In System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD)
For Each d In getFilesInOrder() 'System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD,,)
Try
Dateiname = d
cWorker_NCTS.Dateiname = d
@@ -692,7 +699,7 @@ Public Class frmDYNachrichtenVerarbeitung
' End If
' End If
saveDY_ZA = DY_TMP
Return DY_TMP
End Function
Shared Function saveDY_ZA(dySt_BezugsNr As String, art As String) As DAKOSY_Worker.cDakosy_Zollanmeldungen
Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = Nothing
@@ -756,7 +763,7 @@ Public Class frmDYNachrichtenVerarbeitung
If DY_TMP2 IsNot Nothing Then STATUS2.dySt_dyId = DY_TMP2.dy_Id
cWorker_NCTS.SaveNCTS_FirmaNL(NCTS_TMP2, DY_TMP2, division)
STATUS2.dySt_dyArt = "NCTS"
Case "EZA"
Case "EZA", ""
Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "EZA")
Dim EZA_TMP As DAKOSY_Worker.cDakosyEZA = saveDY_EZA(STATUS2, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit)
If DY_TMP2 IsNot Nothing Then STATUS2.dySt_dyId = DY_TMP2.dy_Id
@@ -766,16 +773,13 @@ Public Class frmDYNachrichtenVerarbeitung
STATUS2.SAVE()
'Nur wenn BezugsNr vorhanden:
If ge.KopfDaten IsNot Nothing Then
For Each kopf In ge.KopfDaten
If kopf.Ereignis IsNot Nothing Then
If kopf.RegistrierNrATLAS IsNot Nothing Then
'MsgBox(kopf.RegistrierNrATLAS)
If kopf.RegistrierNrATLAS.StartsWith("ATA") Then
If kopf.RegistrierNrATLAS.StartsWith("ATA") Or kopf.RegistrierNrATLAS.StartsWith("ATC") Then 'EZA!
Dim STATUS As DAKOSY_Worker.cDakosy_Statusmeldungen = getStatusCheckTransID(NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit)
STATUS.dySt_artMitteilung = "GE"
STATUS.dySt_dyArt = "" '"NCTS" 'T1/T2
@@ -787,20 +791,20 @@ Public Class frmDYNachrichtenVerarbeitung
STATUS.dySt_status = DAKOSY_Worker.cDY_Statusliste.S_41
readNCTS_GenerellesEreignis = True
Select Case getVerahrensartFromBezugsNr(ge.ObjektIdentifizierung.ObjektName)
Case "NCTS"
Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "NCTS")
Dim NCTS_TMP2 As DAKOSY_Worker.cDakosyNCTSOut = cWorker_NCTS.saveDY_NCTS(STATUS, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, kopf.RegistrierNrATLAS)
If DY_TMP2 IsNot Nothing Then STATUS.dySt_dyId = DY_TMP2.dy_Id
cWorker_NCTS.SaveNCTS_FirmaNL(NCTS_TMP2, DY_TMP2, division)
STATUS.dySt_dyArt = "NCTS"
Case "EZA"
Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "EZA")
Dim EZA_TMP As DAKOSY_Worker.cDakosyEZA = saveDY_EZA(STATUS, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, kopf.RegistrierNrATLAS)
If DY_TMP2 IsNot Nothing Then STATUS.dySt_dyId = DY_TMP2.dy_Id
SaveEZA_FirmaNL(EZA_TMP, DY_TMP2, division)
STATUS.dySt_dyArt = "EZA"
End Select
'Select Case getVerahrensartFromBezugsNr(ge.ObjektIdentifizierung.ObjektName)
' Case "NCTS"
' Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "NCTS")
' Dim NCTS_TMP2 As DAKOSY_Worker.cDakosyNCTSOut = cWorker_NCTS.saveDY_NCTS(STATUS, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, kopf.RegistrierNrATLAS)
' If DY_TMP2 IsNot Nothing Then STATUS.dySt_dyId = DY_TMP2.dy_Id
' cWorker_NCTS.SaveNCTS_FirmaNL(NCTS_TMP2, DY_TMP2, division)
' STATUS.dySt_dyArt = "NCTS"
' Case "EZA"
Dim DY_TMP2 As DAKOSY_Worker.cDakosy_Zollanmeldungen = saveDY_ZA(STATUS, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, "EZA")
Dim EZA_TMP As DAKOSY_Worker.cDakosyEZA = saveDY_EZA(STATUS, DY_TMP2, NCTS.Transaktion.IOReferenz, NCTS.Transaktion.IODatumZeit, kopf.RegistrierNrATLAS)
If DY_TMP2 IsNot Nothing Then STATUS.dySt_dyId = DY_TMP2.dy_Id
SaveEZA_FirmaNL(EZA_TMP, DY_TMP2, division)
STATUS.dySt_dyArt = "EZA"
'End Select
STATUS.SAVE()

View File

@@ -397,10 +397,13 @@ Public Class frmRoutineManager
Function removeThreadFromList(n) As Boolean
Try
For Each t As System.Threading.Thread In threads
If t.Name = n Then
threads.Remove(t)
Return False
If t IsNot Nothing Then
If t.Name = n Then
threads.Remove(t)
Return False
End If
End If
Next
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name)