This commit is contained in:
2020-09-23 07:24:25 +02:00
parent 89d8e0a3a8
commit ce31c2c398
84 changed files with 4953 additions and 554 deletions

View File

@@ -53,6 +53,7 @@ Partial Class usrCntlATLAS_EZA
Me.LadenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.EZAIDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.BezugsnummerKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.SuspendLayout()
@@ -351,9 +352,9 @@ Partial Class usrCntlATLAS_EZA
'
'cntxtBezugsnr
'
Me.cntxtBezugsnr.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBezugsnummerVergebenToolStripMenuItem})
Me.cntxtBezugsnr.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBezugsnummerVergebenToolStripMenuItem, Me.BezugsnummerKopierenToolStripMenuItem})
Me.cntxtBezugsnr.Name = "cntxtBezugsnr"
Me.cntxtBezugsnr.Size = New System.Drawing.Size(239, 26)
Me.cntxtBezugsnr.Size = New System.Drawing.Size(239, 70)
Me.cntxtBezugsnr.Text = "Bezugsnr"
'
'NeueBezugsnummerVergebenToolStripMenuItem
@@ -436,6 +437,12 @@ Partial Class usrCntlATLAS_EZA
Me.EZAIDToolStripMenuItem.Size = New System.Drawing.Size(109, 22)
Me.EZAIDToolStripMenuItem.Text = "EZA ID"
'
'BezugsnummerKopierenToolStripMenuItem
'
Me.BezugsnummerKopierenToolStripMenuItem.Name = "BezugsnummerKopierenToolStripMenuItem"
Me.BezugsnummerKopierenToolStripMenuItem.Size = New System.Drawing.Size(238, 22)
Me.BezugsnummerKopierenToolStripMenuItem.Text = "Bezugsnummer kopieren"
'
'usrCntlATLAS_EZA
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -489,4 +496,5 @@ Partial Class usrCntlATLAS_EZA
Friend WithEvents btnDV1 As System.Windows.Forms.Button
Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem
Friend WithEvents EZAIDToolStripMenuItem As ToolStripMenuItem
Friend WithEvents BezugsnummerKopierenToolStripMenuItem As ToolStripMenuItem
End Class

View File

@@ -441,8 +441,9 @@ Public Class usrCntlATLAS_EZA
If If(SH.EZA.PrePaperNr, "") <> "" Then EZA.eza_VorpapierNr = SH.EZA.PrePaperNr
If If(SH.EZA.CountryCodeDeparture, "") <> "" Then EZA.eza_VersendungsLandCode = SH.EZA.CountryCodeDeparture
If If(SH.EZA.TransportBorderType, "") <> "" Then EZA.eza_VerkehrszweigInland = SH.EZA.TransportBorderType
If If(SH.EZA.TransportBorderType, "") <> "" Then EZA.eza_VerkehrszweigGrenze = SH.EZA.TransportBorderType
If If(SH.EZA.TransportModeBorder, "") <> "" Then EZA.eza_VerkehrszweigInland = SH.EZA.TransportModeBorder
If If(SH.EZA.TransportModeBorder, "") <> "" Then EZA.eza_VerkehrszweigGrenze = SH.EZA.TransportModeBorder
If If(SH.EZA.TransportBorderType, "") <> "" Then EZA.eza_BeförderungsmittelGrenzeArt = SH.EZA.TransportBorderType
'If If(AD.ezaAd_LandCode, "") = "DE" And AD.ezaAd_PLZ IsNot Nothing Then
' EZA.eza_Bestimmungsbundesland = VERAG_PROG_ALLGEMEIN.cDEBundeslaenderPLZ.LOADBundeslandCode_ByPLZ(AD.ezaAd_PLZ)
@@ -463,10 +464,12 @@ Public Class usrCntlATLAS_EZA
EZA_POS.ezaWP_UrsprungslandCode = SH_POS.OriginCountryCode
If If(SH_POS.KindOfPackages, "") <> "" Then EZA_POS.ezaWP_PackstueckArt = SH_POS.KindOfPackages
'If If(SH_POS.KindOfPackages, "") <> "" Then EZA_POS.ezaWP_PackstueckArt = SH_POS.KindOfPackages
EZA_POS.ezaWP_PackstueckArt = "PK"
If SH_POS.ItemInvoiceAmount IsNot Nothing Then
EZA_POS.ezaWP_Artikelpreis = SH_POS.ItemInvoiceAmount
EZA_POS.ezaWP_ArtikelpreisWaehrung = SH_POS.ItemInvoiceCurrency
EZA_POS.ezaWP_AHStatWert = SH_POS.ItemInvoiceAmount
InvoiceSum += CDbl(SH_POS.ItemInvoiceAmount)
If SH_POS.ItemInvoiceCurrency = "" Then
@@ -496,7 +499,8 @@ Public Class usrCntlATLAS_EZA
Next
EZA.eza_Rechnungspreis = InvoiceSum
If InvoiceCurr <> "XXX" Then EZA.eza_Rechnungswaehrung = InvoiceCurr
' If InvoiceCurr <> "XXX" Then EZA.eza_Rechnungswaehrung = InvoiceCurr
If If(SH.EZA.InvoiceCurrency, "") <> "" Then EZA.eza_Rechnungswaehrung = SH.EZA.InvoiceCurrency
Dim LieferbedingungOrtAbsedner = ""
Dim LieferbedingungOrtEmpfaenger = ""
@@ -734,5 +738,9 @@ Public Class usrCntlATLAS_EZA
MsgBox(EZA.eza_Id)
End If
End Sub
Private Sub BezugsnummerKopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BezugsnummerKopierenToolStripMenuItem.Click
Clipboard.SetText(lblBezugsnummer.Text)
End Sub
End Class

