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-27 14:42:24 +01:00
parent 3c7b71df9c 27caa2e2ce
commit c05cb36cae
12 changed files with 452 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/Fakturierung/cFakturierung.vb
View File

@@ -2148,7 +2148,7 @@ Public Class cFakturierung
End If
'If RECHNUNG.TextZZ.ToString.Contains("Abbuchungsauftrag") Then
' desc.SetPaymentMeansSepaDirectDebit("", "")
' desc.SetPaymentMeansSepaDirectDebit("", ,"")
'Else
'desc.SetPaymentMeans(PaymentMeansTypeCodes.PaymentToBankAccount, rpt.Label2.Text)
'End If

185
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.Designer.vb generated
View File

@@ -29,7 +29,12 @@ Partial Class usrCntlATLAS_EXGestellung
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.Label4 = New System.Windows.Forms.Label()
Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.sbAbgangZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.Label3 = New System.Windows.Forms.Label()
Me.rtbMRN = New System.Windows.Forms.RichTextBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label6 = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
@@ -41,8 +46,10 @@ Partial Class usrCntlATLAS_EXGestellung
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()
Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
Me.cbxNCTS = New System.Windows.Forms.CheckBox()
Me.cbxAutoTranslate = New System.Windows.Forms.CheckBox()
Me.cbxForceTranslate = New System.Windows.Forms.CheckBox()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.Panel2.SuspendLayout()
@@ -52,6 +59,7 @@ Partial Class usrCntlATLAS_EXGestellung
Me.cntxtBezugsnr.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.MenuStrip.SuspendLayout()
Me.MyPanel1.SuspendLayout()
Me.SuspendLayout()
'
'SplitContainer
@@ -72,12 +80,17 @@ Partial Class usrCntlATLAS_EXGestellung
'SplitContainer.Panel2
'
Me.SplitContainer.Panel2.BackColor = System.Drawing.Color.White
Me.SplitContainer.Panel2.Controls.Add(Me.cbxNCTS)
Me.SplitContainer.Panel2.Controls.Add(Me.MyPanel1)
Me.SplitContainer.Panel2.Controls.Add(Me.Label4)
Me.SplitContainer.Panel2.Controls.Add(Me.TextBox1)
Me.SplitContainer.Panel2.Controls.Add(Me.sbAbgangZollstelle)
Me.SplitContainer.Panel2.Controls.Add(Me.Label3)
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.Size = New System.Drawing.Size(1014, 633)
Me.SplitContainer.SplitterDistance = 72
Me.SplitContainer.SplitterWidth = 1
Me.SplitContainer.TabIndex = 0
@@ -90,7 +103,7 @@ Partial Class usrCntlATLAS_EXGestellung
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.Size = New System.Drawing.Size(653, 72)
Me.MyFlowLayoutPanel1.TabIndex = 0
'
'btnAllgemein
@@ -117,7 +130,7 @@ Partial Class usrCntlATLAS_EXGestellung
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.Location = New System.Drawing.Point(653, 0)
Me.pnl.Name = "pnl"
Me.pnl.Size = New System.Drawing.Size(361, 72)
Me.pnl.TabIndex = 1
@@ -152,18 +165,76 @@ Partial Class usrCntlATLAS_EXGestellung
Me.Button1.Text = "An DAKOSY senden -->"
Me.Button1.UseVisualStyleBackColor = False
'
'MyCheckbox1
'Label4
'
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
Me.Label4.AutoSize = True
Me.Label4.Location = New System.Drawing.Point(334, 59)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(59, 13)
Me.Label4.TabIndex = 19
Me.Label4.Text = "BezugsNr.:"
Me.Label4.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'TextBox1
'
Me.TextBox1.Location = New System.Drawing.Point(399, 56)
Me.TextBox1.MaxLength = 1
Me.TextBox1.Name = "TextBox1"
Me.TextBox1.Size = New System.Drawing.Size(25, 20)
Me.TextBox1.TabIndex = 18
'
'sbAbgangZollstelle
'
Me.sbAbgangZollstelle._allowFreitext = False
Me.sbAbgangZollstelle._AllowSetValue = False
Me.sbAbgangZollstelle._allowSpaceAsSplitter = False
Me.sbAbgangZollstelle._autoSizeGross = False
Me.sbAbgangZollstelle._hideIfListEmpty = True
Me.sbAbgangZollstelle._value = ""
Me.sbAbgangZollstelle.conn_art = "FMZOLL"
Me.sbAbgangZollstelle.dgvpos = "LEFT"
Me.sbAbgangZollstelle.DISPLAY_PARAM = Nothing
Me.sbAbgangZollstelle.INVISIBLE_COLUMNS = Nothing
Me.sbAbgangZollstelle.key_visible = False
Me.sbAbgangZollstelle.KEYPARAM = Nothing
Me.sbAbgangZollstelle.Location = New System.Drawing.Point(145, 56)
Me.sbAbgangZollstelle.Name = "sbAbgangZollstelle"
Me.sbAbgangZollstelle.searchActive = True
Me.sbAbgangZollstelle.Size = New System.Drawing.Size(183, 20)
Me.sbAbgangZollstelle.SQL_ORDER_BY = Nothing
Me.sbAbgangZollstelle.SQL_SELECT = Nothing
Me.sbAbgangZollstelle.SQL_WHERE = Nothing
Me.sbAbgangZollstelle.SQL_WhereParamList = Nothing
Me.sbAbgangZollstelle.TabIndex = 17
Me.sbAbgangZollstelle.usrcntl = Nothing
'
'Label3
'
Me.Label3.AutoSize = True
Me.Label3.Location = New System.Drawing.Point(17, 59)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(44, 13)
Me.Label3.TabIndex = 16
Me.Label3.Text = "Zollamt:"
Me.Label3.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'rtbMRN
'
Me.rtbMRN.Location = New System.Drawing.Point(145, 88)
Me.rtbMRN.Name = "rtbMRN"
Me.rtbMRN.Size = New System.Drawing.Size(279, 449)
Me.rtbMRN.TabIndex = 15
Me.rtbMRN.Text = ""
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(17, 88)
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
'
'cboStammreferenz
'
@@ -194,7 +265,7 @@ Partial Class usrCntlATLAS_EXGestellung
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.Location = New System.Drawing.Point(579, 7)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(82, 13)
Me.Label1.TabIndex = 5
@@ -206,7 +277,7 @@ Partial Class usrCntlATLAS_EXGestellung
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.Location = New System.Drawing.Point(664, 1)
Me.lblBezugsnummer.Name = "lblBezugsnummer"
Me.lblBezugsnummer.Size = New System.Drawing.Size(347, 23)
Me.lblBezugsnummer.TabIndex = 6
@@ -236,7 +307,7 @@ Partial Class usrCntlATLAS_EXGestellung
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.Size = New System.Drawing.Size(1014, 25)
Me.Panel1.TabIndex = 1
'
'txtDyMandant
@@ -264,7 +335,7 @@ Partial Class usrCntlATLAS_EXGestellung
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.Size = New System.Drawing.Size(1014, 24)
Me.MenuStrip.TabIndex = 0
'
'OptionenToolStripMenuItem
@@ -273,33 +344,56 @@ Partial Class usrCntlATLAS_EXGestellung
Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(69, 20)
Me.OptionenToolStripMenuItem.Text = "Optionen"
'
'Label2
'MyPanel1
'
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
Me.MyPanel1.Controls.Add(Me.cbxAutoTranslate)
Me.MyPanel1.Controls.Add(Me.cbxForceTranslate)
Me.MyPanel1.Enabled = False
Me.MyPanel1.Location = New System.Drawing.Point(454, 56)
Me.MyPanel1.Name = "MyPanel1"
Me.MyPanel1.Size = New System.Drawing.Size(560, 504)
Me.MyPanel1.TabIndex = 20
'
'rtbMRN
'cbxNCTS
'
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 = ""
Me.cbxNCTS.AutoSize = True
Me.cbxNCTS.Checked = True
Me.cbxNCTS.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxNCTS.Location = New System.Drawing.Point(474, 31)
Me.cbxNCTS.Name = "cbxNCTS"
Me.cbxNCTS.Size = New System.Drawing.Size(98, 17)
Me.cbxNCTS.TabIndex = 21
Me.cbxNCTS.Text = "NCTS Erstellen"
Me.cbxNCTS.UseVisualStyleBackColor = True
'
'cbxAutoTranslate
'
Me.cbxAutoTranslate.AutoSize = True
Me.cbxAutoTranslate.Checked = True
Me.cbxAutoTranslate.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxAutoTranslate.Location = New System.Drawing.Point(20, 15)
Me.cbxAutoTranslate.Name = "cbxAutoTranslate"
Me.cbxAutoTranslate.Size = New System.Drawing.Size(162, 17)
Me.cbxAutoTranslate.TabIndex = 22
Me.cbxAutoTranslate.Text = "KN8 Texte bei nicht D-A-CH"
Me.cbxAutoTranslate.UseVisualStyleBackColor = True
'
'cbxForceTranslate
'
Me.cbxForceTranslate.AutoSize = True
Me.cbxForceTranslate.Location = New System.Drawing.Point(199, 15)
Me.cbxForceTranslate.Name = "cbxForceTranslate"
Me.cbxForceTranslate.Size = New System.Drawing.Size(137, 17)
Me.cbxForceTranslate.TabIndex = 23
Me.cbxForceTranslate.Text = "Übersetzung erzwingen"
Me.cbxForceTranslate.UseVisualStyleBackColor = True
'
'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.Size = New System.Drawing.Size(1014, 658)
Me.SplitContainer.Panel1.ResumeLayout(False)
Me.SplitContainer.Panel2.ResumeLayout(False)
Me.SplitContainer.Panel2.PerformLayout()
@@ -312,6 +406,8 @@ Partial Class usrCntlATLAS_EXGestellung
Me.Panel1.PerformLayout()
Me.MenuStrip.ResumeLayout(False)
Me.MenuStrip.PerformLayout()
Me.MyPanel1.ResumeLayout(False)
Me.MyPanel1.PerformLayout()
Me.ResumeLayout(False)
End Sub
@@ -332,7 +428,14 @@ Partial Class usrCntlATLAS_EXGestellung
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
Friend WithEvents Label3 As Label
Friend WithEvents sbAbgangZollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox
Friend WithEvents Label4 As Label
Friend WithEvents TextBox1 As TextBox
Friend WithEvents cbxNCTS As CheckBox
Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel
Friend WithEvents cbxForceTranslate As CheckBox
Friend WithEvents cbxAutoTranslate As CheckBox
End Class

