This commit is contained in:
2020-08-04 16:35:31 +02:00
parent 853d96140f
commit 41b13fe4b0
38 changed files with 603 additions and 256 deletions

View File

@@ -39,7 +39,17 @@ Public Class cMAVIGetMsgType
Shared Function isTRNCTS_BestaetigungZollXML_ARR_INF(doc As XmlDocument) As Boolean
If doc.HasChildNodes Then
If doc.GetElementsByTagName("ARR_INF").Count > 0 Then
If doc.GetElementsByTagName("ARR_INF").Count > 0 Or doc.GetElementsByTagName("ARRINF").Count > 0 Then
Return True
End If
End If
Return False
End Function
Shared Function isTRNCTS_BestaetigungZollXML_GUA_INF(doc As XmlDocument) As Boolean
If doc.HasChildNodes Then
If doc.GetElementsByTagName("GUA_INF").Count > 0 Or doc.GetElementsByTagName("GUAINF").Count > 0 Then
Return True
End If
End If

View File

@@ -174,7 +174,7 @@ Public Class cNCTS_TR
Function GET_SHIPMENTS(Partnersystem, VorpapierArt, VorpapierNr) As List(Of VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL)
GET_SHIPMENTS = New List(Of VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL)
Dim dt = SQL.loadDgvBySql("Select [shTr_id] FROM [tblTR_Shipment] where shTr_Partnersystem='" & Partnersystem & "' AND [PrePaperCode]='" & VorpapierArt & "' and [PrePaperNr]='" & VorpapierNr & "'", "FMZOLL")
MsgBox("Select [shTr_id] FROM [tblTR_Shipment] where shTr_Partnersystem='" & Partnersystem & "' AND [PrePaperCode]='" & VorpapierArt & "' and [PrePaperNr]='" & VorpapierNr & "'")
' MsgBox("Select [shTr_id] FROM [tblTR_Shipment] where shTr_Partnersystem='" & Partnersystem & "' AND [PrePaperCode]='" & VorpapierArt & "' and [PrePaperNr]='" & VorpapierNr & "'")
If dt IsNot Nothing Then
For Each r In dt.Rows
Dim SH As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(CInt(r("shTr_id")))
@@ -431,6 +431,8 @@ Public Class cNCTS_TR
End Function
Shared Function LOADByAnmIDFull(ncts_dyaAnmID As String, loadALL As Boolean) As cNCTS_TR
Try
Dim NCTS As New cNCTS_TR
@@ -527,13 +529,14 @@ Public Class cNCTS_TR
End Function
Shared Function LOADByBezugsNr_or_GUID_or_MRN(bezugsNr As String, GUID As String, MRN As String, loadALL As Boolean, Optional checkValidStatus As Boolean = False, Optional Partnersystem As String = "") As cNCTS_TR
LOADByBezugsNr_or_GUID_or_MRN = New cNCTS_TR
LOADByBezugsNr_or_GUID_or_MRN = Nothing
If bezugsNr <> "" Then LOADByBezugsNr_or_GUID_or_MRN = LOADByBezugsNr(bezugsNr, loadALL, checkValidStatus, Partnersystem)
If LOADByBezugsNr_or_GUID_or_MRN.ncts_Id <= 0 Then
If LOADByBezugsNr_or_GUID_or_MRN Is Nothing Then
If GUID <> "" Then LOADByBezugsNr_or_GUID_or_MRN = LOADByGUID(GUID, loadALL, checkValidStatus, Partnersystem)
End If
If LOADByBezugsNr_or_GUID_or_MRN.ncts_Id <= 0 Then
If LOADByBezugsNr_or_GUID_or_MRN Is Nothing Then
If MRN <> "" Then LOADByBezugsNr_or_GUID_or_MRN = LOADByMRN(MRN, loadALL, checkValidStatus, Partnersystem)
End If
End Function
@@ -588,7 +591,7 @@ Public Class cNCTS_TR
' Using cmd As New SqlCommand("SELECT TOP 1 * FROM (SELECT * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " ) AS T order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE ncts_dyaAnmID=ncts_dyaAnmID order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ", conn)
'Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE ncts_dyaAnmID=ncts_dyaAnmID order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ", conn)
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & If(Partnersystem <> "", " AND ncts_Partnersystem ='" & Partnersystem & "' ", "") & " order by ncts_LetzteBearbeitung desc", conn)
'MsgBox("SELECT TOP 1 * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE " & bezugsNr & " " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & " order by ncts_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] inner join tblDakosy_Zollanmeldungen on dy_id = dySt_dyId WHERE ncts_dyaAnmID=dy_id order by dySt_ts desc) desc,ncts_LetzteBearbeitung desc ")
' MsgBox("SELECT TOP 1 * FROM tblNCTS_TR WHERE ncts_ObjectName LIKE '" & bezugsNr & "' " & If(checkValidStatus, " AND ncts_status BETWEEN 40 and 90 ", "") & If(Partnersystem <> "", " AND ncts_Partnersystem ='" & Partnersystem & "' ", "") & " order by ncts_LetzteBearbeitung desc")
cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then