Удалены кнопки отдать на выполнение и готов
This commit is contained in:
Данияр Аглиуллов
parent
232c0f49dc
commit
11a9e9b806
94
Confectionery/FormMain.Designer.cs
generated
94
Confectionery/FormMain.Designer.cs
generated
@ -33,6 +33,8 @@
|
||||
pastryToolStripMenuItem = new ToolStripMenuItem();
|
||||
componentToolStripMenuItem = new ToolStripMenuItem();
|
||||
ShopsToolStripMenuItem = new ToolStripMenuItem();
|
||||
clientsToolStripMenuItem = new ToolStripMenuItem();
|
||||
ImplementersToolStripMenuItem = new ToolStripMenuItem();
|
||||
reportsToolStripMenuItem = new ToolStripMenuItem();
|
||||
reportShopsToolStripMenuItem = new ToolStripMenuItem();
|
||||
ShopPastriesToolStripMenuItem = new ToolStripMenuItem();
|
||||
@ -40,17 +42,13 @@
|
||||
pastriesToolStripMenuItem = new ToolStripMenuItem();
|
||||
pastryComponentsToolStripMenuItem = new ToolStripMenuItem();
|
||||
ordersToolStripMenuItem = new ToolStripMenuItem();
|
||||
DoWorkToolStripMenuItem = new ToolStripMenuItem();
|
||||
dataGridView = new DataGridView();
|
||||
buttonCreateOrder = new Button();
|
||||
buttonTakeOrderInWork = new Button();
|
||||
button2 = new Button();
|
||||
button3 = new Button();
|
||||
button4 = new Button();
|
||||
buttonAddPastryInShop = new Button();
|
||||
ImplementersToolStripMenuItem = new ToolStripMenuItem();
|
||||
DoWorkToolStripMenuItem = new ToolStripMenuItem();
|
||||
buttonSellPastry = new Button();
|
||||
clientsToolStripMenuItem = new ToolStripMenuItem();
|
||||
menuStrip1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
|
||||
SuspendLayout();
|
||||
@ -74,24 +72,38 @@
|
||||
// pastryToolStripMenuItem
|
||||
//
|
||||
pastryToolStripMenuItem.Name = "pastryToolStripMenuItem";
|
||||
pastryToolStripMenuItem.Size = new Size(180, 22);
|
||||
pastryToolStripMenuItem.Size = new Size(149, 22);
|
||||
pastryToolStripMenuItem.Text = "Изделия";
|
||||
pastryToolStripMenuItem.Click += PastryToolStripMenuItem_Click;
|
||||
//
|
||||
// componentToolStripMenuItem
|
||||
//
|
||||
componentToolStripMenuItem.Name = "componentToolStripMenuItem";
|
||||
componentToolStripMenuItem.Size = new Size(180, 22);
|
||||
componentToolStripMenuItem.Size = new Size(149, 22);
|
||||
componentToolStripMenuItem.Text = "Компоненты";
|
||||
componentToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
|
||||
//
|
||||
// ShopsToolStripMenuItem
|
||||
//
|
||||
ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
|
||||
ShopsToolStripMenuItem.Size = new Size(145, 22);
|
||||
ShopsToolStripMenuItem.Size = new Size(149, 22);
|
||||
ShopsToolStripMenuItem.Text = "Магазины";
|
||||
ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
|
||||
//
|
||||
// clientsToolStripMenuItem
|
||||
//
|
||||
clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
|
||||
clientsToolStripMenuItem.Size = new Size(149, 22);
|
||||
clientsToolStripMenuItem.Text = "Клиенты";
|
||||
clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
|
||||
//
|
||||
// ImplementersToolStripMenuItem
|
||||
//
|
||||
ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
|
||||
ImplementersToolStripMenuItem.Size = new Size(149, 22);
|
||||
ImplementersToolStripMenuItem.Text = "Исполнители";
|
||||
ImplementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
|
||||
//
|
||||
// reportsToolStripMenuItem
|
||||
//
|
||||
reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { reportShopsToolStripMenuItem, ShopPastriesToolStripMenuItem, groupOrdersToolStripMenuItem, pastriesToolStripMenuItem, pastryComponentsToolStripMenuItem, ordersToolStripMenuItem });
|
||||
@ -102,14 +114,14 @@
|
||||
// reportShopsToolStripMenuItem
|
||||
//
|
||||
reportShopsToolStripMenuItem.Name = "reportShopsToolStripMenuItem";
|
||||
reportShopsToolStripMenuItem.Size = new Size(202, 22);
|
||||
reportShopsToolStripMenuItem.Size = new Size(215, 22);
|
||||
reportShopsToolStripMenuItem.Text = "Список магазинов";
|
||||
reportShopsToolStripMenuItem.Click += ReportShopsToolStripMenuItem_Click;
|
||||
//
|
||||
// ShopPastriesToolStripMenuItem
|
||||
//
|
||||
ShopPastriesToolStripMenuItem.Name = "ShopPastriesToolStripMenuItem";
|
||||
ShopPastriesToolStripMenuItem.Size = new Size(202, 22);
|
||||
ShopPastriesToolStripMenuItem.Size = new Size(215, 22);
|
||||
ShopPastriesToolStripMenuItem.Text = "Магазины с изделиями";
|
||||
ShopPastriesToolStripMenuItem.Click += ShopPastriesToolStripMenuItem_Click;
|
||||
//
|
||||
@ -137,10 +149,17 @@
|
||||
// ordersToolStripMenuItem
|
||||
//
|
||||
ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
|
||||
ordersToolStripMenuItem.Size = new Size(202, 22);
|
||||
ordersToolStripMenuItem.Size = new Size(215, 22);
|
||||
ordersToolStripMenuItem.Text = "Список заказов";
|
||||
ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
|
||||
//
|
||||
// DoWorkToolStripMenuItem
|
||||
//
|
||||
DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
|
||||
DoWorkToolStripMenuItem.Size = new Size(92, 20);
|
||||
DoWorkToolStripMenuItem.Text = "Запуск работ";
|
||||
DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
|
||||
//
|
||||
// dataGridView
|
||||
//
|
||||
dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
|
||||
@ -162,32 +181,10 @@
|
||||
buttonCreateOrder.UseVisualStyleBackColor = true;
|
||||
buttonCreateOrder.Click += ButtonCreateOrder_Click;
|
||||
//
|
||||
// buttonTakeOrderInWork
|
||||
//
|
||||
buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
||||
buttonTakeOrderInWork.Location = new Point(624, 98);
|
||||
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
|
||||
buttonTakeOrderInWork.Size = new Size(147, 32);
|
||||
buttonTakeOrderInWork.TabIndex = 3;
|
||||
buttonTakeOrderInWork.Text = "Отдать на выполнение";
|
||||
buttonTakeOrderInWork.UseVisualStyleBackColor = true;
|
||||
buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
|
||||
//
|
||||
// button2
|
||||
//
|
||||
button2.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
||||
button2.Location = new Point(624, 157);
|
||||
button2.Name = "button2";
|
||||
button2.Size = new Size(147, 32);
|
||||
button2.TabIndex = 4;
|
||||
button2.Text = "Заказ готов";
|
||||
button2.UseVisualStyleBackColor = true;
|
||||
button2.Click += ButtonOrderReady_Click;
|
||||
//
|
||||
// button3
|
||||
//
|
||||
button3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
||||
button3.Location = new Point(624, 215);
|
||||
button3.Location = new Point(624, 95);
|
||||
button3.Name = "button3";
|
||||
button3.Size = new Size(147, 32);
|
||||
button3.TabIndex = 5;
|
||||
@ -198,7 +195,7 @@
|
||||
// button4
|
||||
//
|
||||
button4.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
||||
button4.Location = new Point(624, 274);
|
||||
button4.Location = new Point(624, 154);
|
||||
button4.Name = "button4";
|
||||
button4.Size = new Size(147, 32);
|
||||
button4.TabIndex = 6;
|
||||
@ -216,24 +213,10 @@
|
||||
buttonAddPastryInShop.Text = "Пополнение магазина";
|
||||
buttonAddPastryInShop.UseVisualStyleBackColor = true;
|
||||
buttonAddPastryInShop.Click += ButtonAddPastryInShop_Click;
|
||||
//
|
||||
// ImplementersToolStripMenuItem
|
||||
//
|
||||
ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
|
||||
ImplementersToolStripMenuItem.Size = new Size(180, 22);
|
||||
ImplementersToolStripMenuItem.Text = "Исполнители";
|
||||
ImplementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
|
||||
//
|
||||
// DoWorkToolStripMenuItem
|
||||
//
|
||||
DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
|
||||
DoWorkToolStripMenuItem.Size = new Size(92, 20);
|
||||
DoWorkToolStripMenuItem.Text = "Запуск работ";
|
||||
DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
|
||||
//
|
||||
// buttonSellPastry
|
||||
//
|
||||
buttonSellPastry.Anchor = AnchorStyles.Top | AnchorStyles.Right;
|
||||
buttonSellPastry.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
|
||||
buttonSellPastry.Location = new Point(624, 331);
|
||||
buttonSellPastry.Name = "buttonSellPastry";
|
||||
buttonSellPastry.Size = new Size(147, 31);
|
||||
@ -242,13 +225,6 @@
|
||||
buttonSellPastry.UseVisualStyleBackColor = true;
|
||||
buttonSellPastry.Click += ButtonSellPastry_Click;
|
||||
//
|
||||
// clientsToolStripMenuItem
|
||||
//
|
||||
clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
|
||||
clientsToolStripMenuItem.Size = new Size(180, 22);
|
||||
clientsToolStripMenuItem.Text = "Клиенты";
|
||||
clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
|
||||
//
|
||||
// FormMain
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
@ -258,8 +234,6 @@
|
||||
Controls.Add(buttonAddPastryInShop);
|
||||
Controls.Add(button4);
|
||||
Controls.Add(button3);
|
||||
Controls.Add(button2);
|
||||
Controls.Add(buttonTakeOrderInWork);
|
||||
Controls.Add(buttonCreateOrder);
|
||||
Controls.Add(dataGridView);
|
||||
Controls.Add(menuStrip1);
|
||||
@ -280,8 +254,6 @@
|
||||
private ToolStripMenuItem справочникиToolStripMenuItem;
|
||||
private DataGridView dataGridView;
|
||||
private Button buttonCreateOrder;
|
||||
private Button buttonTakeOrderInWork;
|
||||
private Button button2;
|
||||
private Button button3;
|
||||
private Button button4;
|
||||
private ToolStripMenuItem pastryToolStripMenuItem;
|
||||
|
||||
@ -79,56 +79,6 @@ namespace ConfectioneryView
|
||||
}
|
||||
}
|
||||
|
||||
private void ButtonTakeOrderInWork_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (dataGridView.SelectedRows.Count == 1)
|
||||
{
|
||||
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
|
||||
_logger.LogInformation("Çàêàç No{id}. Ìåíÿåòñÿ ñòàòóñ íà 'Â ðàáîòå'", id);
|
||||
try
|
||||
{
|
||||
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id });
|
||||
if (!operationResult)
|
||||
{
|
||||
throw new Exception("Îøèáêà ïðè ñîõðàíåíèè. Äîïîëíèòåëüíàÿ èíôîðìàöèÿ â ëîãàõ.");
|
||||
}
|
||||
LoadData();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Îøèáêà ïåðåäà÷è çàêàçà â ðàáîòó");
|
||||
MessageBox.Show(ex.Message, "Îøèáêà", MessageBoxButtons.OK,
|
||||
MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
private void ButtonOrderReady_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (dataGridView.SelectedRows.Count == 1)
|
||||
{
|
||||
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
|
||||
OrderStatus orderStatus = (OrderStatus)dataGridView.SelectedRows[0].Cells["Status"].Value;
|
||||
_logger.LogInformation("Çàêàç No{id}. Ìåíÿåòñÿ ñòàòóñ íà 'Ãîòîâ'", id);
|
||||
try
|
||||
{
|
||||
var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
|
||||
{
|
||||
Id = id,
|
||||
Status = orderStatus
|
||||
});
|
||||
if (!operationResult)
|
||||
{
|
||||
throw new Exception("Îøèáêà ïðè ñîõðàíåíèè. Äîïîëíèòåëüíàÿ èíôîðìàöèÿ â ëîãàõ.");
|
||||
}
|
||||
LoadData();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Îøèáêà îòìåòêè î ãîòîâíîñòè çàêàçà");
|
||||
MessageBox.Show(ex.Message, "Îøèáêà", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
private void ButtonIssuedOrder_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (dataGridView.SelectedRows.Count == 1)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user