293
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb
View File

@@ -1,4 +1,5 @@
Imports DAKOSY_Worker
Imports com.sun.tools.doclets.internal.toolkit.util
Imports DAKOSY_Worker
Public Class usrCntlATLAS_EXGestellung
@@ -39,7 +40,10 @@ Public Class usrCntlATLAS_EXGestellung
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)
cboDakosyAction.changeItem(DY_ObjektAktion.OBJ_SEND)
sbAbgangZollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"})
Select Case FIRMA_DY
Case "VERAG" : txtDyMandant.Text = "VERG"
@@ -52,82 +56,173 @@ Public Class usrCntlATLAS_EXGestellung
'Case "NKD" : txtDyNiederlassung.Text = "IMEX"
'End Select
Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW"
Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED"
Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "SUB"'"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
' Dim BezugsNr = ("ID" & AVISO.AvisoID & "_" & SENDUNG.FilialenNr & "-" & SENDUNG.AbfertigungsNr & "_" & If(AVISO.Auftraggeber.Length > 8, AVISO.Auftraggeber.ToString.Substring(0, 5), AVISO.Auftraggeber)).Trim
Dim BezugsNr = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr & "_EXG"
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)
cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EXG' 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
' If cboStammreferenz._value = "" Then MsgBox("Stammreferenz auswählen!") : Me.Cursor = Cursors.Default : Exit Sub
If sbAbgangZollstelle._value = "" Then MsgBox("Zollstelle auswählen!") : Me.Cursor = Cursors.Default : Exit Sub
If Not sbAbgangZollstelle._value.StartsWith("DE") Then MsgBox("Gültige Zollstelle (in DE) auswählen!") : Me.Cursor = Cursors.Default : Exit Sub
If rtbMRN.Text.Trim = "" Then MsgBox("MRN auswählen!") : Me.Cursor = Cursors.Default : Exit Sub
'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
Dim exg_list = New List(Of Integer)
Dim dblcheck = ""
'MRN Prüfung:
For Each l In rtbMRN.Lines
If l.Trim <> "" Then
If l.Length >= 18 And dblcheck.Contains(l) Then
MsgBox("Doppelte MRN !: " & l)
Me.Cursor = Cursors.Default
Exit Sub
End If
Next
If Not IsValidMRN(l) Then
MsgBox("Ungültige MRN (Format): " & l)
Me.Cursor = Cursors.Default
Exit Sub
End If
dblcheck &= l
End If
Next
If sentToDakosy OrElse vbYes = MsgBox("Soll(en) die Ausfuhr-Gestellung(en) abgeschickt werden?", vbYesNoCancel) Then
Dim cnt = 1
'Senden:
For Each l In rtbMRN.Lines
If l.Trim <> "" Then
If Not sendEXP_MRN(l) Then
If Not sendEXP_MRN(l, sbAbgangZollstelle._value, cnt, exg_list) Then
MsgBox("Sendefehler bei " & l)
err = True
End If
cnt += 1
End If
Next
Me.FindForm.Close()
End If
If Not err Then Me.Cursor = Cursors.Default
If Not err Then
If cbxNCTS.Checked Then
Dim BezugsNr = ""
Dim NCTS_OUT As New DAKOSY_Worker.cDakosyNCTSOut004
Dim f As New frmDakosyStammreferenz("DE", "NCTS", False,,, FIRMA_DY)
Dim Stammreferenz = Nothing
If f.ShowDialog(Me) Then
Stammreferenz = f.STAMMREF
sentToDakosy = f.sentToDakosy
End If
Try
BezugsNr = usrCntlATLAS_NCTS004.getBezugsnr(FIRMA_DY, SENDUNG, BezugsNr, "")
lblBezugsnummer.Text = BezugsNr
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
ncts_OUT = cDakosyNCTSOut004.LOADByBezugsNr(BezugsNr, True)
If ncts_OUT Is Nothing Then
'Falls zur BezugsNr schon ein Eintrag in der DB vorhanden ist
ncts_OUT = cDakosyNCTSOut004.LOADByAnmIDFull(f.STAMMREF_DYID, True) ' DyID --> Falls bei der Stammreferenz eine Vorlage hinterlegt ist!
If ncts_OUT IsNot Nothing Then
'Stmmreferenz - Werte zurücksetzen, damit nicht falsch übergeben
ncts_OUT.ncts_dyaAnmID = -1
ncts_OUT.ncts_Id = -1
Else
ncts_OUT = New cDakosyNCTSOut004
End If
Dim cDy_ART = "T2"
Select Case (SENDUNG.tblSnd_Abfertigungsart_ID)
Case 5 : cDy_ART = "T1"
Case Else : cDy_ART = "T2"
End Select
usrCntlATLAS_NCTS004.loaddataFromAVISO(AVISO, SENDUNG, cDy_ART, BezugsNr, NCTS_OUT)
'cboStammreferenz.changeItem(Stammreferenz)
If NCTS_OUT.SAVE_ALL() Then
MsgBox("Eine neue Versandanmeldung mit der BezugsNummer '" & BezugsNr & "' wurde erstellt. Befüllung wird bei GEstellvorgang automaitsch vorgenommen.")
For Each exgId In exg_list
cDakosyEXG.UPDATE_FillNCTS_ID(exgId, NCTS_OUT.ncts_dyaAnmID)
Next
End If
End If
'ncts_OUT
End If
End If
Me.Cursor = Cursors.Default
End Sub
Function sendEXP_MRN(MRN) As Boolean
Function sendEXP_MRN(MRN As String, Zollstelle As String, zeile As String, ByRef exg_list As List(Of Integer)) 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)
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 EXG As New DAKOSY_Worker.cDakosyEXG
EXG.exg_MRN = MRN
EXG.exg_CustomsOfficeOfExitForTransitDeclared = Zollstelle
' dim FilialenNr
Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
FIRMA_DY = frmZollanmeldung.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm)
Dim saveFile = ""
Dim zusatz = ""
If TextBox1.Text <> "" Then zusatz = "/" & TextBox1.Text
If generatePresentationEXITDE_003(MRN, AVISO, SENDUNG, lblBezugsnummer.Text, saveFile, cboDakosyAction._value, FIRMA_DY, cboStammreferenz._value) Then
EXG.exg_ObjectName = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr & "_EXG" & zeile & "" & zusatz '---> >>> MRN KÜRZEN!!!!
'EXG.exg_ObjectName = AVISO.AvisoID & "_EXP_" & EXG.exg_MRN.ToString().Substring(0, 4) & EXG.exg_MRN.ToString.Substring(14) & zusatz '---> >>> MRN KÜRZEN!!!!
'EXG.exg_ObjectName = AVISO.AvisoID & "_EXP_" & EXG.exg_MRN
Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
FIRMA_DY = DAKOSY_Worker.cDakosyFunftions.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm)
Dim saveFile = ""
If EXG.SAVE_ALL Then
exg_list.Add(EXG.exg_Id)
If generatePresentationEXITDE_003(EXG, AVISO, SENDUNG, EXG.exg_ObjectName, 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)
@@ -139,7 +234,10 @@ Public Class usrCntlATLAS_EXGestellung
End If
End If
End If
End If
End If
' DY_ANM.UPDATE_DATA()
@@ -154,41 +252,68 @@ Public Class usrCntlATLAS_EXGestellung
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
Shared Function generatePresentationEXITDE_003(EXG As DAKOSY_Worker.cDakosyEXG, 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)
If Bezugsnummer.Length > 22 Then
Bezugsnummer = Bezugsnummer.Substring(0, 22)
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"
If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM And XML.Transaktion.IOPartner <> "UNAT" Then
XML.Transaktion.IODivision3 = SDL.DAKOSY_Interface_SEND.getDivision(FIRMA_DY) '"SUW"
End If
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
Dim ObjektAktionLst As New List(Of String)
If ObjectAktion = "SEND" Then
ObjektAktionLst.Add("CREATE")
End If
ObjektAktionLst.Add(ObjectAktion)
XML_EG.ObjektIdentifizierung.ObjektAktion = ObjektAktionLst
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
XML_EG.HeaderData.MRN = EXG.exg_MRN
XML_EG.HeaderData.ArrivalNotificationDateAndTime = Now
XML_EG.HeaderData.ExitCarrier.ContactPerson.Name = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
If If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_telefonnr, "") <> "" Then
XML_EG.HeaderData.ExitCarrier.ContactPerson.PhoneNumber = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_telefonnr
Else
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNISPED"
XML_EG.HeaderData.ExitCarrier.ContactPerson.PhoneNumber = "0043771126770"
Case "AMBAR"
XML_EG.HeaderData.ExitCarrier.ContactPerson.PhoneNumber = "004986519962492"
Case "IMEX"
XML_EG.HeaderData.ExitCarrier.ContactPerson.PhoneNumber = "00437711 31630"
Case "ATILLA"
XML_EG.HeaderData.ExitCarrier.ContactPerson.PhoneNumber = "0043771128450"
Case Else
XML_EG.HeaderData.ExitCarrier.ContactPerson.PhoneNumber = "004377112777200"
End Select
End If
XML_EG.HeaderData.CustomsOfficeOfExitActual = EXG.exg_CustomsOfficeOfExitForTransitDeclared
'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
@@ -198,16 +323,18 @@ Public Class usrCntlATLAS_EXGestellung
XML.DeclarationData.Add(XML_EG)
' Dim saveDir = System.Reflection.Assembly.GetExecutingAssembly().Location & "\Dakosy_SEND\"
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"
saveFile = saveDir & "DY_EXG_" & Now.ToString("yyMMdd_HHmmss_fff") & ".xml"
XML.SaveToFile(saveFile)
SDL.DAKOSY_Interface_SEND.replaceNullDateXML(saveFile)
'SDL.DAKOSY_Interface_SEND.replaceNullDateXML(saveFile)
Return True
End Function
@@ -215,44 +342,72 @@ Public Class usrCntlATLAS_EXGestellung
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
' Ü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
' Überprüfen, ob die ersten zwei Zeichen Ziffern sind (Jahreszahl)
If Not Char.IsDigit(mrn(0)) OrElse Not Char.IsDigit(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
' Überprüfen, ob die nächsten zwei Zeichen Buchstaben sind (Ländercode)
If Not Char.IsLetter(mrn(2)) OrElse Not Char.IsLetter(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 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
'' Überprüfen, ob die letzten zwei Zeichen Ziffern sind (Prüfziffern)
'For i As Integer = 16 To 17
' If Not Char.IsDigit(mrn(i)) Then
' Return False
' End If
'Next
Return True
End Function
Private Sub cbxNCTS_CheckedChanged(sender As Object, e As EventArgs) Handles cbxNCTS.CheckedChanged
MyPanel1.Enabled = cbxNCTS.Checked
End Sub
End Class

49
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.Designer.vb generated
View File

@@ -28,6 +28,7 @@ Partial Class usrCntlATLAS_NCTS004
Me.btnAllgemein = New System.Windows.Forms.Button()
Me.btnAdressen = New System.Windows.Forms.Button()
Me.btnSicherheit = New System.Windows.Forms.Button()
Me.btnVerschlüsse = New System.Windows.Forms.Button()
Me.btnPositionen = New System.Windows.Forms.Button()
Me.Button5 = New System.Windows.Forms.Button()
Me.pnl = New System.Windows.Forms.Panel()
@@ -52,7 +53,7 @@ Partial Class usrCntlATLAS_NCTS004
Me.OptionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.SpeichernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.LadenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.btnVerschlüsse = New System.Windows.Forms.Button()
Me.AusGestllungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.SuspendLayout()
@@ -154,6 +155,24 @@ Partial Class usrCntlATLAS_NCTS004
Me.btnSicherheit.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.btnSicherheit.UseVisualStyleBackColor = False
'
'btnVerschlüsse
'
Me.btnVerschlüsse.BackColor = System.Drawing.Color.White
Me.btnVerschlüsse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.btnVerschlüsse.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnVerschlüsse.Image = Global.SDL.My.Resources.Resources.seal3
Me.btnVerschlüsse.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.btnVerschlüsse.Location = New System.Drawing.Point(245, 2)
Me.btnVerschlüsse.Margin = New System.Windows.Forms.Padding(2)
Me.btnVerschlüsse.Name = "btnVerschlüsse"
Me.btnVerschlüsse.Padding = New System.Windows.Forms.Padding(0, 6, 0, 3)
Me.btnVerschlüsse.Size = New System.Drawing.Size(81, 67)
Me.btnVerschlüsse.TabIndex = 3
Me.btnVerschlüsse.Text = "Verschlüsse"
Me.btnVerschlüsse.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.btnVerschlüsse.UseVisualStyleBackColor = False
Me.btnVerschlüsse.Visible = False
'
'btnPositionen
'
Me.btnPositionen.BackColor = System.Drawing.Color.White
@@ -409,7 +428,7 @@ Partial Class usrCntlATLAS_NCTS004
'
'OptionenToolStripMenuItem
'
Me.OptionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SpeichernToolStripMenuItem, Me.LadenToolStripMenuItem})
Me.OptionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SpeichernToolStripMenuItem, Me.LadenToolStripMenuItem, Me.AusGestllungToolStripMenuItem})
Me.OptionenToolStripMenuItem.Name = "OptionenToolStripMenuItem"
Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(69, 20)
Me.OptionenToolStripMenuItem.Text = "Optionen"
@@ -417,32 +436,21 @@ Partial Class usrCntlATLAS_NCTS004
'SpeichernToolStripMenuItem
'
Me.SpeichernToolStripMenuItem.Name = "SpeichernToolStripMenuItem"
Me.SpeichernToolStripMenuItem.Size = New System.Drawing.Size(126, 22)
Me.SpeichernToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.SpeichernToolStripMenuItem.Text = "Speichern"
'
'LadenToolStripMenuItem
'
Me.LadenToolStripMenuItem.Name = "LadenToolStripMenuItem"
Me.LadenToolStripMenuItem.Size = New System.Drawing.Size(126, 22)
Me.LadenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.LadenToolStripMenuItem.Text = "Laden ..."
'
'btnVerschlüsse
'AusGestllungToolStripMenuItem
'
Me.btnVerschlüsse.BackColor = System.Drawing.Color.White
Me.btnVerschlüsse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.btnVerschlüsse.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnVerschlüsse.Image = Global.SDL.My.Resources.Resources.seal3
Me.btnVerschlüsse.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.btnVerschlüsse.Location = New System.Drawing.Point(245, 2)
Me.btnVerschlüsse.Margin = New System.Windows.Forms.Padding(2)
Me.btnVerschlüsse.Name = "btnVerschlüsse"
Me.btnVerschlüsse.Padding = New System.Windows.Forms.Padding(0, 6, 0, 3)
Me.btnVerschlüsse.Size = New System.Drawing.Size(81, 67)
Me.btnVerschlüsse.TabIndex = 3
Me.btnVerschlüsse.Text = "Verschlüsse"
Me.btnVerschlüsse.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.btnVerschlüsse.UseVisualStyleBackColor = False
Me.btnVerschlüsse.Visible = False
Me.AusGestllungToolStripMenuItem.Name = "AusGestllungToolStripMenuItem"
Me.AusGestllungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
Me.AusGestllungToolStripMenuItem.Text = "Aus Gestllung.."
Me.AusGestllungToolStripMenuItem.Visible = False
'
'usrCntlATLAS_NCTS004
'
@@ -497,4 +505,5 @@ Partial Class usrCntlATLAS_NCTS004
Friend WithEvents Label7 As Label
Friend WithEvents Label8 As Label
Friend WithEvents btnVerschlüsse As Button
Friend WithEvents AusGestllungToolStripMenuItem As ToolStripMenuItem
End Class