View File

@@ -49,7 +49,6 @@ Partial Class usrCntlATLAS_EZA_Position
Me.Label6 = New System.Windows.Forms.Label()
Me.txtPositionszusatz = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.lklBearbeitungAbbrechenUl = New System.Windows.Forms.LinkLabel()
Me.cboWaehrung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label31 = New System.Windows.Forms.Label()
Me.txtWarennummer = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtWTZ2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -85,6 +84,7 @@ Partial Class usrCntlATLAS_EZA_Position
Me.Label2 = New System.Windows.Forms.Label()
Me.Label29 = New System.Windows.Forms.Label()
Me.Label11 = New System.Windows.Forms.Label()
Me.txtArtikelpreisWaehrung = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.pnl.SuspendLayout()
CType(Me.dgvUnterlage, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
@@ -93,6 +93,7 @@ Partial Class usrCntlATLAS_EZA_Position
'
Me.pnl.AutoScroll = True
Me.pnl.BackColor = System.Drawing.Color.FloralWhite
Me.pnl.Controls.Add(Me.txtArtikelpreisWaehrung)
Me.pnl.Controls.Add(Me.sbAHStatMasseinheit)
Me.pnl.Controls.Add(Me.Label12)
Me.pnl.Controls.Add(Me.txtAHStatMenge)
@@ -117,7 +118,6 @@ Partial Class usrCntlATLAS_EZA_Position
Me.pnl.Controls.Add(Me.Label6)
Me.pnl.Controls.Add(Me.txtPositionszusatz)
Me.pnl.Controls.Add(Me.lklBearbeitungAbbrechenUl)
Me.pnl.Controls.Add(Me.cboWaehrung)
Me.pnl.Controls.Add(Me.Label31)
Me.pnl.Controls.Add(Me.txtWarennummer)
Me.pnl.Controls.Add(Me.txtWTZ2)
@@ -158,6 +158,7 @@ Partial Class usrCntlATLAS_EZA_Position
'
Me.sbAHStatMasseinheit._allowFreitext = False
Me.sbAHStatMasseinheit._AllowSetValue = False
Me.sbAHStatMasseinheit._allowSpaceAsSplitter = False
Me.sbAHStatMasseinheit._autoSizeGross = False
Me.sbAHStatMasseinheit._hideIfListEmpty = True
Me.sbAHStatMasseinheit._value = Nothing
@@ -294,6 +295,7 @@ Partial Class usrCntlATLAS_EZA_Position
'
Me.sbUrsprungsland._allowFreitext = False
Me.sbUrsprungsland._AllowSetValue = False
Me.sbUrsprungsland._allowSpaceAsSplitter = False
Me.sbUrsprungsland._autoSizeGross = False
Me.sbUrsprungsland._hideIfListEmpty = True
Me.sbUrsprungsland._value = ""
@@ -457,19 +459,6 @@ Partial Class usrCntlATLAS_EZA_Position
Me.lklBearbeitungAbbrechenUl.Text = "Bearbeitung abbrechen"
Me.lklBearbeitungAbbrechenUl.Visible = False
'
'cboWaehrung
'
Me.cboWaehrung._allowedValuesFreiText = Nothing
Me.cboWaehrung._allowFreiText = False
Me.cboWaehrung._value = ""
Me.cboWaehrung.Enabled = False
Me.cboWaehrung.FormattingEnabled = True
Me.cboWaehrung.Location = New System.Drawing.Point(281, 213)
Me.cboWaehrung.Name = "cboWaehrung"
Me.cboWaehrung.Size = New System.Drawing.Size(67, 21)
Me.cboWaehrung.TabIndex = 21
Me.cboWaehrung.Text = "EUR"
'
'Label31
'
Me.Label31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -559,6 +548,7 @@ Partial Class usrCntlATLAS_EZA_Position
'
Me.sbKundenzolltarif._allowFreitext = False
Me.sbKundenzolltarif._AllowSetValue = False
Me.sbKundenzolltarif._allowSpaceAsSplitter = False
Me.sbKundenzolltarif._autoSizeGross = False
Me.sbKundenzolltarif._hideIfListEmpty = True
Me.sbKundenzolltarif._value = Nothing
@@ -600,6 +590,7 @@ Partial Class usrCntlATLAS_EZA_Position
Me.txtEigenmasse.Name = "txtEigenmasse"
Me.txtEigenmasse.Size = New System.Drawing.Size(117, 20)
Me.txtEigenmasse.TabIndex = 24
Me.txtEigenmasse.Text = "0,00"
'
'txtRohmasse
'
@@ -622,6 +613,7 @@ Partial Class usrCntlATLAS_EZA_Position
Me.txtRohmasse.Name = "txtRohmasse"
Me.txtRohmasse.Size = New System.Drawing.Size(117, 20)
Me.txtRohmasse.TabIndex = 25
Me.txtRohmasse.Text = "0,00"
'
'Label27
'
@@ -645,6 +637,7 @@ Partial Class usrCntlATLAS_EZA_Position
'
Me.sbUlArt._allowFreitext = False
Me.sbUlArt._AllowSetValue = False
Me.sbUlArt._allowSpaceAsSplitter = False
Me.sbUlArt._autoSizeGross = False
Me.sbUlArt._hideIfListEmpty = True
Me.sbUlArt._value = Nothing
@@ -669,6 +662,7 @@ Partial Class usrCntlATLAS_EZA_Position
'
Me.sbPkTyp._allowFreitext = False
Me.sbPkTyp._AllowSetValue = False
Me.sbPkTyp._allowSpaceAsSplitter = False
Me.sbPkTyp._autoSizeGross = False
Me.sbPkTyp._hideIfListEmpty = True
Me.sbPkTyp._value = Nothing
@@ -992,6 +986,31 @@ Partial Class usrCntlATLAS_EZA_Position
Me.Label11.Text = "Ursprungsland:"
Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'txtArtikelpreisWaehrung
'
Me.txtArtikelpreisWaehrung._allowFreitext = False
Me.txtArtikelpreisWaehrung._AllowSetValue = False
Me.txtArtikelpreisWaehrung._allowSpaceAsSplitter = False
Me.txtArtikelpreisWaehrung._autoSizeGross = False
Me.txtArtikelpreisWaehrung._hideIfListEmpty = True
Me.txtArtikelpreisWaehrung._value = ""
Me.txtArtikelpreisWaehrung.conn_art = "FMZOLL"
Me.txtArtikelpreisWaehrung.dgvpos = "LEFT"
Me.txtArtikelpreisWaehrung.DISPLAY_PARAM = Nothing
Me.txtArtikelpreisWaehrung.INVISIBLE_COLUMNS = Nothing
Me.txtArtikelpreisWaehrung.key_visible = False
Me.txtArtikelpreisWaehrung.KEYPARAM = Nothing
Me.txtArtikelpreisWaehrung.Location = New System.Drawing.Point(281, 214)
Me.txtArtikelpreisWaehrung.Name = "txtArtikelpreisWaehrung"
Me.txtArtikelpreisWaehrung.searchActive = True
Me.txtArtikelpreisWaehrung.Size = New System.Drawing.Size(67, 20)
Me.txtArtikelpreisWaehrung.SQL_ORDER_BY = Nothing
Me.txtArtikelpreisWaehrung.SQL_SELECT = Nothing
Me.txtArtikelpreisWaehrung.SQL_WHERE = Nothing
Me.txtArtikelpreisWaehrung.SQL_WhereParamList = Nothing
Me.txtArtikelpreisWaehrung.TabIndex = 60
Me.txtArtikelpreisWaehrung.usrcntl = Nothing
'
'usrCntlATLAS_EZA_Position
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1037,7 +1056,6 @@ Partial Class usrCntlATLAS_EZA_Position
Friend WithEvents txtWarennummer As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txtWTZ2 As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txtWTZ1 As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents cboWaehrung As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents lklBearbeitungAbbrechenUl As System.Windows.Forms.LinkLabel
Friend WithEvents Label6 As System.Windows.Forms.Label
Friend WithEvents txtPositionszusatz As VERAG_PROG_ALLGEMEIN.MyTextBox
@@ -1068,4 +1086,5 @@ Partial Class usrCntlATLAS_EZA_Position
Friend WithEvents Label12 As Label
Friend WithEvents txtAHStatMenge As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents sbAHStatMasseinheit As VERAG_PROG_ALLGEMEIN.MySearchBox
Friend WithEvents txtArtikelpreisWaehrung As VERAG_PROG_ALLGEMEIN.MySearchBox
End Class

View File

@@ -113,6 +113,7 @@
cboBeguenstigung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("420 - Kontingent im Rahmen einer Zollunion", "420"))
txtArtikelpreisWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 400, 200)
setvalue(WARE)
@@ -139,6 +140,7 @@
RaiseEvent RohmasseChanged(If(IsNumeric(txtRohmasse.Text), CDbl(txtRohmasse.Text), 0))
Me.txtEigenmasse.Text = If(WARE.ezaWP_Eigenmasse, "")
Me.txtWarenwert._value = If(WARE.ezaWP_Artikelpreis, "")
Me.txtArtikelpreisWaehrung.SET_VALUE(If(WARE.ezaWP_ArtikelpreisWaehrung, ""))
' Me.txtWarennummer.Text = If(WARE.ezaWP_WarennummerEZT, "")
txtAHStatMenge.Text = If(WARE.ezaWP_AHStatMenge, "")

