Im Tab Vorbereitet wird das Drucken der Etiketten abgefragt.
This commit is contained in:
parent
48f50107b3
commit
15d3d99bc0
@ -891,7 +891,7 @@ namespace Deckungsbeitrag
|
||||
{
|
||||
this.auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)e.RowObject).AuftragID);
|
||||
if (e.Column.Text == "sauber") altecontclean = (int?)e.Value;
|
||||
if (!string.IsNullOrWhiteSpace(e.NewValue.ToString())) Save_Auftrag(this.auftrag, false);
|
||||
if (!string.IsNullOrWhiteSpace(e.NewValue.ToString())) { this.auftrag.ContainerClean = (int)e.NewValue; Save_Auftrag(this.auftrag, false); }
|
||||
|
||||
if (this.auftrag.Status == AuftragStatus.Vorbereitet & e.Value != e.NewValue)
|
||||
{
|
||||
@ -1244,3 +1244,4 @@ namespace Deckungsbeitrag
|
||||
}
|
||||
}
|
||||
}
|
||||
//CHANGES: Im Tap Vorbereitet wird beim Ändern der sauberen Containeranzahl gefragt ob die Etiketten neu gedruckt werden sollen.
|
||||
21
AA-Forms/FormMain.Designer.cs
generated
21
AA-Forms/FormMain.Designer.cs
generated
@ -496,27 +496,6 @@ namespace Deckungsbeitrag
|
||||
this.panelMain.Paint += new System.Windows.Forms.PaintEventHandler(this.PanelMain_Paint);
|
||||
this.panelMain.Resize += new System.EventHandler(this.PanelMain_Resize);
|
||||
//
|
||||
// buttonTestInventur
|
||||
//
|
||||
this.buttonTestInventur.BackColor = System.Drawing.Color.LightGreen;
|
||||
this.buttonTestInventur.Enabled = false;
|
||||
this.buttonTestInventur.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
|
||||
this.buttonTestInventur.FlatAppearance.BorderSize = 0;
|
||||
this.buttonTestInventur.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.buttonTestInventur.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.buttonTestInventur.ForeColor = System.Drawing.Color.Black;
|
||||
this.buttonTestInventur.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
this.buttonTestInventur.Location = new System.Drawing.Point(11, 268);
|
||||
this.buttonTestInventur.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
|
||||
this.buttonTestInventur.Name = "buttonTestInventur";
|
||||
this.buttonTestInventur.Size = new System.Drawing.Size(333, 50);
|
||||
this.buttonTestInventur.TabIndex = 72;
|
||||
this.buttonTestInventur.Text = "Div. Tests";
|
||||
this.buttonTestInventur.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
|
||||
this.buttonTestInventur.UseVisualStyleBackColor = false;
|
||||
this.buttonTestInventur.Visible = false;
|
||||
this.buttonTestInventur.Click += new System.EventHandler(this.buttonTestInventur_Click);
|
||||
//
|
||||
// groupBoxAuftrag
|
||||
//
|
||||
this.groupBoxAuftrag.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
|
||||
@ -394,16 +394,6 @@ namespace Deckungsbeitrag
|
||||
}
|
||||
}
|
||||
|
||||
uCInventur = new UCInventur(kunde, this.benutzer);
|
||||
uCInventur.UCInventur_Update += () => { this.GetInventuren(); };
|
||||
uCInventur.UCInventur_Delete += Do_UCInventur_Delete;
|
||||
this.panelMain.Controls.Add(uCInventur);
|
||||
uCInventur.Location = new Point(100, 100);
|
||||
uCInventur.BringToFront();
|
||||
RegisterDragEvents(uCInventur);
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// AUFTRAGSVERWALTUNG FUNKTIONEN
|
||||
/// Button-Click AufAbruf und Ausgeliefert sowie ItemsChecked
|
||||
|
||||
@ -100,8 +100,11 @@ namespace Deckungsbeitrag
|
||||
if (Saison.Bezeichnung == "Winter") nextLiefertag = Funktionen.GetNextLiefertag((Liefertage)this.kunde.WinterLieferRhythmus);
|
||||
if (Saison.Bezeichnung == "Zwischensaison")
|
||||
{
|
||||
if (!ShowTourenplan())
|
||||
bool? ok = ShowTourenplan();
|
||||
if (ok == null) { this.Close(); return; }
|
||||
if ((bool)!ok)
|
||||
{
|
||||
|
||||
meldung.GetInfo(this, "Achtung Liefertag kann falsch sein, da Zwischensaison ist.", false);
|
||||
DateTime datum = DateTime.Today;
|
||||
int tage = 2;
|
||||
@ -135,7 +138,7 @@ namespace Deckungsbeitrag
|
||||
|
||||
|
||||
}
|
||||
private bool ShowTourenplan()
|
||||
private bool? ShowTourenplan()
|
||||
{
|
||||
FormShowUserControl showUserControl = new FormShowUserControl("Tourenplan", this.benutzer, this.kunde);
|
||||
if (showUserControl.ShowDialog() == DialogResult.OK)
|
||||
@ -146,7 +149,9 @@ namespace Deckungsbeitrag
|
||||
tour = data.text;
|
||||
return true;
|
||||
}
|
||||
else return false;
|
||||
|
||||
if (MessageBox.Show("Möchtest du die Eingabe von Aufträgen beenden?", "FRAGE", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return false;
|
||||
else { return null; }
|
||||
}
|
||||
/// <summary>
|
||||
/// Kundendaten Liefertag werden eingefügt.
|
||||
@ -450,7 +455,9 @@ namespace Deckungsbeitrag
|
||||
this.kunde = Funktionen.KundenAuswahl();
|
||||
if (this.kunde != null)
|
||||
{
|
||||
if (ShowTourenplan())
|
||||
bool? ok = ShowTourenplan();
|
||||
if (ok == null) { this.Close(); return; }
|
||||
if ((bool)ok)
|
||||
{
|
||||
DatenLaden();
|
||||
return;
|
||||
|
||||
7
AA-Forms/FormShowUserControl.Designer.cs
generated
7
AA-Forms/FormShowUserControl.Designer.cs
generated
@ -31,14 +31,15 @@
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormShowUserControl));
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// FormShowGroupBox
|
||||
// FormShowUserControl
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.ClientSize = new System.Drawing.Size(356, 450);
|
||||
this.ClientSize = new System.Drawing.Size(534, 692);
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "FormShowUserControl";
|
||||
|
||||
@ -490,8 +490,8 @@
|
||||
<EmbeddedResource Include="AA-Forms\FormNeuerBenutzer.resx">
|
||||
<DependentUpon>FormNeuerBenutzer.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="AA-Forms\FormShowGroupBox.resx">
|
||||
<DependentUpon>FormShowGroupBox.cs</DependentUpon>
|
||||
<EmbeddedResource Include="AA-Forms\FormShowUserControl.resx">
|
||||
<DependentUpon>FormShowUserControl.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="AA-Forms\FormTourenplanung.resx">
|
||||
<DependentUpon>FormTourenplanung.cs</DependentUpon>
|
||||
|
||||
@ -95,5 +95,5 @@ Build-Info:
|
||||
- 🔄 Wenn Frottee-Expedit auch Relamation bearbeitet, muss BenutzerRolle abgefragt werden. siehe CHANGES. [FormFehlmengeCount.cs]
|
||||
- 🔄 Zuweisung zu Fahrer muss geklärt werden. [Funktionen.cs]
|
||||
|
||||
Installation: 16.04.2026 11:19
|
||||
Installation: 17.04.2026 07:41
|
||||
=====================================
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user