edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
d.breimaier
2025-01-22 16:19:21 +01:00
parent 2e55215581 f4363c4563
commit f7c3db66e9
8 changed files with 1015 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/Classes/cEORIWebService.vb
View File

@@ -146,7 +146,7 @@ Public Class cEORIWebService
setEORIEntry(KdNr, SendungsId, AvisoId, EORI_ERG, tmp_SESSION_ID, EORI_ERG.Result(0).Eori, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID)
Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, txtEORI, AvisoId, SendungsId)
Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, txtEORI, AvisoId, SendungsId, EORI_ERG.RequestDate)
If PdfTmp <> "" Then
Dim fileName = "EORI_Prüfung_" & txtEORI & ".pdf"
@@ -211,7 +211,7 @@ Public Class cEORIWebService
setEORIEntry(kdnr, SendungsId, AvisoId, EORI_ERG, tmp_SESSION_ID, txtEORI, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID)
Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, txtEORI, AvisoId, SendungsId)
Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, txtEORI, AvisoId, SendungsId, EORI_ERG.RequestDate)
Return PdfTmp

8
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -959,7 +959,7 @@ Public Class usrCntlFaktAbrechnung
End If
cboSammelrechnung.changeItem(If(kdFirmaAbsender.KdData_KUNDE.Sammelrechnung, ""))
cboWaehrungUmrechnung.changeItem(If(kdFirmaAbsender.KdData_KUNDE.Währungscode, ""))
cboVorauskasse.changeItem(CInt(kdFirmaAbsender.KdData_KUNDE.Vorkasse))
cboVorauskasse.changeItem(Convert.ToInt32(kdFirmaAbsender.KdData_KUNDE.Vorkasse))
End If
Case "2"
kdFirmaRechnungAn.KdNr = kdFirmaEmpfaenger.KdNr
@@ -976,7 +976,7 @@ Public Class usrCntlFaktAbrechnung
End If
cboSammelrechnung.changeItem(If(kdFirmaEmpfaenger.KdData_KUNDE.Sammelrechnung, ""))
cboWaehrungUmrechnung.changeItem(If(kdFirmaEmpfaenger.KdData_KUNDE.Währungscode, ""))
cboVorauskasse.changeItem(CInt(kdFirmaEmpfaenger.KdData_KUNDE.Vorkasse))
cboVorauskasse.changeItem(Convert.ToInt32(kdFirmaEmpfaenger.KdData_KUNDE.Vorkasse))
End If
Case "3"
kdFirmaRechnungAn.KdNr = kdFirmaAuftraggeber.KdNr
@@ -993,7 +993,7 @@ Public Class usrCntlFaktAbrechnung
End If
cboSammelrechnung.changeItem(If(kdFirmaAuftraggeber.KdData_KUNDE.Sammelrechnung, ""))
cboWaehrungUmrechnung.changeItem(If(kdFirmaAuftraggeber.KdData_KUNDE.Währungscode, ""))
cboVorauskasse.changeItem(CInt(kdFirmaAuftraggeber.KdData_KUNDE.Vorkasse))
cboVorauskasse.changeItem(Convert.ToInt32(kdFirmaAuftraggeber.KdData_KUNDE.Vorkasse))
End If
Case "4"
kdFirmaRechnungAn.KdNr = kdFirmaAvisierer.KdNr
@@ -1007,7 +1007,7 @@ Public Class usrCntlFaktAbrechnung
End If
cboSammelrechnung.changeItem(If(kdFirmaAvisierer.KdData_KUNDE.Sammelrechnung, ""))
cboWaehrungUmrechnung.changeItem(If(kdFirmaAvisierer.KdData_KUNDE.Währungscode, ""))
cboVorauskasse.changeItem(CInt(kdFirmaAvisierer.KdData_KUNDE.Vorkasse))
cboVorauskasse.changeItem(Convert.ToInt32(kdFirmaAvisierer.KdData_KUNDE.Vorkasse))
End If
Case Else
End Select

9
SDL/SDL.vbproj
View File