View File

@@ -230,6 +230,7 @@
POSITION.ezaWP_WarennummerZusatzCode2 = cProgramFunctions.isLeerNothing(P.txtWTZ2.Text)
POSITION.ezaWP_Warenbezeichnung = cProgramFunctions.isLeerNothing(P.txtWarenbezeichnung.Text)
POSITION.ezaWP_Artikelpreis = cProgramFunctions.isLeerNothingDbl(P.txtWarenwert._value)
POSITION.ezaWP_ArtikelpreisWaehrung = cProgramFunctions.isLeerNothing(P.txtArtikelpreisWaehrung._value)
'POSITION.ezaWP_WarenwertWaehrung = P.XXXXXXXXXXXX.Text
'POSITION.ezaWP_SchaetzKz = P.XXXXXXXXXXXX.Text

View File

@@ -429,7 +429,13 @@ Class DAKOSY_Interface_SEND
If u.ezaWP_AbgabensteuerungKz IsNot Nothing Then WP.AbgabensteuerungKz = CInt(Int(u.ezaWP_AbgabensteuerungKz))
If u.ezaWP_EUCode IsNot Nothing Then WP.EUCode = u.ezaWP_EUCode
If u.ezaWP_UrsprungslandCode IsNot Nothing Then WP.UrsprungslandCode = u.ezaWP_UrsprungslandCode
If u.ezaWP_Rohmasse IsNot Nothing Then WP.Rohmasse = u.ezaWP_Rohmasse
If cDY.eza_WARENPOS.Count > 1 Then
WP.Rohmasse = Nothing
Else
If u.ezaWP_Rohmasse IsNot Nothing Then WP.Rohmasse = u.ezaWP_Rohmasse
End If
If u.ezaWP_Eigenmasse IsNot Nothing Then WP.Eigenmasse = u.ezaWP_Eigenmasse
If u.ezaWP_AHStatMenge IsNot Nothing Then WP.AHStatMenge = u.ezaWP_AHStatMenge
If u.ezaWP_AHStatMengeMasseinheit IsNot Nothing Then WP.AHStatMengeMasseinheit = u.ezaWP_AHStatMengeMasseinheit
@@ -660,7 +666,21 @@ Class DAKOSY_Interface_SEND
If u.ezaWP_Aussenhandelsstatistik_BefoerderungsmittelBeschreibung IsNot Nothing Then WP.Aussenhandelsstatistik.BefoerderungsmittelBeschreibung = u.ezaWP_Aussenhandelsstatistik_BefoerderungsmittelBeschreibung
If u.ezaWP_Aussenhandelsstatistik_ArtGeschaeft IsNot Nothing Then WP.Aussenhandelsstatistik.ArtGeschaeft = u.ezaWP_Aussenhandelsstatistik_ArtGeschaeft
If u.ezaWP_Aussenhandelsstatistik_Statistikstatus IsNot Nothing Then WP.Aussenhandelsstatistik.Statistikstatus = u.ezaWP_Aussenhandelsstatistik_Statistikstatus
'DV1
If u.ezaWP_Artikelpreis IsNot Nothing Then
Dim ABZHRG As New FreierVerkehrAktVeredelUmwandlung_004.AbzugHinzurechnungAVUVTyp
ABZHRG.Betrag = u.ezaWP_Artikelpreis
ABZHRG.Waehrung = u.ezaWP_ArtikelpreisWaehrung
ABZHRG.ArtCode = "R"
If If(ABZHRG.Waehrung, "") = "EUR" Then ABZHRG.KursAuslandswaehrung = 1
WP.Artikelpreis = u.ezaWP_Artikelpreis
WP.AbzugHinzurechnung.Add(ABZHRG)
End If
EA.WarenPosition.Add(WP)
Next
End If