This commit is contained in:
2023-08-23 17:37:10 +02:00
parent 28f9483bd3
commit ea9ee0c817
4 changed files with 101 additions and 85 deletions

View File

@@ -108,7 +108,7 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AssemblyOriginatorKeyFile>Aviso_TemporaryKey.pfx</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>LME.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.9.0.7")> <Assembly: AssemblyVersion("3.9.0.8")>
<Assembly: AssemblyFileVersion("3.9.0.7")> <Assembly: AssemblyFileVersion("3.9.0.8")>

View File

@@ -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 GrapeCity.ActiveReports.ReportsCore.Tools
Imports Newtonsoft.Json.Linq Imports Newtonsoft.Json.Linq
Imports SDL Imports SDL
@@ -72,88 +73,102 @@ Public Class frmATEZ_NCTS
End Sub End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click 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 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 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) sendAtezData(atezData, atez)
End If End If
Me.Cursor = Cursors.Default
Else Catch ex As Exception
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
Me.Cursor = Cursors.Default
End Try
End Sub End Sub
@@ -200,7 +215,8 @@ Public Class frmATEZ_NCTS
BezugsNr = BezugsNrTmp BezugsNr = BezugsNrTmp
zusatz = "A" 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 For Each r As DataGridViewRow In dgv.Rows
If r.Cells("BezugsNr").Value = BezugsNr Then If r.Cells("BezugsNr").Value = BezugsNr Then
@@ -261,7 +277,9 @@ Public Class frmATEZ_NCTS
lblBezugsnummer.Text = atez_data.VERAG_LRN 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 txtLKWId.Text = atez_data.LicensePlateContainerNo
@@ -499,7 +517,7 @@ CASE WHEN [anh_Art] = 'ATR-EUR1' then 'EUR'
End If End If
End Sub 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 txtDat._value = CDate(sender.value).ToShortDateString
End Sub End Sub

View File

@@ -1648,7 +1648,6 @@ Public Class usrcntlAktDetailsATILLANeu
Try Try
If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0) Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0)
@@ -1661,7 +1660,6 @@ Public Class usrcntlAktDetailsATILLANeu
MsgBox(ex.Message & ex.StackTrace) MsgBox(ex.Message & ex.StackTrace)
End Try End Try
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End Sub End Sub
Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click 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 Private Sub dgvATEZNCTS_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvATEZNCTS.CellDoubleClick
Try Try
Me.Cursor = Cursors.WaitCursor
If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0) Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0)
@@ -1685,7 +1683,7 @@ Public Class usrcntlAktDetailsATILLANeu
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace) MsgBox(ex.Message & ex.StackTrace)
End Try End Try
Me.Cursor = Cursors.Default
End Sub End Sub
End Class End Class