36
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb
View File

@@ -1,6 +1,8 @@
Imports DAKOSY_Worker
Imports System.IO.Pipes
Imports DAKOSY_Worker
Imports Tamir
Imports Tamir.SharpSsh
Imports VERAG_PROG_ALLGEMEIN
Public Class usrCntlATLAS_NCTS004
@@ -117,7 +119,7 @@ Public Class usrCntlATLAS_NCTS004
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
End Sub
Function getBezugsnr(ByRef BezugsNr)
Shared Function getBezugsnr(FIRMA_DY, SENDUNG, ByRef BezugsNr, ByRef zusatz)
Dim BezugsNrTmp = ""
Select Case FIRMA_DY
Case "UNISPED"
@@ -143,7 +145,7 @@ Public Class usrCntlATLAS_NCTS004
If zusatz = "Z" Then zusatz = "AA"
End While
lblBezugsnummer.Text = BezugsNr
Return BezugsNr
End Function
@@ -198,8 +200,8 @@ Public Class usrCntlATLAS_NCTS004
End If
Try
BezugsNr = getBezugsnr(BezugsNr)
BezugsNr = getBezugsnr(FIRMA_DY, SENDUNG, BezugsNr, zusatz)
lblBezugsnummer.Text = BezugsNr
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
@@ -218,7 +220,7 @@ Public Class usrCntlATLAS_NCTS004
End If
loaddataFromAVISO(ncts_OUT)
loaddataFromAVISO(AVISO, SENDUNG, cDy_ART, BezugsNr, ncts_OUT)
cboStammreferenz.changeItem(Stammreferenz)
@@ -390,7 +392,7 @@ Public Class usrCntlATLAS_NCTS004
Sub loaddataFromAVISO(ByRef cdy As cDakosyNCTSOut004)
Shared Sub loaddataFromAVISO(AVISO As cAviso, SENDUNG As cSendungen, cDy_ART As String, BezugsNr As String, ByRef cdy As cDakosyNCTSOut004)
Try
'==> VORBLENDUNG:
@@ -578,7 +580,7 @@ Public Class usrCntlATLAS_NCTS004
If Not ncts_OUT.SAVE_ALL() Then Exit Sub
Dim saveFile = ""
If DAKOSY_Interface_SEND.generateVersandanmeldungNCTSDE_004(ncts_OUT, saveFile, cboDakosyAction._value) Then
If cDakosyNCTSOut004.generateVersandanmeldungNCTSDE_004(ncts_OUT, saveFile, cboDakosyAction._value, Application.StartupPath) Then
If saveFile <> "" Then
If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, BezugsNr, DY_ANM.dy_Id, Me.FIRMA_DY) Then
DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03)
@@ -629,8 +631,24 @@ Public Class usrCntlATLAS_NCTS004
End Sub
Private Sub NeueBezugsnummerVergebenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeueBezugsnummerVergebenToolStripMenuItem.Click
BezugsNr = getBezugsnr(BezugsNr)
BezugsNr = getBezugsnr(FIRMA_DY, SENDUNG, BezugsNr, zusatz)
lblBezugsnummer.Text = BezugsNr
End Sub
Private Sub AusGestllungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusGestllungToolStripMenuItem.Click
'ncts_OUT.DELETE_HouseConsignment()
'Dim cDakosyEXG As List(Of cDakosyEXG)
'For Each POS In cDakosyEXG
'Next
'ncts_OUT.ncts_HOUSE_CONSIGNMENT.Add()
End Sub
End Class

