diff --git a/DAKOSY_Worker/cImporter_DHFToVERAG.vb b/DAKOSY_Worker/cImporter_DHFToVERAG.vb
index 5e7b175..160e3bd 100644
--- a/DAKOSY_Worker/cImporter_DHFToVERAG.vb
+++ b/DAKOSY_Worker/cImporter_DHFToVERAG.vb
@@ -13,7 +13,7 @@ Public Class cImporter_DHFToVERAG
' =====================================================================
' MAIN ENTRY
' =====================================================================
- Public Function ImportEZOLLByLRN(CRN As String, EZOLL_DB As String, Optional overwrite As Boolean = True) As Boolean
+ Public Function ImportEZOLLByLRN(CRN As String, EZOLL_DB As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = True) As Boolean
Try
If String.IsNullOrWhiteSpace(CRN) Then Return False
@@ -157,7 +157,7 @@ Public Class cImporter_DHFToVERAG
it.zaItem_OriginCountry = ToStringSafe(r("Orig"))
it.zaItem_NetMass = ToNullableDecimal(r("Net"))
it.zaItem_InvoiceValueEUR = ToNullableDecimal(r("ItVal"))
- it.zaItem_StatisticalValueEUR = ToNullableDecimal(r("StatVal"))
+ it.zaItem_StatisticalValueEUR = ToNullableDecimal(r("StatVal"))
LoadEZOLL_HSAddCodes(it, LizenzNr, OperatorID, VorgangID, AnmID, r("GdsItemID"))
LoadEZOLL_ItemDocuments(it, LizenzNr, OperatorID, VorgangID, AnmID)
@@ -185,6 +185,13 @@ Public Class cImporter_DHFToVERAG
ZA.Items.Add(it)
Next
+ ' ================================================================
+ 'CBAM WARNING
+ ' ================================================================
+ If freshInsert Then
+ ZA.checkfreshCBAMWarning()
+ End If
+
' ---------------------------------------------------------------
' SAVE
' ---------------------------------------------------------------
@@ -462,7 +469,9 @@ Public Class cImporter_DHFToVERAG
doc.zaDoc_Reference = ToStringSafe(r("referenceNumber"))
- doc.zaDoc_Date = ToNullableDate(r("validityDate"))
+ If r("validityDate") IsNot Nothing AndAlso r("validityDate") IsNot DBNull.Value Then
+ doc.zaDoc_Date = ToNullableDate(r("validityDate"))
+ End If
'doc.zaDoc_Section = ToStringSafe(r("DocumentTypID"))
doc.zaDoc_Description = ToStringSafe(r("text"))
@@ -471,8 +480,9 @@ Public Class cImporter_DHFToVERAG
' ------------------------------------------------------------
doc.zaDoc_Presentation = ToStringSafe(r("typeOfPackages"))
- doc.zaDoc_DepreciationAmount = ToNullableDecimal(r("amount"))
-
+ If r("amount") IsNot Nothing AndAlso r("amount") IsNot DBNull.Value Then
+ doc.zaDoc_DepreciationAmount = ToNullableDecimal(r("amount"))
+ End If
doc.zaDoc_DepreciationUnitmeasurement =
ToStringSafe(r("measurementUnitAndQualifier"))
@@ -513,7 +523,7 @@ Public Class cImporter_DHFToVERAG
Dim party As New cVERAG_CustomsDeclarations_Parties
- party.zaParty_Role = r("AdressTypID")
+ party.zaParty_Role = ToStringSafe(r("AdressTypID"))
party.zaParty_EORI = ToStringSafe(r("identificationNumber"))
party.zaParty_Name = ToStringSafe(r("name"))
@@ -533,7 +543,7 @@ Public Class cImporter_DHFToVERAG
Private Function ExistsInVERAG(CRN As String) As Boolean
Dim sql =
"SELECT TOP 1 1 FROM tblVERAG_CustomsDeclarations " &
- "WHERE za_System='EZOLL' AND (za_MRN=@CRN )"
+ "WHERE za_System LIKE 'DHF%' AND (za_MRN=@CRN )"
Dim p As New List(Of SQLVariable) From {
New SQLVariable("CRN", CRN)
diff --git a/DAKOSY_Worker/cImporter_DakosyToVERAG.vb b/DAKOSY_Worker/cImporter_DakosyToVERAG.vb
index 3b4740c..4cca6b6 100644
--- a/DAKOSY_Worker/cImporter_DakosyToVERAG.vb
+++ b/DAKOSY_Worker/cImporter_DakosyToVERAG.vb
@@ -7,15 +7,15 @@ Public Class cImporter_DakosyToVERAG
' ========================================================================
' MAIN ENTRY
' ========================================================================
- Public Function ImportDakosyEZA(MRN As String, Optional overwrite As Boolean = True) As Boolean
+ Public Function ImportDakosyEZA(MRN As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = False) As Boolean
If MRN Is Nothing Then Return False
If MRN = "" Then Return False
Dim EZA = cDakosyEZA.LOADByMRN(MRN, True)
- If EZA IsNot Nothing Then Return ImportDakosyEZA(EZA)
+ If EZA IsNot Nothing Then Return ImportDakosyEZA(EZA, overwrite, freshInsert)
Return False
End Function
- Public Function ImportDakosyEZA(eza As cDakosyEZA, Optional overwrite As Boolean = True) As Boolean
+ Public Function ImportDakosyEZA(eza As cDakosyEZA, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = False) As Boolean
Try
If eza Is Nothing Then Return False
If String.IsNullOrWhiteSpace(eza.eza_MRN) AndAlso String.IsNullOrWhiteSpace(eza.eza_ANR) Then Return False
@@ -289,11 +289,22 @@ Public Class cImporter_DakosyToVERAG
Next
End If
+ ' ================================================================
+ 'CBAM WARNING
+ ' ================================================================
+ If freshInsert Then
+ VERAG_ZA.checkfreshCBAMWarning()
+ End If
+ ' ================================================================
+
+
' ================================================================
' SAVE
' ================================================================
+
Return VERAG_ZA.SAVE()
+
Catch ex As Exception
cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
Return False
diff --git a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb
index 1971a24..d32caac 100644
--- a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb
+++ b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb
@@ -11,18 +11,18 @@ Public Class cImporter_TelotecToVERAG
' =====================================================================
' MAIN ENTRY
' =====================================================================
- Public Function ImportTelotec(CRN As String, Optional overwrite As Boolean = True) As Boolean
+ Public Function ImportTelotec(CRN As String, Optional overwrite As Boolean = True, Optional freshInsert As Boolean = True) As Boolean
If CRN Is Nothing Then Return False
If CRN = "" Then Return False
Dim cTelotec_Anmeldung = TELOTEC_Worker.cTelotec_Anmeldung.LOADByCRN(CRN, True)
- If cTelotec_Anmeldung IsNot Nothing Then Return ImportTelotec(cTelotec_Anmeldung, overwrite)
+ If cTelotec_Anmeldung IsNot Nothing Then Return ImportTelotec(cTelotec_Anmeldung, overwrite, freshInsert)
Return False
End Function
- Public Function ImportTelotec(tel As cTelotec_Anmeldung, Optional overwrite As Boolean = True) As Boolean
+ Public Function ImportTelotec(tel As cTelotec_Anmeldung, Optional overwrite As Boolean = True, Optional freshinsert As Boolean = True) As Boolean
Try
If tel Is Nothing Then Return False
If String.IsNullOrWhiteSpace(ToStringSafe(tel.Refs_LRN)) AndAlso
@@ -177,6 +177,14 @@ Public Class cImporter_TelotecToVERAG
ZA.Items.Add(it)
Next
+
+ ' ================================================================
+ 'CBAM WARNING
+ ' ================================================================
+ If freshinsert Then
+ ZA.checkfreshCBAMWarning()
+ End If
+ ' ================================================================
' ================================================================
' SAVE
' ================================================================
diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb
index 685053a..0111d56 100644
--- a/MailSender/MAILSender.vb
+++ b/MailSender/MAILSender.vb
@@ -468,7 +468,7 @@ Module Mail
System.Console.WriteLine("OPTION erkannt: TETRA_PAK _ Erstellt eine monatliche Auswertung der DAKSOY/EZOLL-Abfertigungen für TETRAPAK.")
System.Console.WriteLine("Auswertung Details gestartet...")
- If SendEmail_Tetrapak("Maria.mendez@tetrapak.com; Andrea.Ronceria@tetrapak.com", von, bis, "DE") AndAlso SendEmail_Tetrapak("Maria.mendez@tetrapak.com;Andrea.Ronceria@tetrapak.com", von, bis, "AT") Then
+ If SendEmail_Tetrapak("Maria.mendez@tetrapak.com; Andrea.Ronceria@tetrapak.com; nikhil.mediratta@tetrapak.com", von, bis, "DE") AndAlso SendEmail_Tetrapak("Maria.mendez@tetrapak.com;Andrea.Ronceria@tetrapak.com;nikhil.mediratta@tetrapak.com", von, bis, "AT") Then
System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...")
End If
End If
diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb
index 998221f..50f3d15 100644
--- a/UID/usrctlProcedures.Designer.vb
+++ b/UID/usrctlProcedures.Designer.vb
@@ -108,14 +108,21 @@ Partial Class usrctlProcedures
Me.Button52 = New System.Windows.Forms.Button()
Me.TabPage8 = New System.Windows.Forms.TabPage()
Me.btnImportTrStat = New System.Windows.Forms.Button()
+ Me.TabPage9 = New System.Windows.Forms.TabPage()
Me.btnT1Data = New System.Windows.Forms.Button()
Me.TabPage10 = New System.Windows.Forms.TabPage()
+ Me.btnDHF_UNISPEDtoVERAEZA_File = New System.Windows.Forms.Button()
+ Me.btnDHFtoVERAEZA_File = New System.Windows.Forms.Button()
+ Me.btnTCtoVERAEZA_File = New System.Windows.Forms.Button()
+ Me.btnDYtoVERAEZA_File = New System.Windows.Forms.Button()
+ Me.btnDHFUNItoVERAEZA = New System.Windows.Forms.Button()
+ Me.txtListDHFMrn = New System.Windows.Forms.TextBox()
+ Me.btnDHFtoVERAEZA = New System.Windows.Forms.Button()
Me.txtListTCMrn = New System.Windows.Forms.TextBox()
Me.btnTCtoVERAEZA = New System.Windows.Forms.Button()
Me.btnCBAM_ATEZ = New System.Windows.Forms.Button()
Me.txtListDYMrn = New System.Windows.Forms.TextBox()
Me.btnDYtoVERAEZA = New System.Windows.Forms.Button()
- Me.TabPage9 = New System.Windows.Forms.TabPage()
Me.Button18 = New System.Windows.Forms.Button()
Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.lblAnzahl = New System.Windows.Forms.Label()
@@ -169,9 +176,7 @@ Partial Class usrctlProcedures
Me.Button99 = New System.Windows.Forms.Button()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.txtListDHFMrn = New System.Windows.Forms.TextBox()
- Me.btnDHFtoVERAEZA = New System.Windows.Forms.Button()
- Me.btnDHFUNItoVERAEZA = New System.Windows.Forms.Button()
+ Me.cbxCD_Overwrite = New System.Windows.Forms.CheckBox()
Me.tbTRStat.SuspendLayout()
Me.TabPage3.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -1053,6 +1058,11 @@ Partial Class usrctlProcedures
'
'TabPage10
'
+ Me.TabPage10.Controls.Add(Me.cbxCD_Overwrite)
+ Me.TabPage10.Controls.Add(Me.btnDHF_UNISPEDtoVERAEZA_File)
+ Me.TabPage10.Controls.Add(Me.btnDHFtoVERAEZA_File)
+ Me.TabPage10.Controls.Add(Me.btnTCtoVERAEZA_File)
+ Me.TabPage10.Controls.Add(Me.btnDYtoVERAEZA_File)
Me.TabPage10.Controls.Add(Me.btnDHFUNItoVERAEZA)
Me.TabPage10.Controls.Add(Me.txtListDHFMrn)
Me.TabPage10.Controls.Add(Me.btnDHFtoVERAEZA)
@@ -1069,29 +1079,92 @@ Partial Class usrctlProcedures
Me.TabPage10.Text = "TabPageDY"
Me.TabPage10.UseVisualStyleBackColor = True
'
+ 'btnDHF_UNISPEDtoVERAEZA_File
+ '
+ Me.btnDHF_UNISPEDtoVERAEZA_File.Location = New System.Drawing.Point(448, 225)
+ Me.btnDHF_UNISPEDtoVERAEZA_File.Name = "btnDHF_UNISPEDtoVERAEZA_File"
+ Me.btnDHF_UNISPEDtoVERAEZA_File.Size = New System.Drawing.Size(63, 23)
+ Me.btnDHF_UNISPEDtoVERAEZA_File.TabIndex = 49
+ Me.btnDHF_UNISPEDtoVERAEZA_File.Text = "(FILE...)"
+ Me.btnDHF_UNISPEDtoVERAEZA_File.UseVisualStyleBackColor = True
+ '
+ 'btnDHFtoVERAEZA_File
+ '
+ Me.btnDHFtoVERAEZA_File.Location = New System.Drawing.Point(448, 161)
+ Me.btnDHFtoVERAEZA_File.Name = "btnDHFtoVERAEZA_File"
+ Me.btnDHFtoVERAEZA_File.Size = New System.Drawing.Size(63, 23)
+ Me.btnDHFtoVERAEZA_File.TabIndex = 48
+ Me.btnDHFtoVERAEZA_File.Text = "(FILE...)"
+ Me.btnDHFtoVERAEZA_File.UseVisualStyleBackColor = True
+ '
+ 'btnTCtoVERAEZA_File
+ '
+ Me.btnTCtoVERAEZA_File.Location = New System.Drawing.Point(279, 161)
+ Me.btnTCtoVERAEZA_File.Name = "btnTCtoVERAEZA_File"
+ Me.btnTCtoVERAEZA_File.Size = New System.Drawing.Size(63, 23)
+ Me.btnTCtoVERAEZA_File.TabIndex = 47
+ Me.btnTCtoVERAEZA_File.Text = "(FILE...)"
+ Me.btnTCtoVERAEZA_File.UseVisualStyleBackColor = True
+ '
+ 'btnDYtoVERAEZA_File
+ '
+ Me.btnDYtoVERAEZA_File.Location = New System.Drawing.Point(115, 161)
+ Me.btnDYtoVERAEZA_File.Name = "btnDYtoVERAEZA_File"
+ Me.btnDYtoVERAEZA_File.Size = New System.Drawing.Size(63, 23)
+ Me.btnDYtoVERAEZA_File.TabIndex = 46
+ Me.btnDYtoVERAEZA_File.Text = "(FILE...)"
+ Me.btnDYtoVERAEZA_File.UseVisualStyleBackColor = True
+ '
+ 'btnDHFUNItoVERAEZA
+ '
+ Me.btnDHFUNItoVERAEZA.Location = New System.Drawing.Point(348, 225)
+ Me.btnDHFUNItoVERAEZA.Name = "btnDHFUNItoVERAEZA"
+ Me.btnDHFUNItoVERAEZA.Size = New System.Drawing.Size(163, 58)
+ Me.btnDHFUNItoVERAEZA.TabIndex = 45
+ Me.btnDHFUNItoVERAEZA.Text = "DHF UNISPED ->VERAG ZA"
+ Me.btnDHFUNItoVERAEZA.UseVisualStyleBackColor = True
+ '
+ 'txtListDHFMrn
+ '
+ Me.txtListDHFMrn.Location = New System.Drawing.Point(348, 14)
+ Me.txtListDHFMrn.Multiline = True
+ Me.txtListDHFMrn.Name = "txtListDHFMrn"
+ Me.txtListDHFMrn.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+ Me.txtListDHFMrn.Size = New System.Drawing.Size(163, 133)
+ Me.txtListDHFMrn.TabIndex = 44
+ '
+ 'btnDHFtoVERAEZA
+ '
+ Me.btnDHFtoVERAEZA.Location = New System.Drawing.Point(348, 161)
+ Me.btnDHFtoVERAEZA.Name = "btnDHFtoVERAEZA"
+ Me.btnDHFtoVERAEZA.Size = New System.Drawing.Size(163, 73)
+ Me.btnDHFtoVERAEZA.TabIndex = 43
+ Me.btnDHFtoVERAEZA.Text = "DHF VERAG->VERAG ZA"
+ Me.btnDHFtoVERAEZA.UseVisualStyleBackColor = True
+ '
'txtListTCMrn
'
Me.txtListTCMrn.Location = New System.Drawing.Point(197, 14)
Me.txtListTCMrn.Multiline = True
Me.txtListTCMrn.Name = "txtListTCMrn"
Me.txtListTCMrn.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
- Me.txtListTCMrn.Size = New System.Drawing.Size(145, 155)
+ Me.txtListTCMrn.Size = New System.Drawing.Size(145, 133)
Me.txtListTCMrn.TabIndex = 42
'
'btnTCtoVERAEZA
'
- Me.btnTCtoVERAEZA.Location = New System.Drawing.Point(197, 175)
+ Me.btnTCtoVERAEZA.Location = New System.Drawing.Point(197, 161)
Me.btnTCtoVERAEZA.Name = "btnTCtoVERAEZA"
- Me.btnTCtoVERAEZA.Size = New System.Drawing.Size(145, 49)
+ Me.btnTCtoVERAEZA.Size = New System.Drawing.Size(145, 73)
Me.btnTCtoVERAEZA.TabIndex = 41
Me.btnTCtoVERAEZA.Text = "TELOTEC->VERAG ZA"
Me.btnTCtoVERAEZA.UseVisualStyleBackColor = True
'
'btnCBAM_ATEZ
'
- Me.btnCBAM_ATEZ.Location = New System.Drawing.Point(133, 239)
+ Me.btnCBAM_ATEZ.Location = New System.Drawing.Point(33, 249)
Me.btnCBAM_ATEZ.Name = "btnCBAM_ATEZ"
- Me.btnCBAM_ATEZ.Size = New System.Drawing.Size(145, 49)
+ Me.btnCBAM_ATEZ.Size = New System.Drawing.Size(309, 25)
Me.btnCBAM_ATEZ.TabIndex = 40
Me.btnCBAM_ATEZ.Text = "Überschreibe CBAM von ATEZ"
Me.btnCBAM_ATEZ.UseVisualStyleBackColor = True
@@ -1102,14 +1175,14 @@ Partial Class usrctlProcedures
Me.txtListDYMrn.Multiline = True
Me.txtListDYMrn.Name = "txtListDYMrn"
Me.txtListDYMrn.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
- Me.txtListDYMrn.Size = New System.Drawing.Size(145, 155)
+ Me.txtListDYMrn.Size = New System.Drawing.Size(145, 133)
Me.txtListDYMrn.TabIndex = 39
'
'btnDYtoVERAEZA
'
- Me.btnDYtoVERAEZA.Location = New System.Drawing.Point(33, 175)
+ Me.btnDYtoVERAEZA.Location = New System.Drawing.Point(33, 161)
Me.btnDYtoVERAEZA.Name = "btnDYtoVERAEZA"
- Me.btnDYtoVERAEZA.Size = New System.Drawing.Size(145, 49)
+ Me.btnDYtoVERAEZA.Size = New System.Drawing.Size(145, 73)
Me.btnDYtoVERAEZA.TabIndex = 36
Me.btnDYtoVERAEZA.Text = "DY->VERAG ZA"
Me.btnDYtoVERAEZA.UseVisualStyleBackColor = True
@@ -1593,32 +1666,17 @@ Partial Class usrctlProcedures
Me.DataGridViewTextBoxColumn2.HeaderText = "anz"
Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
'
- 'txtListDHFMrn
+ 'cbxCD_Overwrite
'
- Me.txtListDHFMrn.Location = New System.Drawing.Point(348, 14)
- Me.txtListDHFMrn.Multiline = True
- Me.txtListDHFMrn.Name = "txtListDHFMrn"
- Me.txtListDHFMrn.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
- Me.txtListDHFMrn.Size = New System.Drawing.Size(163, 155)
- Me.txtListDHFMrn.TabIndex = 44
- '
- 'btnDHFtoVERAEZA
- '
- Me.btnDHFtoVERAEZA.Location = New System.Drawing.Point(348, 175)
- Me.btnDHFtoVERAEZA.Name = "btnDHFtoVERAEZA"
- Me.btnDHFtoVERAEZA.Size = New System.Drawing.Size(163, 49)
- Me.btnDHFtoVERAEZA.TabIndex = 43
- Me.btnDHFtoVERAEZA.Text = "DHF VERAG->VERAG ZA"
- Me.btnDHFtoVERAEZA.UseVisualStyleBackColor = True
- '
- 'btnDHFUNItoVERAEZA
- '
- Me.btnDHFUNItoVERAEZA.Location = New System.Drawing.Point(348, 230)
- Me.btnDHFUNItoVERAEZA.Name = "btnDHFUNItoVERAEZA"
- Me.btnDHFUNItoVERAEZA.Size = New System.Drawing.Size(163, 49)
- Me.btnDHFUNItoVERAEZA.TabIndex = 45
- Me.btnDHFUNItoVERAEZA.Text = "DHF UNISPED ->VERAG ZA"
- Me.btnDHFUNItoVERAEZA.UseVisualStyleBackColor = True
+ Me.cbxCD_Overwrite.AutoSize = True
+ Me.cbxCD_Overwrite.Checked = True
+ Me.cbxCD_Overwrite.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.cbxCD_Overwrite.Location = New System.Drawing.Point(517, 16)
+ Me.cbxCD_Overwrite.Name = "cbxCD_Overwrite"
+ Me.cbxCD_Overwrite.Size = New System.Drawing.Size(69, 17)
+ Me.cbxCD_Overwrite.TabIndex = 50
+ Me.cbxCD_Overwrite.Text = "overwrite"
+ Me.cbxCD_Overwrite.UseVisualStyleBackColor = True
'
'usrctlProcedures
'
@@ -1854,4 +1912,9 @@ Partial Class usrctlProcedures
Friend WithEvents btnDHFUNItoVERAEZA As Button
Friend WithEvents txtListDHFMrn As TextBox
Friend WithEvents btnDHFtoVERAEZA As Button
+ Friend WithEvents btnDYtoVERAEZA_File As Button
+ Friend WithEvents btnDHF_UNISPEDtoVERAEZA_File As Button
+ Friend WithEvents btnDHFtoVERAEZA_File As Button
+ Friend WithEvents btnTCtoVERAEZA_File As Button
+ Friend WithEvents cbxCD_Overwrite As CheckBox
End Class
diff --git a/UID/usrctlProcedures.resx b/UID/usrctlProcedures.resx
index c9977e7..508fc32 100644
--- a/UID/usrctlProcedures.resx
+++ b/UID/usrctlProcedures.resx
@@ -123,10 +123,4 @@
True
-
- True
-
-
- True
-
\ No newline at end of file
diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb
index a3fa4d3..2167b06 100644
--- a/UID/usrctlProcedures.vb
+++ b/UID/usrctlProcedures.vb
@@ -4535,7 +4535,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
End Sub
Private Sub btnDYtoVERAEZA_Click(sender As Object, e As EventArgs) Handles btnDYtoVERAEZA.Click
-
+ ' MsgBox(VERAG_PROG_ALLGEMEIN.cGreendeal_CBAM_Trn.BuildCBAMPatternWhereClause("Warentarifnummer"))
If txtListDYMrn Is Nothing OrElse String.IsNullOrWhiteSpace(txtListDYMrn.Text) Then Exit Sub
' Trennzeichen definieren
@@ -4550,7 +4550,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
Dim value As String = entry.Trim()
If value.Length = 18 Then
- WRK.ImportDakosyEZA(value)
+ WRK.ImportDakosyEZA(value, cbxCD_Overwrite.Checked)
End If
cnt += 1
btnDYtoVERAEZA.Text = "DY->VERAG ZA" & vbNewLine & cnt & "/" & entries.Count
@@ -4587,7 +4587,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
Dim value As String = entry.Trim()
If value.Length = 18 Then
- WRK.ImportTelotec(value)
+ WRK.ImportTelotec(value, cbxCD_Overwrite.Checked)
End If
cnt += 1
btnTCtoVERAEZA.Text = "TELOTEC->VERAG ZA" & vbNewLine & cnt & "/" & entries.Count
@@ -4610,9 +4610,9 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
Dim value As String = entry.Trim()
- If value.Length = 18 Then
- If sender Is btnDHFtoVERAEZA Then WRK.ImportEZOLLByLRN(value, "EZOLL")
- If sender Is btnDHFUNItoVERAEZA Then WRK.ImportEZOLLByLRN(value, "EZOLL_UNISPED")
+ If value.Length >= 18 And value.Length < 30 Then
+ If sender Is btnDHFtoVERAEZA Then WRK.ImportEZOLLByLRN(value, "EZOLL", cbxCD_Overwrite.Checked)
+ If sender Is btnDHFUNItoVERAEZA Then WRK.ImportEZOLLByLRN(value, "EZOLL_UNISPED", cbxCD_Overwrite.Checked)
End If
cnt += 1
If sender Is btnDHFtoVERAEZA Then sender.Text = "DHF VERAG ->VERAG ZA" & vbNewLine & cnt & "/" & entries.Count
@@ -4622,6 +4622,103 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
Next
End Sub
+ Private Sub Button55_Click(sender As Object, e As EventArgs) Handles btnDYtoVERAEZA_File.Click
+ Dim ofd As New OpenFileDialog With {
+ .Title = "MRN-Datei auswählen",
+ .Filter = "Textdateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*",
+ .Multiselect = False
+ }
+
+ If ofd.ShowDialog() <> DialogResult.OK Then Exit Sub
+ If Not System.IO.File.Exists(ofd.FileName) Then Exit Sub
+
+ Dim lines = System.IO.File.ReadAllLines(ofd.FileName)
+
+ Dim WRK As New DAKOSY_Worker.cImporter_DakosyToVERAG
+ Dim cnt As Integer = 0
+ Dim total As Integer = lines.Length
+
+ For Each line As String In lines
+ Dim value As String = line.Trim()
+
+ ' MRN-Validierung (klassisch 18 Zeichen)
+ If value.Length >= 18 And value.Length < 30 Then
+ WRK.ImportDakosyEZA(value, cbxCD_Overwrite.Checked)
+ End If
+
+ cnt += 1
+ btnDYtoVERAEZA.Text = "DY->VERAG ZA" & vbNewLine & cnt & "/" & total
+ Me.Refresh()
+ Application.DoEvents()
+ Next
+
+ End Sub
+
+ Private Sub Button55_Click_1(sender As Object, e As EventArgs) Handles btnTCtoVERAEZA_File.Click
+ Dim ofd As New OpenFileDialog With {
+ .Title = "MRN-Datei auswählen",
+ .Filter = "Textdateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*",
+ .Multiselect = False
+ }
+
+ If ofd.ShowDialog() <> DialogResult.OK Then Exit Sub
+ If Not System.IO.File.Exists(ofd.FileName) Then Exit Sub
+
+ Dim lines = System.IO.File.ReadAllLines(ofd.FileName)
+
+ Dim WRK As New DAKOSY_Worker.cImporter_TelotecToVERAG
+ Dim cnt As Integer = 0
+ Dim total As Integer = lines.Length
+
+ For Each line As String In lines
+ Dim value As String = line.Trim()
+
+ ' MRN-Validierung (klassisch 18 Zeichen)
+ If value.Length >= 18 And value.Length < 30 Then
+ WRK.ImportTelotec(value, cbxCD_Overwrite.Checked)
+ End If
+
+ cnt += 1
+ btnTCtoVERAEZA.Text = "TC->VERAG ZA" & vbNewLine & cnt & "/" & total
+ Me.Refresh()
+ Application.DoEvents()
+ Next
+ End Sub
+
+ Private Sub Button56_Click(sender As Object, e As EventArgs) Handles btnDHFtoVERAEZA_File.Click, btnDHF_UNISPEDtoVERAEZA_File.Click
+ Dim ofd As New OpenFileDialog With {
+ .Title = "MRN-Datei auswählen",
+ .Filter = "Textdateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*",
+ .Multiselect = False
+ }
+
+ If ofd.ShowDialog() <> DialogResult.OK Then Exit Sub
+ If Not System.IO.File.Exists(ofd.FileName) Then Exit Sub
+
+ Dim lines = System.IO.File.ReadAllLines(ofd.FileName)
+
+ Dim WRK As New DAKOSY_Worker.cImporter_DHFToVERAG
+ Dim cnt As Integer = 0
+ Dim total As Integer = lines.Length
+
+ For Each line As String In lines
+ Dim value As String = line.Trim()
+
+ ' MRN-Validierung (klassisch 18 Zeichen)
+ If value.Length >= 18 And value.Length < 30 Then
+ If sender Is btnDHFtoVERAEZA_File Then WRK.ImportEZOLLByLRN(value, "EZOLL", cbxCD_Overwrite.Checked)
+ If sender Is btnDHF_UNISPEDtoVERAEZA_File Then WRK.ImportEZOLLByLRN(value, "EZOLL_UNISPED", cbxCD_Overwrite.Checked)
+ End If
+
+ cnt += 1
+ If sender Is btnDHFtoVERAEZA_File Then btnDHFtoVERAEZA.Text = "DHF->VERAG ZA" & vbNewLine & cnt & "/" & total
+ If sender Is btnDHF_UNISPEDtoVERAEZA_File Then btnDHFUNItoVERAEZA.Text = "DHF->VERAG ZA" & vbNewLine & cnt & "/" & total
+
+ Me.Refresh()
+ Application.DoEvents()
+ Next
+ End Sub
+
'Private Sub Button26_Click(sender As Object, e As EventArgs)
diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
index ce2cf35..2d574f6 100644
--- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
@@ -10339,7 +10339,7 @@ Public Class frmDYNachrichtenVerarbeitung
'=====IMPORT IN VERAG DATENMODELL==========
Dim IMP As New DAKOSY_Worker.cImporter_DakosyToVERAG
- IMP.ImportDakosyEZA(EZA_TMP, False)
+ IMP.ImportDakosyEZA(EZA_TMP, False, True)
'==================================