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

Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Browse Source
This commit is contained in:
d.breimaier
2022-10-28 08:05:43 +02:00
parent 32ded84b4d f2306d3225
commit 2f763da552
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Aviso/frmAviso_Vorpapiere.Designer.vb generated
View File

@@ -32,13 +32,13 @@ Partial Class frmAviso_Vorpapiere
Me.UsrCntlAviso_Vorpapiere1.BackColor = System.Drawing.Color.White
Me.UsrCntlAviso_Vorpapiere1.Location = New System.Drawing.Point(0, 0)
Me.UsrCntlAviso_Vorpapiere1.Name = "UsrCntlAviso_Vorpapiere1"
Me.UsrCntlAviso_Vorpapiere1.Size = New System.Drawing.Size(410, 157)
Me.UsrCntlAviso_Vorpapiere1.Size = New System.Drawing.Size(410, 164)
Me.UsrCntlAviso_Vorpapiere1.TabIndex = 64
'
'btn
'
Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn.Location = New System.Drawing.Point(289, 163)
Me.btn.Location = New System.Drawing.Point(289, 170)
Me.btn.Name = "btn"
Me.btn.Size = New System.Drawing.Size(109, 33)
Me.btn.TabIndex = 65
@@ -55,7 +55,8 @@ Partial Class frmAviso_Vorpapiere
Me.Controls.Add(Me.UsrCntlAviso_Vorpapiere1)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "frmAviso_Vorpapiere"
Me.Text = "frmAviso_Vorpapiere"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Vorpapiere"
Me.ResumeLayout(False)
End Sub

13
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -163,6 +163,19 @@ Public Class frmSendungsdetailsNEU
End If
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
If (cboVorpapier.Text.Trim <> String.Empty And txtVorpapierPos.Text.Trim = String.Empty) Or
(cboVorpapier2.Text.Trim <> String.Empty And txtVorpapier2Pos.Text.Trim = String.Empty) Or
(cboVorpapier3.Text.Trim <> String.Empty And txtVorpapier3Pos.Text.Trim = String.Empty) Then
If MsgBox("Pre-Paper Psoition is not filled. Really continue?", vbYesNoCancel) <> vbYes Then
Return False
End If
End If
End If
Return True
End Function

10
Aviso/usrCntlAviso_Vorpapiere.Designer.vb generated
View File

@@ -33,10 +33,13 @@ Partial Class usrCntlAviso_Vorpapiere
'
'GroupBox1
'
Me.GroupBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.GroupBox1.Controls.Add(Me.dgvVorpapier)
Me.GroupBox1.Location = New System.Drawing.Point(0, 0)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(403, 150)
Me.GroupBox1.Size = New System.Drawing.Size(403, 157)
Me.GroupBox1.TabIndex = 57
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Vorpapiere"
@@ -46,13 +49,16 @@ Partial Class usrCntlAviso_Vorpapiere
Me.dgvVorpapier.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvVorpapier.AllowUserToResizeColumns = False
Me.dgvVorpapier.AllowUserToResizeRows = False
Me.dgvVorpapier.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.dgvVorpapier.BackgroundColor = System.Drawing.Color.White
Me.dgvVorpapier.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvVorpapier.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.clmnMRN})
Me.dgvVorpapier.Location = New System.Drawing.Point(9, 19)
Me.dgvVorpapier.Name = "dgvVorpapier"
Me.dgvVorpapier.RowHeadersWidth = 25
Me.dgvVorpapier.Size = New System.Drawing.Size(388, 126)
Me.dgvVorpapier.Size = New System.Drawing.Size(388, 133)
Me.dgvVorpapier.TabIndex = 36
'
'clmnArt