4
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb
View File

@@ -96,7 +96,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
' dim FilialenNr
Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
FIRMA_DY = frmZollanmeldung.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm)
FIRMA_DY = DAKOSY_Worker.cDakosyFunftions.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm)
Dim saveFile = ""
@@ -177,7 +177,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
XML.SaveToFile(saveFile)
SDL.DAKOSY_Interface_SEND.replaceNullDateXML(saveFile)
DAKOSY_Worker.cDakosyFunftions.replaceNullDateXML(saveFile)
Return True
End Function

1163
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
View File

File diff suppressed because it is too large Load Diff

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

@@ -1,7 +1,8 @@
Public Class frmZollanmeldung
Imports DAKOSY_Worker
Public Class frmZollanmeldung
Dim ART As String = ""
Dim AVISO As VERAG_PROG_ALLGEMEIN.caviso
Dim AVISO As VERAG_PROG_ALLGEMEIN.cAviso
Dim SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen
Dim FilialenNr As Integer
Dim AbfertigungsNr As Integer
@@ -71,41 +72,10 @@
End Sub
Public Shared Function getFirma_DY(FilialenNr As String, F_ME As Form) As String
Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
If (VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") And FilialenNr = 5501 Then
FIRMA_DY = "IMEX"
ElseIf FilialenNr = 5701 Then
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firma = "AMBAR" Then
FIRMA_DY = "AMBAR"
Else
FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.getFirma ' Akt von AMBAR aber kein AMBAR-MA -> Dakosy unter VERAG!
End If
ElseIf FilialenNr = 5601 Then
FIRMA_DY = "UNISPED"
ElseIf FilialenNr = 4801 Or FilialenNr = 4802 Then
FIRMA_DY = "ATILLA"
Else
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then
'If DY Is Nothing Then
Dim f As New frmDakosy_SelFirma
If f.ShowDialog() = DialogResult.OK Then
FIRMA_DY = f.FIMRA_DY
Else
If F_ME IsNot Nothing Then F_ME.Close()
End If
'End If
Else
FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(FilialenNr)
End If
End If
Return FIRMA_DY
End Function
Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load
FIRMA_DY = getFirma_DY(FilialenNr, Me)
FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr, Me)
Select Case ZOLL_SYSTEM
Case "SGS"

