diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
index 6248df9..a432484 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
@@ -34,33 +34,32 @@
this.buttonOrderReady = new System.Windows.Forms.Button();
this.buttonIssuedOrder = new System.Windows.Forms.Button();
this.buttonRef = new System.Windows.Forms.Button();
- this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.menuStrip = new System.Windows.Forms.MenuStrip();
this.toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.workPieceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.manufactureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.shopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.addManufactureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.buttonSellManufacture = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
- this.menuStrip1.SuspendLayout();
+ this.menuStrip.SuspendLayout();
this.SuspendLayout();
//
// dataGridView
//
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridView.Location = new System.Drawing.Point(10, 27);
- this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dataGridView.Location = new System.Drawing.Point(11, 36);
this.dataGridView.Name = "dataGridView";
this.dataGridView.RowHeadersWidth = 51;
this.dataGridView.RowTemplate.Height = 29;
- this.dataGridView.Size = new System.Drawing.Size(820, 302);
+ this.dataGridView.Size = new System.Drawing.Size(937, 448);
this.dataGridView.TabIndex = 0;
//
// buttonCreateOrder
//
- this.buttonCreateOrder.Location = new System.Drawing.Point(887, 50);
- this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.buttonCreateOrder.Location = new System.Drawing.Point(1014, 67);
this.buttonCreateOrder.Name = "buttonCreateOrder";
- this.buttonCreateOrder.Size = new System.Drawing.Size(206, 22);
+ this.buttonCreateOrder.Size = new System.Drawing.Size(235, 29);
this.buttonCreateOrder.TabIndex = 1;
this.buttonCreateOrder.Text = "Создать заказ";
this.buttonCreateOrder.UseVisualStyleBackColor = true;
@@ -68,10 +67,9 @@
//
// buttonTakeOrderInWork
//
- this.buttonTakeOrderInWork.Location = new System.Drawing.Point(887, 107);
- this.buttonTakeOrderInWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.buttonTakeOrderInWork.Location = new System.Drawing.Point(1014, 143);
this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
- this.buttonTakeOrderInWork.Size = new System.Drawing.Size(206, 22);
+ this.buttonTakeOrderInWork.Size = new System.Drawing.Size(235, 29);
this.buttonTakeOrderInWork.TabIndex = 2;
this.buttonTakeOrderInWork.Text = "Отдать на выполнение";
this.buttonTakeOrderInWork.UseVisualStyleBackColor = true;
@@ -79,10 +77,9 @@
//
// buttonOrderReady
//
- this.buttonOrderReady.Location = new System.Drawing.Point(887, 165);
- this.buttonOrderReady.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.buttonOrderReady.Location = new System.Drawing.Point(1014, 220);
this.buttonOrderReady.Name = "buttonOrderReady";
- this.buttonOrderReady.Size = new System.Drawing.Size(206, 22);
+ this.buttonOrderReady.Size = new System.Drawing.Size(235, 29);
this.buttonOrderReady.TabIndex = 3;
this.buttonOrderReady.Text = "Заказ готов";
this.buttonOrderReady.UseVisualStyleBackColor = true;
@@ -90,10 +87,9 @@
//
// buttonIssuedOrder
//
- this.buttonIssuedOrder.Location = new System.Drawing.Point(887, 222);
- this.buttonIssuedOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.buttonIssuedOrder.Location = new System.Drawing.Point(1014, 296);
this.buttonIssuedOrder.Name = "buttonIssuedOrder";
- this.buttonIssuedOrder.Size = new System.Drawing.Size(206, 22);
+ this.buttonIssuedOrder.Size = new System.Drawing.Size(235, 29);
this.buttonIssuedOrder.TabIndex = 4;
this.buttonIssuedOrder.Text = "Заказ выдан";
this.buttonIssuedOrder.UseVisualStyleBackColor = true;
@@ -101,26 +97,25 @@
//
// buttonRef
//
- this.buttonRef.Location = new System.Drawing.Point(887, 277);
- this.buttonRef.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.buttonRef.Location = new System.Drawing.Point(1014, 369);
this.buttonRef.Name = "buttonRef";
- this.buttonRef.Size = new System.Drawing.Size(206, 22);
+ this.buttonRef.Size = new System.Drawing.Size(235, 29);
this.buttonRef.TabIndex = 5;
this.buttonRef.Text = "Обновить";
this.buttonRef.UseVisualStyleBackColor = true;
this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
//
- // menuStrip1
+ // menuStrip
//
- this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
- this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
+ this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem});
- this.menuStrip1.Location = new System.Drawing.Point(0, 0);
- this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2);
- this.menuStrip1.Size = new System.Drawing.Size(1135, 24);
- this.menuStrip1.TabIndex = 6;
- this.menuStrip1.Text = "menuStrip1";
+ this.menuStrip.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip.Name = "menuStrip";
+ this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 3, 0, 3);
+ this.menuStrip.Size = new System.Drawing.Size(1297, 30);
+ this.menuStrip.TabIndex = 6;
+ this.menuStrip.Text = "menuStrip1";
//
// toolStripMenuItem
//
@@ -130,57 +125,67 @@
this.shopToolStripMenuItem,
this.addManufactureToolStripMenuItem});
this.toolStripMenuItem.Name = "toolStripMenuItem";
- this.toolStripMenuItem.Size = new System.Drawing.Size(94, 20);
+ this.toolStripMenuItem.Size = new System.Drawing.Size(117, 24);
this.toolStripMenuItem.Text = "Справочники";
//
// workPieceToolStripMenuItem
//
this.workPieceToolStripMenuItem.Name = "workPieceToolStripMenuItem";
- this.workPieceToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+ this.workPieceToolStripMenuItem.Size = new System.Drawing.Size(251, 26);
this.workPieceToolStripMenuItem.Text = "Заготовки";
this.workPieceToolStripMenuItem.Click += new System.EventHandler(this.WorkPieceToolStripMenuItem_Click);
//
// manufactureToolStripMenuItem
//
this.manufactureToolStripMenuItem.Name = "manufactureToolStripMenuItem";
- this.manufactureToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+ this.manufactureToolStripMenuItem.Size = new System.Drawing.Size(251, 26);
this.manufactureToolStripMenuItem.Text = "Изделия";
this.manufactureToolStripMenuItem.Click += new System.EventHandler(this.ManufactureToolStripMenuItem_Click);
//
// shopToolStripMenuItem
//
this.shopToolStripMenuItem.Name = "shopToolStripMenuItem";
- this.shopToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+ this.shopToolStripMenuItem.Size = new System.Drawing.Size(251, 26);
this.shopToolStripMenuItem.Text = "Магазины";
this.shopToolStripMenuItem.Click += new System.EventHandler(this.ShopToolStripMenuItem_Click);
//
// addManufactureToolStripMenuItem
//
this.addManufactureToolStripMenuItem.Name = "addManufactureToolStripMenuItem";
- this.addManufactureToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+ this.addManufactureToolStripMenuItem.Size = new System.Drawing.Size(251, 26);
this.addManufactureToolStripMenuItem.Text = "Пополнение магазина";
this.addManufactureToolStripMenuItem.Click += new System.EventHandler(this.AddManufactureToolStripMenuItem_Click);
//
+ // buttonSellManufacture
+ //
+ this.buttonSellManufacture.Location = new System.Drawing.Point(1014, 440);
+ this.buttonSellManufacture.Name = "buttonSellManufacture";
+ this.buttonSellManufacture.Size = new System.Drawing.Size(233, 29);
+ this.buttonSellManufacture.TabIndex = 7;
+ this.buttonSellManufacture.Text = "Продажа изделий";
+ this.buttonSellManufacture.UseVisualStyleBackColor = true;
+ this.buttonSellManufacture.Click += new System.EventHandler(this.ButtonSellManufacture_Click);
+ //
// FormMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1135, 338);
+ this.ClientSize = new System.Drawing.Size(1297, 496);
+ this.Controls.Add(this.buttonSellManufacture);
this.Controls.Add(this.buttonRef);
this.Controls.Add(this.buttonIssuedOrder);
this.Controls.Add(this.buttonOrderReady);
this.Controls.Add(this.buttonTakeOrderInWork);
this.Controls.Add(this.buttonCreateOrder);
this.Controls.Add(this.dataGridView);
- this.Controls.Add(this.menuStrip1);
- this.MainMenuStrip = this.menuStrip1;
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Controls.Add(this.menuStrip);
+ this.MainMenuStrip = this.menuStrip;
this.Name = "FormMain";
this.Text = "Кузнечная мастерская";
this.Load += new System.EventHandler(this.FormMain_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
- this.menuStrip1.ResumeLayout(false);
- this.menuStrip1.PerformLayout();
+ this.menuStrip.ResumeLayout(false);
+ this.menuStrip.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -194,11 +199,12 @@
private Button buttonOrderReady;
private Button buttonIssuedOrder;
private Button buttonRef;
- private MenuStrip menuStrip1;
+ private MenuStrip menuStrip;
private ToolStripMenuItem toolStripMenuItem;
private ToolStripMenuItem workPieceToolStripMenuItem;
private ToolStripMenuItem manufactureToolStripMenuItem;
private ToolStripMenuItem shopToolStripMenuItem;
private ToolStripMenuItem addManufactureToolStripMenuItem;
+ private Button buttonSellManufacture;
}
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
index b740d55..a3c9c40 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
@@ -177,11 +177,31 @@ namespace BlacksmithWorkshop
}
}
+ private void ButtonSellIceCream_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormSellManufacture));
+ if (service is FormSellManufacture form)
+ {
+ form.ShowDialog();
+ LoadData();
+ }
+ }
+
private void ButtonRef_Click(object sender, EventArgs e)
{
LoadData();
}
+ private void ButtonSellManufacture_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormSellManufacture));
+ if (service is FormSellManufacture form)
+ {
+ form.ShowDialog();
+ LoadData();
+ }
+ }
+
private void ShopToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormShops));
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.resx
index 938108a..019817b 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.resx
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.resx
@@ -57,7 +57,10 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
17, 17
+
+ 63
+
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.Designer.cs
new file mode 100644
index 0000000..05b68d7
--- /dev/null
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.Designer.cs
@@ -0,0 +1,39 @@
+namespace BlacksmithWorkshop
+{
+ partial class FormSellManufacture
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Text = "FormSellManufacture";
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.cs
new file mode 100644
index 0000000..baf2751
--- /dev/null
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace BlacksmithWorkshop
+{
+ public partial class FormSellManufacture : Form
+ {
+ public FormSellManufacture()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
\ No newline at end of file