From d22ee3d24cb48f5fbb7f9e1e0ebab11e0c58ea75 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 2 Feb 2021 21:16:08 +0100 Subject: [PATCH] neu --- .../Auswertung/usrctlStatVERIMEX.Designer.vb | 121 +++++++++++++----- Aviso/Auswertung/usrctlStatVERIMEX.vb | 42 +++++- Aviso/Aviso.vbproj | 4 + Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/My Project/Resources.Designer.vb | 21 ++- Aviso/My Project/Resources.resx | 8 +- .../Resources/ATANAK_Instructions_Import.xlsx | Bin 0 -> 20387 bytes Aviso/Resources/Instructions_Import.xlsx | Bin 0 -> 20539 bytes Aviso/frmEintragAviso.designer.vb | 39 +++++- Aviso/frmEintragAviso.vb | 31 ++++- Aviso/frmSendungsdetailsNEU.Designer.vb | 39 +++++- Aviso/frmSendungsdetailsNEU.vb | 83 ++++++++++++ Aviso/usrcntlAktDetails.vb | 2 +- 13 files changed, 336 insertions(+), 58 deletions(-) create mode 100644 Aviso/Resources/ATANAK_Instructions_Import.xlsx create mode 100644 Aviso/Resources/Instructions_Import.xlsx diff --git a/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb b/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb index 1753df0..2213fc4 100644 --- a/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb +++ b/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb @@ -25,6 +25,8 @@ Partial Class usrctlStatVERIMEX Me.Panel3 = New System.Windows.Forms.Panel() Me.Label9 = New System.Windows.Forms.Label() Me.Panel4 = New System.Windows.Forms.Panel() + Me.Label1 = New System.Windows.Forms.Label() + Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button2 = New System.Windows.Forms.Button() Me.dgvAbklaerungTR = New System.Windows.Forms.DataGridView() Me.Label10 = New System.Windows.Forms.Label() @@ -32,6 +34,7 @@ Partial Class usrctlStatVERIMEX Me.Button1 = New System.Windows.Forms.Button() Me.datStatBis = New System.Windows.Forms.DateTimePicker() Me.datStatVon = New System.Windows.Forms.DateTimePicker() + Me.Button3 = New System.Windows.Forms.Button() Me.Panel3.SuspendLayout() Me.Panel4.SuspendLayout() CType(Me.dgvAbklaerungTR, System.ComponentModel.ISupportInitialize).BeginInit() @@ -41,106 +44,153 @@ Partial Class usrctlStatVERIMEX ' Me.Panel3.Controls.Add(Me.Label9) Me.Panel3.Controls.Add(Me.Panel4) - Me.Panel3.Location = New System.Drawing.Point(15, 17) + Me.Panel3.Controls.Add(Me.Button2) + Me.Panel3.Controls.Add(Me.Button1) + Me.Panel3.Location = New System.Drawing.Point(22, 26) + Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(701, 398) - Me.Panel3.TabIndex = 15 + Me.Panel3.Size = New System.Drawing.Size(1052, 651) + Me.Panel3.TabIndex = 0 ' 'Label9 ' Me.Label9.AutoSize = True Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label9.Location = New System.Drawing.Point(3, 8) + Me.Label9.Location = New System.Drawing.Point(4, 12) + Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(139, 13) - Me.Label9.TabIndex = 18 + Me.Label9.Size = New System.Drawing.Size(204, 20) + Me.Label9.TabIndex = 0 Me.Label9.Text = "Sendungserfassung TR" ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke - Me.Panel4.Controls.Add(Me.Button2) + Me.Panel4.Controls.Add(Me.Button3) + Me.Panel4.Controls.Add(Me.Label1) + Me.Panel4.Controls.Add(Me.cboFirma) Me.Panel4.Controls.Add(Me.dgvAbklaerungTR) Me.Panel4.Controls.Add(Me.Label10) Me.Panel4.Controls.Add(Me.Label6) - Me.Panel4.Controls.Add(Me.Button1) Me.Panel4.Controls.Add(Me.datStatBis) Me.Panel4.Controls.Add(Me.datStatVon) - Me.Panel4.Location = New System.Drawing.Point(3, 24) + Me.Panel4.Location = New System.Drawing.Point(4, 37) + Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(670, 359) - Me.Panel4.TabIndex = 15 + Me.Panel4.Size = New System.Drawing.Size(1005, 552) + Me.Panel4.TabIndex = 1 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(519, 20) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(53, 20) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Firma:" + ' + 'cboFirma + ' + Me.cboFirma._allowedValuesFreiText = Nothing + Me.cboFirma._allowFreiText = False + Me.cboFirma._value = "" + Me.cboFirma.FormattingEnabled = True + Me.cboFirma.Location = New System.Drawing.Point(579, 17) + Me.cboFirma.Name = "cboFirma" + Me.cboFirma.Size = New System.Drawing.Size(164, 28) + Me.cboFirma.TabIndex = 5 ' 'Button2 ' Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(592, 11) + Me.Button2.Location = New System.Drawing.Point(897, 599) + Me.Button2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(75, 23) - Me.Button2.TabIndex = 20 + Me.Button2.Size = New System.Drawing.Size(112, 35) + Me.Button2.TabIndex = 3 Me.Button2.Text = "Bericht" Me.Button2.UseVisualStyleBackColor = True ' 'dgvAbklaerungTR ' Me.dgvAbklaerungTR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvAbklaerungTR.Location = New System.Drawing.Point(6, 38) + Me.dgvAbklaerungTR.Location = New System.Drawing.Point(9, 58) + Me.dgvAbklaerungTR.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dgvAbklaerungTR.Name = "dgvAbklaerungTR" - Me.dgvAbklaerungTR.Size = New System.Drawing.Size(661, 318) - Me.dgvAbklaerungTR.TabIndex = 19 + Me.dgvAbklaerungTR.RowHeadersWidth = 62 + Me.dgvAbklaerungTR.Size = New System.Drawing.Size(992, 489) + Me.dgvAbklaerungTR.TabIndex = 7 ' 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(181, 17) + Me.Label10.Location = New System.Drawing.Point(269, 23) + Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(10, 13) - Me.Label10.TabIndex = 18 + Me.Label10.Size = New System.Drawing.Size(14, 20) + Me.Label10.TabIndex = 3 Me.Label10.Text = "-" ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(3, 18) + Me.Label6.Location = New System.Drawing.Point(4, 23) + Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(51, 13) - Me.Label6.TabIndex = 6 + Me.Label6.Size = New System.Drawing.Size(76, 20) + Me.Label6.TabIndex = 1 Me.Label6.Text = "Zeitraum:" ' 'Button1 ' Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(511, 11) + Me.Button1.Location = New System.Drawing.Point(775, 599) + Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 23) - Me.Button1.TabIndex = 11 + Me.Button1.Size = New System.Drawing.Size(112, 35) + Me.Button1.TabIndex = 2 Me.Button1.Text = "Excel" Me.Button1.UseVisualStyleBackColor = True ' 'datStatBis ' Me.datStatBis.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.datStatBis.Location = New System.Drawing.Point(197, 11) + Me.datStatBis.Location = New System.Drawing.Point(291, 18) + Me.datStatBis.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.datStatBis.Name = "datStatBis" - Me.datStatBis.Size = New System.Drawing.Size(105, 20) - Me.datStatBis.TabIndex = 7 + Me.datStatBis.Size = New System.Drawing.Size(156, 26) + Me.datStatBis.TabIndex = 4 ' 'datStatVon ' Me.datStatVon.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.datStatVon.Location = New System.Drawing.Point(70, 12) + Me.datStatVon.Location = New System.Drawing.Point(105, 18) + Me.datStatVon.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.datStatVon.Name = "datStatVon" - Me.datStatVon.Size = New System.Drawing.Size(105, 20) - Me.datStatVon.TabIndex = 8 + Me.datStatVon.Size = New System.Drawing.Size(156, 26) + Me.datStatVon.TabIndex = 2 + ' + 'Button3 + ' + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.Location = New System.Drawing.Point(798, 13) + Me.Button3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(203, 35) + Me.Button3.TabIndex = 6 + Me.Button3.Text = "Auswerten" + Me.Button3.UseVisualStyleBackColor = True ' 'usrctlStatVERIMEX ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.Controls.Add(Me.Panel3) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "usrctlStatVERIMEX" - Me.Size = New System.Drawing.Size(844, 510) + Me.Size = New System.Drawing.Size(1266, 785) Me.Panel3.ResumeLayout(False) Me.Panel3.PerformLayout() Me.Panel4.ResumeLayout(False) @@ -160,4 +210,7 @@ Partial Class usrctlStatVERIMEX Friend WithEvents datStatBis As DateTimePicker Friend WithEvents datStatVon As DateTimePicker Friend WithEvents Button2 As Button + Friend WithEvents Label1 As Label + Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Button3 As Button End Class diff --git a/Aviso/Auswertung/usrctlStatVERIMEX.vb b/Aviso/Auswertung/usrctlStatVERIMEX.vb index fc88819..9c90866 100644 --- a/Aviso/Auswertung/usrctlStatVERIMEX.vb +++ b/Aviso/Auswertung/usrctlStatVERIMEX.vb @@ -7,10 +7,22 @@ Public Class usrctlStatVERIMEX Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Sub init() + Dim whereFiliale = "" + Dim innerJoinFiliale = "" + Select Case cboFirma._value + Case "" + Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 " + Case Else + whereFiliale = " and Filialen.Firma='" & cboFirma._value & "' " + innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr" + End Select + With dgvAbklaerungTR Dim sqlstr = "SELECT mit_vname + ' ' + mit_nname as Mitarbeiter ,count(*) as Sendungen ,count(distinct(avisoid)) as LKW - FROM [tblSendungen] inner join aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA + FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA + " & innerJoinFiliale & " where cast(Datum as date) BETWEEN '" & datStatVon.Value & "' and '" & datStatBis.Value & "' and tblSnd_AbklaerungTR_MA is not null + " & whereFiliale & " group by mit_vname,mit_nname" dgvAbklaerungTR.DataSource = SQL.loadDgvBySql(sqlstr, "AVISO") @@ -23,9 +35,9 @@ Public Class usrctlStatVERIMEX - Private Sub datStatVon_ValueChanged(sender As Object, e As EventArgs) Handles datStatVon.ValueChanged, datStatBis.ValueChanged - init() - End Sub + 'Private Sub datStatVon_ValueChanged(sender As Object, e As EventArgs) Handles datStatVon.ValueChanged, datStatBis.ValueChanged + + 'End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Me.Cursor = Cursors.WaitCursor @@ -88,4 +100,26 @@ Public Class usrctlStatVERIMEX print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous print.Show() End Sub + + Private Sub usrctlStatVERIMEX_Load(sender As Object, e As EventArgs) Handles Me.Load + cboFirma.Items.Clear() + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*Nicht zugeordnet", "0")) + cboFirma.changeItem("") + ' cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "")) + End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + init() + End Sub + + Private Sub datStatVon_KeyDown(sender As Object, e As KeyEventArgs) Handles datStatVon.KeyDown, datStatBis.KeyDown, cboFirma.KeyDown + If e.KeyCode = Keys.Return Then + init() + End If + End Sub End Class \ No newline at end of file diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 194b0a1..b652c66 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1105,6 +1105,10 @@ My Settings.Designer.vb + + Always + + diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index a04e745..3437081 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index e18054d..604c089 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -239,6 +239,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. + ''' + Friend ReadOnly Property ATANAK_Instructions_Import() As Byte() + Get + Dim obj As Object = ResourceManager.GetObject("ATANAK_Instructions_Import", resourceCulture) + Return CType(obj,Byte()) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1149,6 +1159,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property sfsdfs3sdfsdfsdfsdfsdf() As String + Get + Return ResourceManager.GetString("sfsdfs3sdfsdfsdfsdfsdf", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1459,7 +1478,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.6.0.0 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.6.0.7 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 99b15b3..0d90dee 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -536,7 +536,7 @@ ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 3.6.0.0 + 3.6.0.7 ..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -595,4 +595,10 @@ ..\Resources\AMB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ATANAK_Instructions_Import.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + \ No newline at end of file diff --git a/Aviso/Resources/ATANAK_Instructions_Import.xlsx b/Aviso/Resources/ATANAK_Instructions_Import.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..6b211518de411594adc78cdbed6e3901aed5a1e3 GIT binary patch literal 20387 zcmeFZW0WP$wl2KN>ayKs+qPZZWp&xMZQHhO+qSE_Y+JY9ckiQn_8sH5!F=Fn1o zjV-XXZexAPz_Pg#GdkB*E+#Iu=_9Mvwm-;7Ydci7YH%Vz+7SAlTA|Iy^E;v_;$ztR ze!-FzfWghDHw$JhksiNt9_2iOux7L)u; z+^{A62)nZ&6N|z5e{4syy%Q!X&-6 z=X_%YEVMC_jz^dR3vXaRx5nS{2zH8?t;;%SuV}^h{MHp*mQB!1P468N?fBLHp|Du_ zb~(^?5$LU32Og%9c%;^NmaNJ7j5?=>)|a;dZ&#AJx>TpM^m($?pUsv((L9a}bNn*i z!^0VJh-A=(M@P_qhd@|~vr}q0o#QzXDfx?Z09hwnvq$F)50|vGTGmgK59jg~t0Y*3 zs`wHcZxT7ZyLWSV`ua9aP*}DFG#KV7GN{T80TU8QZ6%<;N~lS9&xN~9|LA7fXSJ8c zek;2BOKCqpK>+gqMV%X!=!x#WWK{Y~TVcM`S;x-M!k&)yujBuy@&CiR`=6j!#L39@ z(|-%P6n_gId0gC#K@gO377%YI`03>%u>s#0nNN(p*-eIn@Ds})M9jO>>uqd(lRNTc zgy7*1b45533Kvn6b7fHSi>)IBC8=GKsBOjX0Ys<8`^AS;F-cc)r_N}~@|KcZsnKmB z(fMoPT7+p@6)Y&^LYyEpo>X7;AsMwTy{9UmMZq8El|ePlY&j?K)9K#JNkzx7d?6gt zXLG5jBldd6t5qH&76kXtSV})kI81Bwvg|ksU3CmBdTxc&yOG~LXk;@+6bYG;o*1Xa zhDmbnz116-ug5c82iTzc%SWz8{lf7}w*IA(#6cvSfqs?nfdBwl07xJg3%Y;kiLOJe=)Z|P27dU@cG)s|$_LpR%_^o?rhEC=B(O{C zL1=jHU79O$j`qY@)iH?oJ>rG7uX{UJJ`v+%8KW9VK>JlV8S0yZT@H><5{2}bNLgf( zfPsLm94@Q0tC+>^7XM1)4Jpy{2kzgnF8sD8A537&v&vqYaT%k3Y`&V$t0!X@Uj#ol z&GMaZ9wk`OmoK6DdsuGt)TeoSnHe(=*ZXYjJ`5V;)yxo>ux}Ts@|6ZzEaINw>txyk z&a`0stLoVGWD-Ul3uadaAGpu}@^C5Y9=lpVs}8cLetGscRwqA>#w1$1W;60{Zj{?A z!xPi>4A!5$BlRnXd|yrf-wo}8wxb01mywMF1pwf`D86LqKTA)=&rz#&dW25&BR+%< zDs@6*L~1anvpn#yB^$-VKQJ#T`xg)v=S&OFlR1BAZG+4i?j6J@DG|oHVPsAuImy@` n`G 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

9Lyn$}wNck>q!@g)N0J@gcR_ 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 literal 0 HcmV?d00001 diff --git a/Aviso/Resources/Instructions_Import.xlsx b/Aviso/Resources/Instructions_Import.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e2afdeb394c3aef1c2604e4fa510986038218bb7 GIT binary patch literal 20539 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 X;LQrmnxNuNfWa2His%JU4FdxJT6(=N literal 0 HcmV?d00001 diff --git a/Aviso/frmEintragAviso.designer.vb b/Aviso/frmEintragAviso.designer.vb index 7141fde..7373e6f 100644 --- a/Aviso/frmEintragAviso.designer.vb +++ b/Aviso/frmEintragAviso.designer.vb @@ -147,6 +147,8 @@ Partial Class frmEintragAviso Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.UsrCntlEintragAvisoAtilla = New AVISO.usrCntlEintragAvisoAtilla() Me.UsrCntlAviso_Vorpapiere1 = New AVISO.usrCntlAviso_Vorpapiere() + Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label2 = New System.Windows.Forms.Label() Me.panAdmin.SuspendLayout() Me.grpAviso.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -174,7 +176,7 @@ Partial Class frmEintragAviso 'lblErfAm ' Me.lblErfAm.AutoSize = True - Me.lblErfAm.Location = New System.Drawing.Point(220, 14) + Me.lblErfAm.Location = New System.Drawing.Point(220, 12) Me.lblErfAm.Name = "lblErfAm" Me.lblErfAm.Size = New System.Drawing.Size(59, 13) Me.lblErfAm.TabIndex = 1 @@ -271,7 +273,7 @@ Partial Class frmEintragAviso ' Me.dtpDatum.CustomFormat = "dd.MM.yyyy HH:mm" Me.dtpDatum.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpDatum.Location = New System.Drawing.Point(285, 9) + Me.dtpDatum.Location = New System.Drawing.Point(285, 7) Me.dtpDatum.Name = "dtpDatum" Me.dtpDatum.Size = New System.Drawing.Size(130, 20) Me.dtpDatum.TabIndex = 2 @@ -291,7 +293,7 @@ Partial Class frmEintragAviso Me.lblStatus.BackColor = System.Drawing.Color.LemonChiffon Me.lblStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStatus.ForeColor = System.Drawing.Color.Green - Me.lblStatus.Location = New System.Drawing.Point(516, 9) + Me.lblStatus.Location = New System.Drawing.Point(516, 7) Me.lblStatus.Name = "lblStatus" Me.lblStatus.Size = New System.Drawing.Size(268, 20) Me.lblStatus.TabIndex = 4 @@ -301,7 +303,7 @@ Partial Class frmEintragAviso ' Me.lblStatus2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblStatus2.AutoSize = True - Me.lblStatus2.Location = New System.Drawing.Point(430, 14) + Me.lblStatus2.Location = New System.Drawing.Point(430, 12) Me.lblStatus2.Name = "lblStatus2" Me.lblStatus2.Size = New System.Drawing.Size(80, 13) Me.lblStatus2.TabIndex = 3 @@ -767,7 +769,7 @@ Partial Class frmEintragAviso Me.grpAviso.Controls.Add(Me.lblVoraussEintreff) Me.grpAviso.Controls.Add(Me.datVoraussichtlichesEintreffen) Me.grpAviso.Controls.Add(Me.pnl) - Me.grpAviso.Location = New System.Drawing.Point(12, 45) + Me.grpAviso.Location = New System.Drawing.Point(12, 49) Me.grpAviso.Name = "grpAviso" Me.grpAviso.Size = New System.Drawing.Size(403, 406) Me.grpAviso.TabIndex = 5 @@ -1725,11 +1727,32 @@ Partial Class frmEintragAviso 'UsrCntlAviso_Vorpapiere1 ' Me.UsrCntlAviso_Vorpapiere1.BackColor = System.Drawing.Color.White - Me.UsrCntlAviso_Vorpapiere1.Location = New System.Drawing.Point(12, 462) + Me.UsrCntlAviso_Vorpapiere1.Location = New System.Drawing.Point(12, 466) Me.UsrCntlAviso_Vorpapiere1.Name = "UsrCntlAviso_Vorpapiere1" Me.UsrCntlAviso_Vorpapiere1.Size = New System.Drawing.Size(410, 157) Me.UsrCntlAviso_Vorpapiere1.TabIndex = 63 ' + 'cboFirma + ' + Me.cboFirma._allowedValuesFreiText = Nothing + Me.cboFirma._allowFreiText = False + Me.cboFirma._value = "" + Me.cboFirma.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.cboFirma.FormattingEnabled = True + Me.cboFirma.Location = New System.Drawing.Point(285, 28) + Me.cboFirma.Name = "cboFirma" + Me.cboFirma.Size = New System.Drawing.Size(130, 21) + Me.cboFirma.TabIndex = 70 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(220, 31) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(43, 13) + Me.Label2.TabIndex = 71 + Me.Label2.Text = "FIRMA:" + ' 'frmEintragAviso ' Me.AcceptButton = Me.btnOK @@ -1737,6 +1760,8 @@ Partial Class frmEintragAviso Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(792, 728) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.cboFirma) Me.Controls.Add(Me.UsrCntlAviso_Vorpapiere1) Me.Controls.Add(Me.btnAbsSrch) Me.Controls.Add(Me.panAdmin) @@ -1918,4 +1943,6 @@ Partial Class frmEintragAviso Friend WithEvents pnl As Panel Friend WithEvents PictureBox1 As PictureBox Friend WithEvents UsrCntlAviso_Vorpapiere1 As usrCntlAviso_Vorpapiere + Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label2 As Label End Class diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index 3d67028..6e6c154 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -103,6 +103,16 @@ Public Class frmEintragAviso optSchriftlich.Checked = True End If + cboFirma.Items.Clear() + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE")) + cboFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + cboFirma.Enabled = False Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "IMEX" @@ -136,8 +146,14 @@ Public Class frmEintragAviso Label1.Visible = True cboImEx.Visible = True cboImEx.Text = "IMPORT" + Case "VERIMEX" + cboFirma.Enabled = True End Select + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then + cboFirma.Enabled = True + End If + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG @@ -390,8 +406,10 @@ Public Class frmEintragAviso lblStatus.Text = "" End Select lblStatus.Text = " " & lblStatus.Text & " " 'für bessere farbliche Hervorhebung + cboFirma.changeItem("") + cboFirma.changeItem(myAviso.FIRMA) - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_ZeitenBearbeiten", "SDL") Then + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_ZeitenBearbeiten", "SDL") Then panAdmin.Visible = bearb 'Administrator bekommt mehr Edit-Möglichkeiten End If @@ -538,6 +556,15 @@ Public Class frmEintragAviso lblSendungsanzahl.Visible = False lblErrVorraussuchtlEintreffen.Visible = False + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then + If cboFirma._value = "" Then + MsgBox("Firma auswählen!", vbInformation) + cboFirma.Focus() + Exit Sub + + End If + End If + If CDate(dtpAvisoEingangDatum.Value) > Now Then MsgBox("Aviso-Datum darf nicht in der Zukunft liegen!", vbInformation) dtpAvisoEingangDatum.Focus() @@ -889,7 +916,7 @@ Public Class frmEintragAviso myAviso.Sammelakt = (myAviso.Sendungen_Gesamtanzahl > 1) 'cbxSammelakt.Checked End If - myAviso.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + myAviso.FIRMA = If(cboFirma._value <> "", cboFirma._value, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) myAviso.Cluster = If(VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER, "") diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index a4ae579..b91dde7 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -353,6 +353,7 @@ Partial Class frmSendungsdetailsNEU Me.AuftraggeberToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EmpfängerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LaufzettelDruckenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ZollstoppAMBARToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem15 = New System.Windows.Forms.ToolStripMenuItem() Me.SpeditionSUBENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -363,7 +364,9 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem() Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ZollstoppAMBARToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ATANAKToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -4596,9 +4599,9 @@ Partial Class frmSendungsdetailsNEU ' 'ctxtWeitereFormulare ' - Me.ctxtWeitereFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolGelangensbestätigung, Me.toolOriginalSendungsunterlagen, Me.LaufzettelDruckenToolStripMenuItem, Me.ZollstoppAMBARToolStripMenuItem}) + Me.ctxtWeitereFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolGelangensbestätigung, Me.toolOriginalSendungsunterlagen, Me.LaufzettelDruckenToolStripMenuItem, Me.ZollstoppAMBARToolStripMenuItem, Me.ATANAKToolStripMenuItem}) Me.ctxtWeitereFormulare.Name = "cntxt" - Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 114) + Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 136) ' 'toolGelangensbestätigung ' @@ -4631,6 +4634,12 @@ Partial Class frmSendungsdetailsNEU Me.LaufzettelDruckenToolStripMenuItem.Size = New System.Drawing.Size(262, 22) Me.LaufzettelDruckenToolStripMenuItem.Text = "Laufzettel drucken" ' + 'ZollstoppAMBARToolStripMenuItem + ' + Me.ZollstoppAMBARToolStripMenuItem.Name = "ZollstoppAMBARToolStripMenuItem" + Me.ZollstoppAMBARToolStripMenuItem.Size = New System.Drawing.Size(262, 22) + Me.ZollstoppAMBARToolStripMenuItem.Text = "Zollstopp (AMBAR)" + ' 'ContextMenuStrip1 ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16}) @@ -4697,11 +4706,24 @@ Partial Class frmSendungsdetailsNEU Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(247, 22) Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen" ' - 'ZollstoppAMBARToolStripMenuItem + 'ATANAKToolStripMenuItem ' - Me.ZollstoppAMBARToolStripMenuItem.Name = "ZollstoppAMBARToolStripMenuItem" - Me.ZollstoppAMBARToolStripMenuItem.Size = New System.Drawing.Size(262, 22) - Me.ZollstoppAMBARToolStripMenuItem.Text = "Zollstopp (AMBAR)" + Me.ATANAKToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ImportToolStripMenuItem, Me.ExportToolStripMenuItem}) + Me.ATANAKToolStripMenuItem.Name = "ATANAKToolStripMenuItem" + Me.ATANAKToolStripMenuItem.Size = New System.Drawing.Size(262, 22) + Me.ATANAKToolStripMenuItem.Text = "ATANAK" + ' + 'ImportToolStripMenuItem + ' + Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem" + Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ImportToolStripMenuItem.Text = "Import" + ' + 'ExportToolStripMenuItem + ' + Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem" + Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ExportToolStripMenuItem.Text = "Export" ' 'frmSendungsdetailsNEU ' @@ -5131,4 +5153,7 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents txtFrachtkosten As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label1 As Label Friend WithEvents ZollstoppAMBARToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ATANAKToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ImportToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ExportToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 6b92bb2..f1d97ac 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -4241,4 +4241,87 @@ Public Class frmSendungsdetailsNEU f.ShowDialog(Me) Me.Cursor = DefaultCursor End Sub + + Private Sub ImportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ImportToolStripMenuItem.Click + + Me.Cursor = Cursors.WaitCursor + Try + Dim Path = "" + If True Then + + + Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\ATANAK\" + If Not My.Computer.FileSystem.DirectoryExists(sPath) Then + My.Computer.FileSystem.CreateDirectory(sPath) + End If + + + Dim exclApp As Object 'as Application + Dim Datei As Object 'as WorkBook + Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet + exclApp = CreateObject("Excel.Application") + + With exclApp + .Visible = False + + Try + Path = sPath & "ATANAK_Import_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & " .xlsx" + While System.IO.File.Exists(Path) + Path = sPath & "ATANAK_Import_" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "-" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "" & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx" + End While + My.Computer.FileSystem.WriteAllBytes(Path, My.Resources.ATANAK_Instructions_Import, False) + Catch ex As System.Exception + ' MsgBox(ex.Message) + MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace) + Me.Cursor = Cursors.Default + + Exit Sub + End Try + + Datei = .Workbooks.Open(Path) 'Anpassen + Blatt = Datei.Worksheets(1) 'Anpassen + + Blatt.Range("E9").Value = SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "/" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr + Blatt.Range("D10").Value = AVISO.LKW_Nr + Blatt.Range("D11").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger + If SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr > 0 Then + Dim KD As New VERAG_PROG_ALLGEMEIN.cKunde(SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr) + If KD IsNot Nothing AndAlso If(KD.EORITIN, "") <> "" Then + Blatt.Range("D12").Value = KD.EORITIN + End If + End If + + Blatt.Range("F13").Value = "" 'DDA + Blatt.Range("C26").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht + Blatt.Range("G26").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli + Blatt.Range("D27").Value = "" 'Procedure + Blatt.Range("F29").Value = "" 'CPC + Blatt.Range("F30").Value = "" 'Supervising HMRC Adress + Blatt.Range("F32").Value = "" 'LICENSE Y/N + Blatt.Range("A36").Value = "" 'Other1 + Blatt.Range("A37").Value = "" 'Other2 + Blatt.Range("A39").Value = "" 'Other3 + + + Blatt.Range("B42").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname + Blatt.Range("G42").Value = Now.ToShortDateString + + + Datei.Save + + If False Then + Blatt.PrintOutEx() + Else + 'Process.Start(Path) + .Visible = True + + End If + End With + + End If + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + Me.Cursor = Cursors.Default + End Sub End Class diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 3370cd1..3b35d8f 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -2640,7 +2640,7 @@ Public Class usrcntlAktDetails Private Sub Button9_Click(sender As Object, e As EventArgs) Handles btnKasse_User.Click If DispolisteVermerk() Then Dim path = SDL.FormularManagerNEU.DispSendungslisteoListe(AvisoID, False,, cboFormulareRgAn._value) - If path <> "" Then Process.Start(path) + If path <> "" And IO.File.Exists(path) Then Process.Start(path) Panel4.Visible = False End If End Sub