11
SDL/frmChangePWD.Designer.vb generated
View File

@@ -50,12 +50,15 @@ Partial Class frmChangePWD
Me.txtPwdOld._DateTimeOnly = False
Me.txtPwdOld._numbersOnly = False
Me.txtPwdOld._numbersOnlyKommastellen = ""
Me.txtPwdOld._numbersOnlyTrennzeichen = True
Me.txtPwdOld._Prozent = False
Me.txtPwdOld._ShortDateNew = False
Me.txtPwdOld._ShortDateOnly = False
Me.txtPwdOld._TimeOnly = False
Me.txtPwdOld._TimeOnly_Seconds = False
Me.txtPwdOld._value = Nothing
Me.txtPwdOld._Waehrung = False
Me.txtPwdOld._WaehrungZeichen = True
Me.txtPwdOld.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtPwdOld.ForeColor = System.Drawing.Color.Black
Me.txtPwdOld.Location = New System.Drawing.Point(129, 48)
@@ -72,12 +75,15 @@ Partial Class frmChangePWD
Me.txtPwdNew1._DateTimeOnly = False
Me.txtPwdNew1._numbersOnly = False
Me.txtPwdNew1._numbersOnlyKommastellen = ""
Me.txtPwdNew1._numbersOnlyTrennzeichen = True
Me.txtPwdNew1._Prozent = False
Me.txtPwdNew1._ShortDateNew = False
Me.txtPwdNew1._ShortDateOnly = False
Me.txtPwdNew1._TimeOnly = False
Me.txtPwdNew1._TimeOnly_Seconds = False
Me.txtPwdNew1._value = Nothing
Me.txtPwdNew1._Waehrung = False
Me.txtPwdNew1._WaehrungZeichen = True
Me.txtPwdNew1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtPwdNew1.ForeColor = System.Drawing.Color.Black
Me.txtPwdNew1.Location = New System.Drawing.Point(129, 93)
@@ -104,12 +110,15 @@ Partial Class frmChangePWD
Me.txtPwdNew2._DateTimeOnly = False
Me.txtPwdNew2._numbersOnly = False
Me.txtPwdNew2._numbersOnlyKommastellen = ""
Me.txtPwdNew2._numbersOnlyTrennzeichen = True
Me.txtPwdNew2._Prozent = False
Me.txtPwdNew2._ShortDateNew = False
Me.txtPwdNew2._ShortDateOnly = False
Me.txtPwdNew2._TimeOnly = False
Me.txtPwdNew2._TimeOnly_Seconds = False
Me.txtPwdNew2._value = Nothing
Me.txtPwdNew2._Waehrung = False
Me.txtPwdNew2._WaehrungZeichen = True
Me.txtPwdNew2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtPwdNew2.ForeColor = System.Drawing.Color.Black
Me.txtPwdNew2.Location = New System.Drawing.Point(129, 122)
@@ -199,7 +208,6 @@ Partial Class frmChangePWD
End Sub
Friend WithEvents lbl As System.Windows.Forms.Label
Friend WithEvents txtPwdNew1 As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents txtPwdNew2 As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label2 As System.Windows.Forms.Label
@@ -208,4 +216,5 @@ Partial Class frmChangePWD
Friend WithEvents Label4 As System.Windows.Forms.Label
Friend WithEvents Label5 As Label
Public WithEvents txtPwdOld As VERAG_PROG_ALLGEMEIN.MyTextBox
Public WithEvents txtPwdNew1 As VERAG_PROG_ALLGEMEIN.MyTextBox
End Class

