From ea9ee0c817780bc210b7e8b012feab7a64fc8a6b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 23 Aug 2023 17:37:10 +0200 Subject: [PATCH 1/3] ATEZ --- Aviso/Aviso.vbproj | 2 +- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmATEZ_NCTS.vb | 174 +++++++++++++++------------- Aviso/usrcntlAktDetailsATILLANeu.vb | 6 +- 4 files changed, 101 insertions(+), 85 deletions(-) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 5698ab8..d4f7543 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -108,7 +108,7 @@ x64 - Aviso_TemporaryKey.pfx + LME.pfx diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 66dd162..2a18a30 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb index d8a1181..041fbd9 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -1,4 +1,5 @@ -Imports GrapeCity.ActiveReports.Design.DdrDesigner.Designers +Imports DocumentFormat.OpenXml.Vml.Presentation +Imports GrapeCity.ActiveReports.Design.DdrDesigner.Designers Imports GrapeCity.ActiveReports.ReportsCore.Tools Imports Newtonsoft.Json.Linq Imports SDL @@ -72,88 +73,102 @@ Public Class frmATEZ_NCTS End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Try + Me.Cursor = Cursors.WaitCursor - If id > 0 Then + If id > 0 Then + + Dim atezData = New cATEZ_NCTS_DATA(id) + If atezData.json <> "" And atezData.status <> "Draft" Then + MsgBox(atezData.json) + Else + Dim atez As New cATEZ_NCTS_IN + sendAtezData(atezData, atez) + End If - Dim atezData = New cATEZ_NCTS_DATA(id) - If atezData.json <> "" And atezData.status <> "Draft" Then - MsgBox(atezData.json) Else + + lblInfo.Text = "" + + + Dim selectedDocuments As Boolean = False + + For Each Row In dgvAnhaenge.Rows + + selectedDocuments = IIf(DBNull.Value Is Row.Cells("anh_selekt").Value, False, Row.Cells("anh_selekt").Value) + If selectedDocuments Then Exit For + Next + + If Not selectedDocuments Then + lblInfo.Text = "kein Anhang selektiert" + Cursor = Cursors.Default + Exit Sub + End If + + Dim atezData As New cATEZ_NCTS_DATA Dim atez As New cATEZ_NCTS_IN + + With atezData + + .AvisoId = AVISO.AvisoID + .SendungsId = SENDUNG.tblSnd_SendungID + .VERAG_LRN = lblBezugsnummer.Text + .LicensePlateContainerNo = txtLKWId.Text + .DAKOSY_TemplateCode = cboStammreferenz._value + .DAKOSY_IOPartner = txtDyMandant.Text + .DAKOSY_Division3 = txtDyNiederlassung.Text + .DepartureCustomsOffice = sbAbgangZollstelle._value + .DestinationCustomsOffice = sbBestimmungsZollstelle._value + .DatDeterminationLimit = txtDat.Text + .CoolingTemperature = IIf(cbxTemperatur.Checked, txtTransporttemp.Text, "") + .Carrier_Name = usrCntl_Carrier.kdFirma.Text + .Carrier_Adress_City = usrCntl_Carrier.txtOrt.Text + .Carrier_Adress_Country = usrCntl_Carrier.sbLand._value + .Carrier_Adress_Postcode = usrCntl_Carrier.txtPlz.Text + .Carrier_Adress_Street = usrCntl_Carrier.txtStrasse.Text + .Carrier_EORI = usrCntl_Carrier.txtEORI.Text + .Guarantee_GRN = "" 'leer + + For Each doc As DataGridViewRow In dgvAnhaenge.Rows + Dim isSelected = IIf(DBNull.Value Is doc.Cells("anh_selekt").Value, False, doc.Cells("anh_selekt").Value) + If isSelected Then + .selectedDocuments &= doc.Cells("anh_docId").Value & ", " + End If + Next + + .SAVE() + + End With + + If sbDurchgangszollstelle1._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle1._value) + If sbDurchgangszollstelle2._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle2._value) + If sbDurchgangszollstelle3._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle3._value) + If sbDurchgangszollstelle4._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle4._value) + If sbDurchgangszollstelle5._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle5._value) + If sbDurchgangszollstelle6._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle6._value) + If sbDurchgangszollstelle7._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle7._value) + If sbDurchgangszollstelle8._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle8._value) + If sbDurchgangszollstelle9._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle9._value) + + If sbRoute1._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute1._value) + If sbRoute2._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute2._value) + If sbRoute3._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute3._value) + If sbRoute4._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute4._value) + If sbRoute5._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute5._value) + If sbRoute6._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute6._value) + If sbRoute7._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute7._value) + If sbRoute8._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute8._value) + If sbRoute9._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute9._value) + sendAtezData(atezData, atez) + End If + Me.Cursor = Cursors.Default - Else - - lblInfo.Text = "" - - - Dim selectedDocuments As Boolean = False - - For Each Row In dgvAnhaenge.Rows - - selectedDocuments = IIf(DBNull.Value Is Row.Cells("anh_selekt").Value, False, Row.Cells("anh_selekt").Value) - If selectedDocuments Then Exit For - Next - - If Not selectedDocuments Then - lblInfo.Text = "kein Anhang selektiert" - Cursor = Cursors.Default - Exit Sub - End If - - Dim atezData As New cATEZ_NCTS_DATA - Dim atez As New cATEZ_NCTS_IN - - With atezData - - .AvisoId = AVISO.AvisoID - .SendungsId = SENDUNG.tblSnd_SendungID - .VERAG_LRN = lblBezugsnummer.Text - .LicensePlateContainerNo = txtLKWId.Text - .DAKOSY_TemplateCode = cboStammreferenz._value - .DAKOSY_IOPartner = txtDyMandant.Text - .DAKOSY_Division3 = txtDyNiederlassung.Text - .DepartureCustomsOffice = sbAbgangZollstelle._value - .DestinationCustomsOffice = sbBestimmungsZollstelle._value - .DatDeterminationLimit = txtDat.Text - .CoolingTemperature = IIf(cbxTemperatur.Checked, txtTransporttemp.Text, "") - .Carrier_Name = usrCntl_Carrier.kdFirma.Text - .Carrier_Adress_City = usrCntl_Carrier.txtOrt.Text - .Carrier_Adress_Country = usrCntl_Carrier.sbLand._value - .Carrier_Adress_Postcode = usrCntl_Carrier.txtPlz.Text - .Carrier_Adress_Street = usrCntl_Carrier.txtStrasse.Text - .Carrier_EORI = usrCntl_Carrier.txtEORI.Text - .Guarantee_GRN = "" 'leer - .SAVE() - - End With - - If sbDurchgangszollstelle1._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle1._value) - If sbDurchgangszollstelle2._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle2._value) - If sbDurchgangszollstelle3._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle3._value) - If sbDurchgangszollstelle4._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle4._value) - If sbDurchgangszollstelle5._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle5._value) - If sbDurchgangszollstelle6._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle6._value) - If sbDurchgangszollstelle7._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle7._value) - If sbDurchgangszollstelle8._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle8._value) - If sbDurchgangszollstelle9._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle9._value) - - If sbRoute1._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute1._value) - If sbRoute2._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute2._value) - If sbRoute3._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute3._value) - If sbRoute4._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute4._value) - If sbRoute5._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute5._value) - If sbRoute6._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute6._value) - If sbRoute7._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute7._value) - If sbRoute8._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute8._value) - If sbRoute9._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute9._value) - - sendAtezData(atezData, atez) - - End If - + Catch ex As Exception + Me.Cursor = Cursors.Default + End Try End Sub @@ -200,7 +215,8 @@ Public Class frmATEZ_NCTS BezugsNr = BezugsNrTmp zusatz = "A" - If dgv IsNot Nothing Then + If dgv IsNot Nothing And dgv.Rows.Count > 0 Then + BezugsNr = BezugsNrTmp & "/" & zusatz For Each r As DataGridViewRow In dgv.Rows If r.Cells("BezugsNr").Value = BezugsNr Then @@ -261,7 +277,9 @@ Public Class frmATEZ_NCTS lblBezugsnummer.Text = atez_data.VERAG_LRN - cboStammreferenz._value = atez_data.SendungsId + + cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1", False, "FMZOLL", True) + cboStammreferenz.changeItem(atez_data.DAKOSY_TemplateCode) txtLKWId.Text = atez_data.LicensePlateContainerNo @@ -499,7 +517,7 @@ CASE WHEN [anh_Art] = 'ATR-EUR1' then 'EUR' End If End Sub - Private Sub dtpDat_ValueChanged(sender As Object, e As EventArgs) + Private Sub dtpDat_ValueChanged(sender As Object, e As EventArgs) Handles dtpDat.ValueChanged txtDat._value = CDate(sender.value).ToShortDateString End Sub diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 40dd46b..48e5917 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -1648,7 +1648,6 @@ Public Class usrcntlAktDetailsATILLANeu Try - If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0) @@ -1661,7 +1660,6 @@ Public Class usrcntlAktDetailsATILLANeu MsgBox(ex.Message & ex.StackTrace) End Try Me.Cursor = Cursors.Default - End Sub Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click @@ -1671,7 +1669,7 @@ Public Class usrcntlAktDetailsATILLANeu Private Sub dgvATEZNCTS_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvATEZNCTS.CellDoubleClick Try - + Me.Cursor = Cursors.WaitCursor If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0) @@ -1685,7 +1683,7 @@ Public Class usrcntlAktDetailsATILLANeu Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try - Me.Cursor = Cursors.Default + End Sub End Class From 1890478029abdd0612e99606963b6b2260369797 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 1 Sep 2023 09:51:45 +0200 Subject: [PATCH 2/3] sendungsdetails, Gewicht wird nun korrekt geladen. --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmSendungsdetailsNEU.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 2a18a30..6c20a04 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 378f8b9..9d448b8 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5749,7 +5749,7 @@ Public Class frmSendungsdetailsNEU If txtFrachtfuehrer.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtFrachtführer.Text = txtFrachtfuehrer.KdData_ADRESSEN.getAdressFromatted() If txtEmpfaenger.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtEmpfänger.Text = txtEmpfaenger.KdData_ADRESSEN.getAdressFromatted() - f.uCmr.dgvLadungenKurz.Rows.Add(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, ""), "Pk", If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, ""))) + f.uCmr.dgvLadungenKurz.Rows.Add(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, ""), "Pk", If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, ""), If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "")) f.uCmr.txtKfz.Text = AVISO.LKW_Nr f.uCmr.txtAnhänger.Text = AVISO.LKW_Nr From 8232002d6b69cdd16de6f1ae667942543ea97bc4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 1 Sep 2023 10:30:05 +0200 Subject: [PATCH 3/3] =?UTF-8?q?CMR:=20Untschriftsfelder=20->=20AMBAR=20hin?= =?UTF-8?q?zugef=C3=BCgt=20Bestimmungszollsteller=20auf=20Feld=2013=20Fehl?= =?UTF-8?q?er=20bei=20Gewichtsangabe=20korrigiert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/frmSendungsdetailsNEU.vb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 9d448b8..54f79b9 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5754,6 +5754,13 @@ Public Class frmSendungsdetailsNEU f.uCmr.txtKfz.Text = AVISO.LKW_Nr f.uCmr.txtAnhänger.Text = AVISO.LKW_Nr + If SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle <> "" Then + f.uCmr.txtAnweisungenDesAbsenders.Text = "Bestimmungszollstelle: " & vbNewLine & SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle ' usrcntl_NCTS.txtT1VerzollungsadresseBestimmungszollstelle.Text + + End If + + + If f.ShowDialog(Me) Then Dim da_id = -1