diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 5b44b6ab..3457f493 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 9826cf2d..e6e5ff43 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -1197,6 +1197,12 @@ Form + + usrCntlATLAS_AnkunftsAnzeige.vb + + + UserControl + usrCntlModaltrans_EXIM_Allg.vb @@ -3500,6 +3506,9 @@ frmRoutenAuswahlDetails.vb + + usrCntlATLAS_AnkunftsAnzeige.vb + usrCntlModaltrans_EXIM_Allg.vb diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.Designer.vb new file mode 100644 index 00000000..0a536c78 --- /dev/null +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.Designer.vb @@ -0,0 +1,352 @@ + +Partial Class usrCntlATLAS_AnkunftsAnzeige + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + 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. + + Private Sub InitializeComponent() + Me.SplitContainer = New System.Windows.Forms.SplitContainer() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() + 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.txtMRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.MyCheckbox1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox() + 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.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() + 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.txtMRN) + 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 + ' + 'txtMRN + ' + Me.txtMRN._DateTimeOnly = False + Me.txtMRN._numbersOnly = False + Me.txtMRN._numbersOnlyKommastellen = "" + Me.txtMRN._numbersOnlyTrennzeichen = True + Me.txtMRN._Prozent = False + Me.txtMRN._ShortDateNew = False + Me.txtMRN._ShortDateOnly = False + Me.txtMRN._TimeOnly = False + Me.txtMRN._TimeOnly_Seconds = False + Me.txtMRN._value = "" + Me.txtMRN._Waehrung = False + Me.txtMRN._WaehrungZeichen = True + Me.txtMRN.ForeColor = System.Drawing.Color.Black + Me.txtMRN.Location = New System.Drawing.Point(144, 60) + Me.txtMRN.MaxLineLength = -1 + Me.txtMRN.MaxLines_Warning = "" + Me.txtMRN.MaxLines_Warning_Label = Nothing + Me.txtMRN.Name = "txtMRN" + Me.txtMRN.Size = New System.Drawing.Size(280, 20) + Me.txtMRN.TabIndex = 15 + ' + '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 + ' + '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" + ' + 'usrCntlATLAS_AnkunftsAnzeige + ' + 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_AnkunftsAnzeige" + 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 txtMRN As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label2 As Label +End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.resx b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.resx new file mode 100644 index 00000000..c31215db --- /dev/null +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 125, 17 + + + 17, 17 + + \ No newline at end of file diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb new file mode 100644 index 00000000..38a31102 --- /dev/null +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb @@ -0,0 +1,188 @@ +Imports DAKOSY_Worker + +Public Class usrCntlATLAS_AnkunftsAnzeige + + Property ALLG As usrCntlATLAS_AnkunftsAnzeige + '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 + txtMRN.Text = If(SENDUNG.tblSnd_ATB_T1, "") + + cboStammreferenz.fillWithSQL("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", False, "FMZOLL", True) + cboStammreferenz.changeItem("") + + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + + If cboStammreferenz._value = "" Then MsgBox("Stammreferenz auswählen!") : Exit Sub + If txtMRN._value = "" Then MsgBox("MRN auswählen!") : Exit Sub + + + Me.Refresh() + Me.Cursor = Cursors.WaitCursor + If sentToDakosy OrElse vbYes = MsgBox("Soll die Ankunftsanzeige abgeschickt werden?", vbYesNoCancel) Then + ' 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 generateEingangsanzeigeNCTSDE_003(AVISO, SENDUNG, lblBezugsnummer.Text, saveFile, cboDakosyAction._value, FIRMA_DY) 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. + MsgBox("Gesendet!") + Else + 'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09) + MsgBox("Sendefehler!") + 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) + + Me.FindForm.Close() + End If + Me.Cursor = Cursors.Default + End Sub + + + + + Shared Function generateEingangsanzeigeNCTSDE_003(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) As Boolean + Dim Interface_VERSION = "003" + Dim ObjectAktion = DY_ACTION + Dim BezugsnummerVorblendung = "AA_NCTS_DE_ZE_WO_MITTICH" + + Dim XML As New DAKOSY_Worker.EingangsanzeigeNCTSDE_003.EingangsanzeigeEATyp + + + 'Transaktion: + XML.Transaktion = New DAKOSY_Worker.EingangsanzeigeNCTSDE_003.TransaktionNCTSTyp + 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" + XML.EinzelEingangsanzeige = New EingangsanzeigeNCTSDE_003.EinzelEingangsanzeigeTyp + + 'ObjektIdentifizierung: + XML.EinzelEingangsanzeige.ObjektIdentifizierung.NameAbsendendesSystem = "VERAG_ZOLL" + XML.EinzelEingangsanzeige.ObjektIdentifizierung = New EingangsanzeigeNCTSDE_003.ObjektIdentifizierungEATyp + XML.EinzelEingangsanzeige.ObjektIdentifizierung.ObjektName = Bezugsnummer + + If Bezugsnummer IsNot Nothing Then XML.EinzelEingangsanzeige.ObjektIdentifizierung.ObjektAliasname = Bezugsnummer + Dim ObjektAktion As New List(Of String) : ObjektAktion.Add(ObjectAktion) + XML.EinzelEingangsanzeige.ObjektIdentifizierung.ObjektAktion = ObjektAktion + If If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "") <> "" Then XML.EinzelEingangsanzeige.ObjektIdentifizierung.Bearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB + + If BezugsnummerVorblendung IsNot Nothing Then XML.EinzelEingangsanzeige.ObjektIdentifizierung.BezugsnummerVorblendung = BezugsnummerVorblendung + + 'TransitOperation: + XML.EinzelEingangsanzeige.TransitOperation = New EingangsanzeigeNCTSDE_003.TransitOperationEAType + '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" + + + + Dim saveDir = Application.StartupPath & "\Dakosy_SEND\" + If Not System.IO.Directory.Exists(saveDir) Then + System.IO.Directory.CreateDirectory(saveDir) + End If + + saveFile = saveDir & "DY_AA_" & 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 +End Class + diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb index 30c4c9b3..3b323887 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb @@ -1,6 +1,6 @@ Imports DAKOSY_Worker -Class DAKOSY_Interface_SEND +Public Class DAKOSY_Interface_SEND Shared Function loadInClass_VersandanmeldungNCTSDE_003(ByRef cDY As cDakosyNCTSOut, USRCNTL As usrCntlATLAS_NCTS, cDYAnm As cDakosy_Zollanmeldungen, FIRMA_DY As String) As cDakosyNCTSOut Try @@ -2257,8 +2257,8 @@ Class DAKOSY_Interface_SEND 'ZusInformation 1 If pp.nctsHCCI_AdditionalInformation_1_Text IsNot Nothing Then Dim TM As New VersandanmeldungNCTSDE_004.AdditionalInformationPositionVAType - If pp.nctsHCCI_AdditionalInformation_1_Code IsNot Nothing Then TM.code = pp.nctsHCCI_AdditionalInformation_1_Code - If pp.nctsHCCI_AdditionalInformation_1_Text IsNot Nothing Then TM.text = pp.nctsHCCI_AdditionalInformation_1_Text + If pp.nctsHCCI_AdditionalInformation_1_Code IsNot Nothing Then TM.Code = pp.nctsHCCI_AdditionalInformation_1_Code + If pp.nctsHCCI_AdditionalInformation_1_Text IsNot Nothing Then TM.Text = pp.nctsHCCI_AdditionalInformation_1_Text HCCI.AdditionalInformation.Add(TM) End If 'ZusInformation 2 @@ -2313,8 +2313,8 @@ Class DAKOSY_Interface_SEND 'ZusInformation 9 If pp.nctsHCCI_AdditionalInformation_9_Text IsNot Nothing Then Dim TM As New VersandanmeldungNCTSDE_004.AdditionalInformationPositionVAType - If pp.nctsHCCI_AdditionalInformation_9_Code IsNot Nothing Then TM.code = pp.nctsHCCI_AdditionalInformation_9_Code - If pp.nctsHCCI_AdditionalInformation_9_Text IsNot Nothing Then TM.text = pp.nctsHCCI_AdditionalInformation_9_Text + If pp.nctsHCCI_AdditionalInformation_9_Code IsNot Nothing Then TM.Code = pp.nctsHCCI_AdditionalInformation_9_Code + If pp.nctsHCCI_AdditionalInformation_9_Text IsNot Nothing Then TM.Text = pp.nctsHCCI_AdditionalInformation_9_Text HCCI.AdditionalInformation.Add(TM) End If @@ -2726,7 +2726,7 @@ Class DAKOSY_Interface_SEND Return True End Function - Shared Sub replaceNullDateXML(XMLFile As String) + Public Shared Sub replaceNullDateXML(XMLFile As String) Try If Not System.IO.File.Exists(XMLFile) Then Exit Sub Dim lines() As String = System.IO.File.ReadAllLines(XMLFile) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb index 2695bd36..57b7fa46 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb @@ -239,6 +239,12 @@ End If + Case "AA" 'AnkunftsAnzeige + Dim usrcntl As New usrCntlATLAS_AnkunftsAnzeige(AVISO, SENDUNG, FIRMA_DY) + usrcntl.Dock = DockStyle.Fill + Me.pnl.Controls.Add(usrcntl) + Me.Text = "AnkunftsAnzeige - Verwahrung" + End Select End Select End Sub diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 3ccff7ae..c02a4ae0 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -156,6 +156,9 @@ + + F:\PROGRAMMIERUNG\dll\ThoughtWorks.QRCode.dll + diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index a00c20f3..e006236e 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -6,6 +6,7 @@ Imports System.Text Imports System.Windows.Forms Imports ClosedXML.Excel Imports Microsoft.Office.Interop +Imports ThoughtWorks.QRCode.Codec Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class cProgramFunctions @@ -615,7 +616,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Public Function MakeScreenshot() Dim form As New Form - form = form.ActiveForm + form = Form.ActiveForm Dim bounds As Rectangle Dim screenshot As System.Drawing.Bitmap Dim graph As Graphics @@ -643,6 +644,45 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Return tmpImg End Function + + Shared Function getQRCode(QRtext As String, Optional QZSize As Integer = 4, Optional QRVersion As Integer = 7, Optional CorrectionLevel As QRCodeEncoder.ERROR_CORRECTION = QRCodeEncoder.ERROR_CORRECTION.M, Optional encoding As QRCodeEncoder.ENCODE_MODE = QRCodeEncoder.ENCODE_MODE.BYTE) As Image + Dim qrCodeEncoder As QRCodeEncoder = New QRCodeEncoder() + + qrCodeEncoder.QRCodeEncodeMode = encoding + + Try + Dim scale As Integer = Convert.ToInt16(QZSize) + qrCodeEncoder.QRCodeScale = scale + Catch ex As Exception + MessageBox.Show("Invalid size!") + Return Nothing + End Try + + Try + Dim version As Integer = Convert.ToInt16(QRVersion) + qrCodeEncoder.QRCodeVersion = version + Catch ex As Exception + MessageBox.Show("Invalid version !") + End Try + + Dim errorCorrect As String = CorrectionLevel + + qrCodeEncoder.QRCodeErrorCorrect = CorrectionLevel + + Dim image As Image + Dim data As String = QRtext + image = qrCodeEncoder.Encode(data) + Return image + End Function + + Shared Function getBARCODEAviso(AvisoID As String) As Image + Dim barcode As Image = Code128Rendering.MakeBarcodeImage("/" & AvisoID & "/", 1, True, 25) + ' barcode.RotateFlip(RotateFlipType.Rotate90FlipNone) + + Return barcode + End Function + + End Class