@@ -1083,6 +1083,12 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\cDakosyInterface_Send.vb" />
<Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EXGestellung\usrCntlATLAS_EXGestellung.Designer.vb">
<DependentUpon>usrCntlATLAS_EXGestellung.vb</DependentUpon>
</Compile>
<Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EXGestellung\usrCntlATLAS_EXGestellung.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA.Designer.vb">
<DependentUpon>usrCntlATLAS_EZA.vb</DependentUpon>
</Compile>
@@ -3461,6 +3467,9 @@
<EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES.resx">
<DependentUpon>usrCntlATLAS_AES.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\EXGestellung\usrCntlATLAS_EXGestellung.resx">
<DependentUpon>usrCntlATLAS_EXGestellung.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA.resx">
<DependentUpon>usrCntlATLAS_EZA.vb</DependentUpon>
</EmbeddedResource>

338
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.Designer.vb generated Normal file
View File

@@ -0,0 +1,338 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class usrCntlATLAS_EXGestellung
Inherits System.Windows.Forms.UserControl
'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
components.Dispose()
End If
Finally
MyBase.Dispose(disposing)
End Try
End Sub
'Wird vom Windows Form-Designer benötigt.
Private components As System.ComponentModel.IContainer
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
Me.btnAllgemein = New System.Windows.Forms.Button()
Me.pnl = New System.Windows.Forms.Panel()
Me.cboDakosyAction = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Button1 = New System.Windows.Forms.Button()
Me.MyCheckbox1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label6 = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.lblBezugsnummer = New System.Windows.Forms.Label()
Me.cntxtBezugsnr = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.NeueBezugsnummerVergebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.txtDyMandant = New System.Windows.Forms.Label()
Me.txtDyNiederlassung = New System.Windows.Forms.Label()
Me.MenuStrip = New System.Windows.Forms.MenuStrip()
Me.OptionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Label2 = New System.Windows.Forms.Label()
Me.rtbMRN = New System.Windows.Forms.RichTextBox()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.Panel2.SuspendLayout()
Me.SplitContainer.SuspendLayout()
Me.MyFlowLayoutPanel1.SuspendLayout()
Me.pnl.SuspendLayout()
Me.cntxtBezugsnr.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.MenuStrip.SuspendLayout()
Me.SuspendLayout()
'
'SplitContainer
'
Me.SplitContainer.Dock = System.Windows.Forms.DockStyle.Fill
Me.SplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1
Me.SplitContainer.IsSplitterFixed = True
Me.SplitContainer.Location = New System.Drawing.Point(0, 25)
Me.SplitContainer.Margin = New System.Windows.Forms.Padding(0)
Me.SplitContainer.Name = "SplitContainer"
Me.SplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal
'
'SplitContainer.Panel1
'
Me.SplitContainer.Panel1.Controls.Add(Me.MyFlowLayoutPanel1)
Me.SplitContainer.Panel1.Controls.Add(Me.pnl)
'
'SplitContainer.Panel2
'
Me.SplitContainer.Panel2.BackColor = System.Drawing.Color.White
Me.SplitContainer.Panel2.Controls.Add(Me.rtbMRN)
Me.SplitContainer.Panel2.Controls.Add(Me.Label2)
Me.SplitContainer.Panel2.Controls.Add(Me.MyCheckbox1)
Me.SplitContainer.Panel2.Controls.Add(Me.cboStammreferenz)
Me.SplitContainer.Panel2.Controls.Add(Me.Label6)
Me.SplitContainer.Size = New System.Drawing.Size(934, 687)
Me.SplitContainer.SplitterDistance = 72
Me.SplitContainer.SplitterWidth = 1
Me.SplitContainer.TabIndex = 0
'
'MyFlowLayoutPanel1
'
Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.WhiteSmoke
Me.MyFlowLayoutPanel1.Controls.Add(Me.btnAllgemein)
Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill
Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
Me.MyFlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(1)
Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1"
Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(573, 72)
Me.MyFlowLayoutPanel1.TabIndex = 0
'
'btnAllgemein
'
Me.btnAllgemein.BackColor = System.Drawing.Color.SteelBlue
Me.btnAllgemein.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.btnAllgemein.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAllgemein.ForeColor = System.Drawing.SystemColors.ControlLightLight
Me.btnAllgemein.Image = Global.SDL.My.Resources.Resources.android_note12
Me.btnAllgemein.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.btnAllgemein.Location = New System.Drawing.Point(2, 2)
Me.btnAllgemein.Margin = New System.Windows.Forms.Padding(2)
Me.btnAllgemein.Name = "btnAllgemein"
Me.btnAllgemein.Padding = New System.Windows.Forms.Padding(0, 12, 0, 3)
Me.btnAllgemein.Size = New System.Drawing.Size(75, 67)
Me.btnAllgemein.TabIndex = 0
Me.btnAllgemein.Text = "Allgemein"
Me.btnAllgemein.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.btnAllgemein.UseVisualStyleBackColor = False
'
'pnl
'
Me.pnl.BackColor = System.Drawing.Color.WhiteSmoke
Me.pnl.Controls.Add(Me.cboDakosyAction)
Me.pnl.Controls.Add(Me.Button1)
Me.pnl.Dock = System.Windows.Forms.DockStyle.Right
Me.pnl.Location = New System.Drawing.Point(573, 0)
Me.pnl.Name = "pnl"
Me.pnl.Size = New System.Drawing.Size(361, 72)
Me.pnl.TabIndex = 1
'
'cboDakosyAction
'
Me.cboDakosyAction._allowedValuesFreiText = Nothing
Me.cboDakosyAction._allowFreiText = False
Me.cboDakosyAction._value = ""
Me.cboDakosyAction.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
Me.cboDakosyAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboDakosyAction.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.cboDakosyAction.FormattingEnabled = True
Me.cboDakosyAction.Location = New System.Drawing.Point(200, 48)
Me.cboDakosyAction.Name = "cboDakosyAction"
Me.cboDakosyAction.Size = New System.Drawing.Size(159, 21)
Me.cboDakosyAction.TabIndex = 1
'
'Button1
'
Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Button1.BackColor = System.Drawing.Color.White
Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.Button1.Location = New System.Drawing.Point(200, 5)
Me.Button1.Margin = New System.Windows.Forms.Padding(2)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(159, 42)
Me.Button1.TabIndex = 6
Me.Button1.Text = "An DAKOSY senden -->"
Me.Button1.UseVisualStyleBackColor = False
'
'MyCheckbox1
'
Me.MyCheckbox1._value = ""
Me.MyCheckbox1.AutoSize = True
Me.MyCheckbox1.Checked_value = False
Me.MyCheckbox1.CheckedValue = False
Me.MyCheckbox1.Location = New System.Drawing.Point(462, 31)
Me.MyCheckbox1.Name = "MyCheckbox1"
Me.MyCheckbox1.Size = New System.Drawing.Size(225, 17)
Me.MyCheckbox1.TabIndex = 13
Me.MyCheckbox1.Text = "Ereignis (wenn JA -> in DAKOSY erstellen)"
Me.MyCheckbox1.UseVisualStyleBackColor = True
'
'cboStammreferenz
'
Me.cboStammreferenz._allowedValuesFreiText = Nothing
Me.cboStammreferenz._allowFreiText = False
Me.cboStammreferenz._value = ""
Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboStammreferenz.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.cboStammreferenz.FormattingEnabled = True
Me.cboStammreferenz.Location = New System.Drawing.Point(144, 27)
Me.cboStammreferenz.Name = "cboStammreferenz"
Me.cboStammreferenz.Size = New System.Drawing.Size(280, 21)
Me.cboStammreferenz.TabIndex = 11
'
'Label6
'
Me.Label6.AutoSize = True
Me.Label6.Location = New System.Drawing.Point(17, 30)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(57, 13)
Me.Label6.TabIndex = 12
Me.Label6.Text = "Stammref.:"
Me.Label6.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'Label1
'
Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label1.AutoSize = True
Me.Label1.BackColor = System.Drawing.Color.White
Me.Label1.Location = New System.Drawing.Point(499, 7)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(82, 13)
Me.Label1.TabIndex = 5
Me.Label1.Text = "Bezugsnummer:"
'
'lblBezugsnummer
'
Me.lblBezugsnummer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lblBezugsnummer.BackColor = System.Drawing.Color.White
Me.lblBezugsnummer.ContextMenuStrip = Me.cntxtBezugsnr
Me.lblBezugsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblBezugsnummer.Location = New System.Drawing.Point(584, 1)
Me.lblBezugsnummer.Name = "lblBezugsnummer"
Me.lblBezugsnummer.Size = New System.Drawing.Size(347, 23)
Me.lblBezugsnummer.TabIndex = 6
Me.lblBezugsnummer.Text = "4800/000000/17 AAA"
Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
'cntxtBezugsnr
'
Me.cntxtBezugsnr.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBezugsnummerVergebenToolStripMenuItem})
Me.cntxtBezugsnr.Name = "cntxtBezugsnr"
Me.cntxtBezugsnr.Size = New System.Drawing.Size(239, 26)
Me.cntxtBezugsnr.Text = "Bezugsnr"
'
'NeueBezugsnummerVergebenToolStripMenuItem
'
Me.NeueBezugsnummerVergebenToolStripMenuItem.Name = "NeueBezugsnummerVergebenToolStripMenuItem"
Me.NeueBezugsnummerVergebenToolStripMenuItem.Size = New System.Drawing.Size(238, 22)
Me.NeueBezugsnummerVergebenToolStripMenuItem.Text = "neue Bezugsnummer vergeben"
'
'Panel1
'
Me.Panel1.Controls.Add(Me.txtDyMandant)
Me.Panel1.Controls.Add(Me.Label1)
Me.Panel1.Controls.Add(Me.txtDyNiederlassung)
Me.Panel1.Controls.Add(Me.lblBezugsnummer)
Me.Panel1.Controls.Add(Me.MenuStrip)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel1.Location = New System.Drawing.Point(0, 0)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(934, 25)
Me.Panel1.TabIndex = 1
'
'txtDyMandant
'
Me.txtDyMandant.BackColor = System.Drawing.Color.White
Me.txtDyMandant.Location = New System.Drawing.Point(372, 7)
Me.txtDyMandant.Name = "txtDyMandant"
Me.txtDyMandant.Size = New System.Drawing.Size(48, 13)
Me.txtDyMandant.TabIndex = 19
Me.txtDyMandant.Text = "VERG"
Me.txtDyMandant.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'txtDyNiederlassung
'
Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White
Me.txtDyNiederlassung.Location = New System.Drawing.Point(426, 7)
Me.txtDyNiederlassung.Name = "txtDyNiederlassung"
Me.txtDyNiederlassung.Size = New System.Drawing.Size(63, 13)
Me.txtDyNiederlassung.TabIndex = 18
Me.txtDyNiederlassung.Text = "SUB"
'
'MenuStrip
'
Me.MenuStrip.BackColor = System.Drawing.Color.White
Me.MenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OptionenToolStripMenuItem})
Me.MenuStrip.Location = New System.Drawing.Point(0, 0)
Me.MenuStrip.Name = "MenuStrip"
Me.MenuStrip.Size = New System.Drawing.Size(934, 24)
Me.MenuStrip.TabIndex = 0
'
'OptionenToolStripMenuItem
'
Me.OptionenToolStripMenuItem.Name = "OptionenToolStripMenuItem"
Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(69, 20)
Me.OptionenToolStripMenuItem.Text = "Optionen"
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(17, 63)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(121, 13)
Me.Label2.TabIndex = 14
Me.Label2.Text = "NCTS-Vorpapier (MRN):"
Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'rtbMRN
'
Me.rtbMRN.Location = New System.Drawing.Point(145, 63)
Me.rtbMRN.Name = "rtbMRN"
Me.rtbMRN.Size = New System.Drawing.Size(279, 474)
Me.rtbMRN.TabIndex = 15
Me.rtbMRN.Text = ""
'
'usrCntlATLAS_EXGestellung
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Controls.Add(Me.SplitContainer)
Me.Controls.Add(Me.Panel1)
Me.Name = "usrCntlATLAS_EXGestellung"
Me.Size = New System.Drawing.Size(934, 712)
Me.SplitContainer.Panel1.ResumeLayout(False)
Me.SplitContainer.Panel2.ResumeLayout(False)
Me.SplitContainer.Panel2.PerformLayout()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer.ResumeLayout(False)
Me.MyFlowLayoutPanel1.ResumeLayout(False)
Me.pnl.ResumeLayout(False)
Me.cntxtBezugsnr.ResumeLayout(False)
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
Me.MenuStrip.ResumeLayout(False)
Me.MenuStrip.PerformLayout()
Me.ResumeLayout(False)
End Sub
Friend WithEvents SplitContainer As System.Windows.Forms.SplitContainer
Friend WithEvents MyFlowLayoutPanel1 As VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel
Friend WithEvents btnAllgemein As System.Windows.Forms.Button
Friend WithEvents pnl As System.Windows.Forms.Panel
Friend WithEvents Button1 As System.Windows.Forms.Button
Friend WithEvents lblBezugsnummer As System.Windows.Forms.Label
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents Panel1 As System.Windows.Forms.Panel
Friend WithEvents MenuStrip As System.Windows.Forms.MenuStrip
Friend WithEvents OptionenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents cboDakosyAction As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents cntxtBezugsnr As System.Windows.Forms.ContextMenuStrip
Friend WithEvents NeueBezugsnummerVergebenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents Label6 As System.Windows.Forms.Label
Friend WithEvents cboStammreferenz As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents txtDyMandant As System.Windows.Forms.Label
Friend WithEvents txtDyNiederlassung As System.Windows.Forms.Label
Friend WithEvents MyCheckbox1 As VERAG_PROG_ALLGEMEIN.MyCheckbox
Friend WithEvents rtbMRN As RichTextBox
Friend WithEvents Label2 As Label
End Class

