This commit is contained in:
2020-03-12 14:47:52 +01:00
parent a6964d7082
commit 3c0d99a279
44 changed files with 8275 additions and 437 deletions

View File

@@ -41,6 +41,7 @@ Public Class cWorker_NCTS
Dim DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen = frmDYNachrichtenVerarbeitung.saveDY_ZA(readNCTS_VersandanmeldungXML, "NCTS")
Dim NCTS As DAKOSY_Worker.cDakosyNCTSOut = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(readNCTS_VersandanmeldungXML, False) ' Falls schon ein DS mit dieser Bezugsnummer vorhanden ist.
If NCTS Is Nothing Then NCTS = New DAKOSY_Worker.cDakosyNCTSOut
If DY_TMP IsNot Nothing Then NCTS.ncts_dyaAnmID = DY_TMP.dy_Id
@@ -296,6 +297,8 @@ Public Class cWorker_NCTS
'POSITIONEN
If DETUDC.Body IsNot Nothing AndAlso DETUDC.Body.GoodsItem IsNot Nothing AndAlso DETUDC.Body.GoodsItem.Count > 0 Then
NCTS.ncts_WARENPOS.Clear()
For Each GOODSITEM In DETUDC.Body.GoodsItem
Dim WP As New DAKOSY_Worker.cDakosy_NCTSOut_Warenposition
@@ -338,6 +341,7 @@ Public Class cWorker_NCTS
Next
End If
NCTS.ncts_WARENPOS.Add(WP)
Next
End If
@@ -377,8 +381,12 @@ Public Class cWorker_NCTS
End If
End If
frmDYNachrichtenVerarbeitung.tryGetNCTSBasicData(NCTS) 'Versuchen Daten aus der Vorerfassung zu laden - ansonsten werden diese überschrieben!
frmDYNachrichtenVerarbeitung.tryGetFirmaNiederlassung(NCTS.ncts_firma, NCTS.ncts_niederlassung, If(AnsprechpTMP_Email, "").ToString, readNCTS_VersandanmeldungXML)
If If(NCTS.ncts_Status, 0) <= 5 Then NCTS.ncts_Status = DAKOSY_Worker.cDY_Statusliste.S_05
' If If(NCTS.ncts_Status_KEWILL_Equivalent, 0) <= 5 Then NCTS.ncts_Status_KEWILL_Equivalent = DAKOSY_Worker.cDY_Statusliste.S_05
NCTS.ncts_Status_KEWILL_Equivalent = NCTS.ncts_Status
@@ -1500,7 +1508,7 @@ Public Class cWorker_NCTS
' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME
cVERAG_Interface.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP)
cVERAG_out_ncts.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP)
NCTS_TMP.insertIntoSpedBuch(DY_TMP)
@@ -1711,7 +1719,7 @@ Public Class cWorker_NCTS
STATUS.SAVE()
' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME
cVERAG_Interface.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP)
cVERAG_out_ncts.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP)
FORM.addDGVEinarbeitung("NCTS: Erledigungsmeldung", STATUS.dySt_BezugsNr)
End If
@@ -1781,7 +1789,7 @@ Public Class cWorker_NCTS
If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id
STATUS.SAVE()
statusTMP = STATUS
cVERAG_Interface.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP)
cVERAG_out_ncts.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP)
' If If(NCTS_TMP.ncts_firma, "") = "IMEX" Then
NCTS_TMP.insertIntoSpedBuch(DY_TMP)
@@ -1856,7 +1864,7 @@ Public Class cWorker_NCTS
If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id
STATUS.SAVE()
statusTMP = STATUS
cVERAG_Interface.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP)
cVERAG_out_ncts.copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP)
' If If(NCTS_TMP.ncts_firma, "") = "IMEX" Then
NCTS_TMP.insertIntoSpedBuch(DY_TMP)