4
VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
View File

@@ -320,7 +320,7 @@ Public Class cADMIN
Return SQL.getValueTxtBySql("SELECT mit_username FROM tblMitarbeiter where mit_id='" & userId & "' ", "ADMIN")
End Function
Public Function checkLogin(ByVal user As String, ByVal pwd As String, ByVal firma As String, Optional nlTmp As String = "", Optional switchCompany As Boolean = False) As Boolean
Public Function checkLogin(ByVal user As String, ByVal pwd As String, ByVal firma As String, Optional nlTmp As String = "", Optional switchCompany As Boolean = False, Optional bepr_programm As String = "AVISO") As Boolean
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = If(firma = "", "VERAG", firma)
@@ -338,7 +338,7 @@ Public Class cADMIN
cmd.Parameters.AddWithValue("@mit_username", user)
cmd.Parameters.AddWithValue("@mit_pwd", pwd)
cmd.Parameters.AddWithValue("@bepr_programm", "AVISO")
cmd.Parameters.AddWithValue("@bepr_programm", bepr_programm)
cmd.Parameters.AddWithValue("@mit_firma", firma)
dr = cmd.ExecuteReader()

5
VERAG_PROG_ALLGEMEIN/Schnittstellen/cTariffKN8.vb
View File

@@ -23,6 +23,11 @@ Public Class cTariffKN8_Interface
TNR = TNR.ToString.Replace(".", "")
TNR = TNR.ToString.Replace(" ", "")
If TNR.ToString.Length > 8 Then TNR = TNR.ToString.Substring(0, 8)
'If TNR.Length < 8 Then
' ' Mit Nullen auffüllen
' TNR = TNR.PadRight(8, "0"c)
'End If
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Return sql.getValueTxtBySql("SELECT TOP 1 [Kurztitel] FROM [tblEZTKN8] where EDV_Code like '" & TNR & "'", "FMZOLL",,, "")
End Function

1
VERAG_PROG_ALLGEMEIN/cAllgemein.vb
View File

@@ -10,6 +10,7 @@ Public Class cAllgemein
Public Shared STAMMFILIALE As String 'IMEX,UNISPED;ATILLA...
Public Shared WARENORT_ZUGANG As Boolean = False
Public Shared WARENORT As String
Public Shared ATILLA_SND As Boolean = False
Public Shared CLUSTER As String = "" 'Firmenverbund
' Public Shared SPECIFIC As cSPECIFIC = New cSPECIFIC