126
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.resx Normal file
View File

@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="cntxtBezugsnr.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>125, 17</value>
</metadata>
<metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

258
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb Normal file
View File

@@ -0,0 +1,258 @@
Imports DAKOSY_Worker
Public Class usrCntlATLAS_EXGestellung
Property ALLG As usrCntlATLAS_EXGestellung
'Property FilialeNr As Integer
' Property AbfertigungsNr As Integer
' Property BezugsNr As String = ""
' Property AvisoId As Integer
'Property SENDUNGS_ID As Integer
Property AVISO As VERAG_PROG_ALLGEMEIN.cAviso
Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen
Dim sentToDakosy = False
Property FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
Me.AVISO = AVISO
Me.SENDUNG = SENDUNG
Me.FIRMA_DY = FIRMA_DY
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
End Sub
Private Sub usrCntlATLAS_Load(sender As Object, e As EventArgs) Handles Me.Load
cboDakosyAction.Items.Clear()
cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Neuen Datensatz erstellen", DY_ObjektAktion.OBJ_CREATE))
cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vohr. DS ändern", DY_ObjektAktion.OBJ_CHANGE))
cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorh. DS stornieren", DY_ObjektAktion.OBJ_CANCEL))
cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Datensatz an ZOLL senden", DY_ObjektAktion.OBJ_SEND))
cboDakosyAction.changeItem(DY_ObjektAktion.OBJ_CREATE)
Select Case FIRMA_DY
Case "VERAG" : txtDyMandant.Text = "VERG"
txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
'Case "SUB" : txtDyNiederlassung.Text = "VERG"
'Case "SUW" : txtDyNiederlassung.Text = "ATIL"
''Case "SBG" : txtDyNiederlassung.Text = "IMEX"
'Case "NEU" : txtDyNiederlassung.Text = "IMEX"
'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
'End Select
Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
End Select
Dim BezugsNr = ("ID" & AVISO.AvisoID & "_" & SENDUNG.FilialenNr & "-" & SENDUNG.AbfertigungsNr & "_" & If(AVISO.Auftraggeber.Length > 8, AVISO.Auftraggeber.ToString.Substring(0, 5), AVISO.Auftraggeber)).Trim
lblBezugsnummer.Text = BezugsNr
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EXP' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1", False, "FMZOLL", True)
' MsgBox("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='AA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1")
cboStammreferenz.changeItem("")
If cboStammreferenz.Items.Count = 2 Then
cboStammreferenz.SelectedIndex = 1
End If
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Me.Cursor = Cursors.WaitCursor
Dim err = False
If cboStammreferenz._value = "" Then MsgBox("Stammreferenz auswählen!") : Exit Sub
If rtbMRN.Text.Trim = "" Then MsgBox("MRN auswählen!") : Exit Sub
If sentToDakosy OrElse vbYes = MsgBox("Soll die Ausfuhr-Gestellung abgeschickt werden?", vbYesNoCancel) Then
'MRN Prüfung:
For Each l In rtbMRN.Lines
If l.Trim <> "" Then
If Not IsValidMRN(l) Then
MsgBox("Ungültige MRN (Format): " & l)
Me.Cursor = Cursors.Default
Exit Sub
End If
End If
Next
'Senden:
For Each l In rtbMRN.Lines
If l.Trim <> "" Then
If Not sendEXP_MRN(l) Then
MsgBox("Sendefehler bei " & l)
err = True
End If
End If
Next
Me.FindForm.Close()
End If
If Not err Then Me.Cursor = Cursors.Default
End Sub
Function sendEXP_MRN(MRN) As Boolean
Me.Refresh()
' Dim cDyAnm As New cDakosy_Zollanmeldungen(cDy_ART, BezugsNr, AVISO.AvisoID, SENDUNG.tblSnd_SendungID)
'loadDYZollanmeldungen()
Dim dy_Id = -1
If True Then
''Dim cDY As New cDakosyNCTSOut(cDyAnm.dy_Id, cDyAnm.dy_Erstellung_SB)
'ncts_OUT.ncts_dyaAnmID = DY_ANM.dy_Id
'ncts_OUT.ncts_Erstellung_SB = DY_ANM.dy_Erstellung_SB
'ncts_OUT.ncts_LetzteBearbeitung = Now
'ncts_OUT.ncts_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB
'ncts_OUT.ncts_firma = Me.FIRMA_DY
' DAKOSY_Interface_SEND.loadInClass_VersandanmeldungNCTSDE_003(ncts_OUT, Me, DY_ANM, Me.FIRMA_DY)
' dim FilialenNr
Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
FIRMA_DY = frmZollanmeldung.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm)
Dim saveFile = ""
If generatePresentationEXITDE_003(MRN, AVISO, SENDUNG, lblBezugsnummer.Text, saveFile, cboDakosyAction._value, FIRMA_DY, cboStammreferenz._value) Then
If saveFile <> "" Then
If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, lblBezugsnummer.Text, dy_Id, FIRMA_DY) Then
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03)
If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen.
Return True
Else
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09)
Return False
End If
End If
End If
End If
' DY_ANM.UPDATE_DATA()
'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist.
' DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId)
Return False
End Function
Shared Function generatePresentationEXITDE_003(MRN As String, AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SND As VERAG_PROG_ALLGEMEIN.cSendungen, ByVal Bezugsnummer As String, ByRef saveFile As String, DY_ACTION As String, FIRMA_DY As String, Optional BezugsnummerVorblendung As String = "") As Boolean
Dim Interface_VERSION = "003"
Dim ObjectAktion = DY_ACTION
' Dim BezugsnummerVorblendung = "AA_NCTS_DE_ZE_WO_MITTICH"
Dim XML As New DAKOSY_Worker.PresentationEXITDE.GestellungXPTyp
Bezugsnummer = AVISO.AvisoID & "_EXP_" & MRN
If Bezugsnummer.Length > 35 Then
Bezugsnummer = Bezugsnummer.Substring(0, 35)
End If
'Transaktion:
XML.Transaktion = New PresentationEXITDE.TransaktionExportTyp
XML.Transaktion.IOPartner = SDL.DAKOSY_Interface_SEND.getIOPartner(FIRMA_DY) 'If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "VERA", "VERG")
XML.Transaktion.IODatumZeit = Now
XML.Transaktion.IOReferenz = SND.FilialenNr & "-" & SND.AbfertigungsNr & "_" & Now.ToString("ddMMyyHHmmSS")
If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then XML.Transaktion.IODivision3 = SDL.DAKOSY_Interface_SEND.getDivision(FIRMA_DY) '"SUW"
XML.Transaktion.Version = Interface_VERSION
' XML.Transaktion.IODivision3 = "DUR"
Dim XML_EG = New PresentationEXITDE.EinzelGestellungTyp
'ObjektIdentifizierung:
XML_EG.ObjektIdentifizierung.ObjektName = Bezugsnummer
'If Bezugsnummer IsNot Nothing Then XML_EG.ObjektIdentifizierung.ObjektAliasname = Bezugsnummer
Dim ObjektAktion As New List(Of String) : ObjektAktion.Add(ObjectAktion)
XML_EG.ObjektIdentifizierung.ObjektAktion = ObjektAktion
If If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "") <> "" Then XML_EG.ObjektIdentifizierung.Bearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB
If BezugsnummerVorblendung IsNot Nothing AndAlso BezugsnummerVorblendung <> "" Then XML_EG.ObjektIdentifizierung.BezugsnummerVorblendung = BezugsnummerVorblendung
'TransitOperation:
XML_EG.HeaderData = New PresentationEXITDE.KopfDatenGestellungTyp
XML_EG.HeaderData.MRN = MRN
'If cDY.ncts_CountryOfDispatch IsNot Nothing Then XML.EinzelEingangsanzeige.TransitOperation.CustomsOfficeOfDestinationActual = cDY.ncts_CountryOfDispatch
'If SND.tblSnd_ATB_T1 IsNot Nothing Then XML.EinzelEingangsanzeige.TransitOperation.MRN = SND.tblSnd_ATB_T1
'XML.EinzelEingangsanzeige.TransitOperation.ArrivalNotificationDateAndTime = Now
'XML.EinzelEingangsanzeige.TransitOperation.IncidentFlag = "N"
XML.DeclarationData.Add(XML_EG)
Dim saveDir = Application.StartupPath & "\Dakosy_SEND\"
If Not System.IO.Directory.Exists(saveDir) Then
System.IO.Directory.CreateDirectory(saveDir)
End If
saveFile = saveDir & "DY_EXP_" & Now.ToString("yyMMdd_HHmmss") & ".xml"
XML.SaveToFile(saveFile)
SDL.DAKOSY_Interface_SEND.replaceNullDateXML(saveFile)
Return True
End Function
Private Sub MyCheckbox1_CheckedChanged(sender As Object, e As EventArgs) Handles MyCheckbox1.CheckedChanged
Button1.Enabled = Not MyCheckbox1.Checked
End Sub
Public Function IsValidMRN(mrn As String) As Boolean
' Überprüfen, ob die Länge genau 18 Zeichen beträgt
If String.IsNullOrEmpty(mrn) OrElse mrn.Length <> 18 Then
Return False
End If
' Überprüfen, ob die ersten zwei Zeichen Buchstaben sind (Ländercode)
If Not Char.IsLetter(mrn(0)) OrElse Not Char.IsLetter(mrn(1)) Then
Return False
End If
' Überprüfen, ob die nächsten zwei Zeichen Ziffern sind (Jahreszahl)
If Not Char.IsDigit(mrn(2)) OrElse Not Char.IsDigit(mrn(3)) Then
Return False
End If
' Überprüfen, ob die nächsten 12 Zeichen alphanumerisch sind
For i As Integer = 4 To 15
If Not Char.IsLetterOrDigit(mrn(i)) Then
Return False
End If
Next
' Überprüfen, ob die letzten zwei Zeichen Prüfziffern sind (optional, falls komplexere Prüfung erforderlich)
For i As Integer = 16 To 17
If Not Char.IsDigit(mrn(i)) Then
Return False
End If
Next
' Alle Prüfungen bestanden
Return True
End Function
End Class

6
SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb
View File

@@ -245,6 +245,12 @@
Me.pnl.Controls.Add(usrcntl)
Me.Text = "AnkunftsAnzeige - Verwahrung"
Case "EXG" 'Ausfuhr Gestellung
Dim usrcntl As New usrCntlATLAS_EXGestellung(AVISO, SENDUNG, FIRMA_DY)
usrcntl.Dock = DockStyle.Fill
Me.pnl.Controls.Add(usrcntl)
Me.Text = "Ausfuhr - Gestellung"
End Select
End Select
End Sub