diff --git a/GarmentFactory/FormAddTextile.cs b/GarmentFactory/FormAddTextile.cs index d234f54..0b26d2b 100644 --- a/GarmentFactory/FormAddTextile.cs +++ b/GarmentFactory/FormAddTextile.cs @@ -78,7 +78,7 @@ namespace GarmentFactoryView _logger.LogInformation("Пополнение магазина"); try { - var operationResult = _logicS.AddTextile(new SupplyBindingModel + var operationResult = _logicS.MakeSupply(new SupplyBindingModel { ShopId = Convert.ToInt32(comboBoxShop.SelectedValue), TextileId = Convert.ToInt32(comboBoxTextile.SelectedValue), diff --git a/GarmentFactory/FormMain.Designer.cs b/GarmentFactory/FormMain.Designer.cs index ddc02c3..62b7269 100644 --- a/GarmentFactory/FormMain.Designer.cs +++ b/GarmentFactory/FormMain.Designer.cs @@ -1,201 +1,219 @@ namespace GarmentFactoryView { - partial class FormMain - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class FormMain + { + /// + /// 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); - } + /// + /// 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 + #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() - { - dataGridView = new DataGridView(); - buttonCreateOrder = new Button(); - buttonTakeOrderInWork = new Button(); - buttonOrderReady = new Button(); - buttonCompletedOrder = new Button(); - buttonRefresh = new Button(); - menuStrip1 = new MenuStrip(); - справочникиToolStripMenuItem = new ToolStripMenuItem(); - компонентыToolStripMenuItem = new ToolStripMenuItem(); - текстилиToolStripMenuItem = new ToolStripMenuItem(); - магазиныToolStripMenuItem = new ToolStripMenuItem(); - пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - menuStrip1.SuspendLayout(); - SuspendLayout(); - // - // dataGridView - // - dataGridView.AllowUserToAddRows = false; - dataGridView.AllowUserToDeleteRows = false; - dataGridView.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(0, 31); - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersVisible = false; - dataGridView.RowHeadersWidth = 51; - dataGridView.RowTemplate.Height = 29; - dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(950, 425); - dataGridView.TabIndex = 0; - // - // buttonCreateOrder - // - buttonCreateOrder.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); - buttonCreateOrder.Location = new Point(977, 80); - buttonCreateOrder.Name = "buttonCreateOrder"; - buttonCreateOrder.Size = new Size(180, 40); - buttonCreateOrder.TabIndex = 1; - buttonCreateOrder.Text = "Создать заказ"; - buttonCreateOrder.UseVisualStyleBackColor = true; - buttonCreateOrder.Click += ButtonCreateOrder_Click; - // - // buttonTakeOrderInWork - // - buttonTakeOrderInWork.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); - buttonTakeOrderInWork.Location = new Point(977, 147); - buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; - buttonTakeOrderInWork.Size = new Size(180, 40); - buttonTakeOrderInWork.TabIndex = 2; - buttonTakeOrderInWork.Text = "Отдать на выполнение"; - buttonTakeOrderInWork.UseVisualStyleBackColor = true; - buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; - // - // buttonOrderReady - // - buttonOrderReady.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); - buttonOrderReady.Location = new Point(977, 217); - buttonOrderReady.Name = "buttonOrderReady"; - buttonOrderReady.Size = new Size(180, 40); - buttonOrderReady.TabIndex = 3; - buttonOrderReady.Text = "Заказ готов"; - buttonOrderReady.UseVisualStyleBackColor = true; - buttonOrderReady.Click += ButtonOrderReady_Click; - // - // buttonCompletedOrder - // - buttonCompletedOrder.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); - buttonCompletedOrder.Location = new Point(977, 285); - buttonCompletedOrder.Name = "buttonCompletedOrder"; - buttonCompletedOrder.Size = new Size(180, 40); - buttonCompletedOrder.TabIndex = 4; - buttonCompletedOrder.Text = "Заказ выдан"; - buttonCompletedOrder.UseVisualStyleBackColor = true; - buttonCompletedOrder.Click += ButtonCompletedOrder_Click; - // - // buttonRefresh - // - buttonRefresh.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); - buttonRefresh.Location = new Point(977, 363); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(180, 40); - buttonRefresh.TabIndex = 5; - buttonRefresh.Text = "Обновить список"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; - // - // menuStrip1 - // - menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem }); - menuStrip1.Location = new Point(0, 0); - menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(1169, 28); - menuStrip1.TabIndex = 7; - menuStrip1.Text = "menuStrip1"; - // - // справочникиToolStripMenuItem - // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, текстилиToolStripMenuItem, магазиныToolStripMenuItem }); - справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - справочникиToolStripMenuItem.Size = new Size(117, 24); - справочникиToolStripMenuItem.Text = "Справочники"; - // - // компонентыToolStripMenuItem - // - компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(224, 26); - компонентыToolStripMenuItem.Text = "Компоненты"; - компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; - // - // текстилиToolStripMenuItem - // - текстилиToolStripMenuItem.Name = "текстилиToolStripMenuItem"; - текстилиToolStripMenuItem.Size = new Size(224, 26); - текстилиToolStripMenuItem.Text = "Текстили"; - текстилиToolStripMenuItem.Click += текстилиToolStripMenuItem_Click; - // - // магазиныToolStripMenuItem - // - магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - магазиныToolStripMenuItem.Size = new Size(224, 26); - магазиныToolStripMenuItem.Text = "Магазины"; - магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click; - // - // пополнениеМагазинаToolStripMenuItem - // - пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; - пополнениеМагазинаToolStripMenuItem.Size = new Size(182, 24); - пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; - пополнениеМагазинаToolStripMenuItem.Click += пополнениеМагазинаToolStripMenuItem_Click; - // - // FormMain - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1169, 453); - Controls.Add(menuStrip1); - Controls.Add(buttonRefresh); - Controls.Add(buttonCompletedOrder); - Controls.Add(buttonOrderReady); - Controls.Add(buttonTakeOrderInWork); - Controls.Add(buttonCreateOrder); - Controls.Add(dataGridView); - MainMenuStrip = menuStrip1; - Name = "FormMain"; - Text = "Швейная фабрика"; - Load += FormMain_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - menuStrip1.ResumeLayout(false); - menuStrip1.PerformLayout(); - ResumeLayout(false); - PerformLayout(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + buttonCreateOrder = new Button(); + buttonTakeOrderInWork = new Button(); + buttonOrderReady = new Button(); + buttonCompletedOrder = new Button(); + buttonRefresh = new Button(); + menuStrip1 = new MenuStrip(); + справочникиToolStripMenuItem = new ToolStripMenuItem(); + компонентыToolStripMenuItem = new ToolStripMenuItem(); + текстилиToolStripMenuItem = new ToolStripMenuItem(); + магазиныToolStripMenuItem = new ToolStripMenuItem(); + операцииToolStripMenuItem = new ToolStripMenuItem(); + пополнениеМагазинаToolStripMenuItem1 = new ToolStripMenuItem(); + продажаТовараToolStripMenuItem = new ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + menuStrip1.SuspendLayout(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(0, 31); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(950, 425); + dataGridView.TabIndex = 0; + // + // buttonCreateOrder + // + buttonCreateOrder.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + buttonCreateOrder.Location = new Point(977, 80); + buttonCreateOrder.Name = "buttonCreateOrder"; + buttonCreateOrder.Size = new Size(180, 40); + buttonCreateOrder.TabIndex = 1; + buttonCreateOrder.Text = "Создать заказ"; + buttonCreateOrder.UseVisualStyleBackColor = true; + buttonCreateOrder.Click += ButtonCreateOrder_Click; + // + // buttonTakeOrderInWork + // + buttonTakeOrderInWork.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + buttonTakeOrderInWork.Location = new Point(977, 147); + buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; + buttonTakeOrderInWork.Size = new Size(180, 40); + buttonTakeOrderInWork.TabIndex = 2; + buttonTakeOrderInWork.Text = "Отдать на выполнение"; + buttonTakeOrderInWork.UseVisualStyleBackColor = true; + buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; + // + // buttonOrderReady + // + buttonOrderReady.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + buttonOrderReady.Location = new Point(977, 217); + buttonOrderReady.Name = "buttonOrderReady"; + buttonOrderReady.Size = new Size(180, 40); + buttonOrderReady.TabIndex = 3; + buttonOrderReady.Text = "Заказ готов"; + buttonOrderReady.UseVisualStyleBackColor = true; + buttonOrderReady.Click += ButtonOrderReady_Click; + // + // buttonCompletedOrder + // + buttonCompletedOrder.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + buttonCompletedOrder.Location = new Point(977, 285); + buttonCompletedOrder.Name = "buttonCompletedOrder"; + buttonCompletedOrder.Size = new Size(180, 40); + buttonCompletedOrder.TabIndex = 4; + buttonCompletedOrder.Text = "Заказ выдан"; + buttonCompletedOrder.UseVisualStyleBackColor = true; + buttonCompletedOrder.Click += ButtonCompletedOrder_Click; + // + // buttonRefresh + // + buttonRefresh.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + buttonRefresh.Location = new Point(977, 363); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(180, 40); + buttonRefresh.TabIndex = 5; + buttonRefresh.Text = "Обновить список"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // menuStrip1 + // + menuStrip1.ImageScalingSize = new Size(20, 20); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem }); + menuStrip1.Location = new Point(0, 0); + menuStrip1.Name = "menuStrip1"; + menuStrip1.Size = new Size(1169, 28); + menuStrip1.TabIndex = 7; + menuStrip1.Text = "menuStrip1"; + // + // справочникиToolStripMenuItem + // + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, текстилиToolStripMenuItem, магазиныToolStripMenuItem }); + справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; + справочникиToolStripMenuItem.Size = new Size(117, 24); + справочникиToolStripMenuItem.Text = "Справочники"; + // + // компонентыToolStripMenuItem + // + компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + компонентыToolStripMenuItem.Size = new Size(182, 26); + компонентыToolStripMenuItem.Text = "Компоненты"; + компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; + // + // текстилиToolStripMenuItem + // + текстилиToolStripMenuItem.Name = "текстилиToolStripMenuItem"; + текстилиToolStripMenuItem.Size = new Size(182, 26); + текстилиToolStripMenuItem.Text = "Текстили"; + текстилиToolStripMenuItem.Click += текстилиToolStripMenuItem_Click; + // + // магазиныToolStripMenuItem + // + магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + магазиныToolStripMenuItem.Size = new Size(182, 26); + магазиныToolStripMenuItem.Text = "Магазины"; + магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click; + // + // операцииToolStripMenuItem + // + операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { пополнениеМагазинаToolStripMenuItem1, продажаТовараToolStripMenuItem }); + операцииToolStripMenuItem.Name = "операцииToolStripMenuItem"; + операцииToolStripMenuItem.Size = new Size(95, 24); + операцииToolStripMenuItem.Text = "Операции"; + // + // пополнениеМагазинаToolStripMenuItem1 + // + пополнениеМагазинаToolStripMenuItem1.Name = "пополнениеМагазинаToolStripMenuItem1"; + пополнениеМагазинаToolStripMenuItem1.Size = new Size(251, 26); + пополнениеМагазинаToolStripMenuItem1.Text = "Пополнение магазина"; + пополнениеМагазинаToolStripMenuItem1.Click += пополнениеМагазинаToolStripMenuItem1_Click; + // + // продажаТовараToolStripMenuItem + // + продажаТовараToolStripMenuItem.Name = "продажаТовараToolStripMenuItem"; + продажаТовараToolStripMenuItem.Size = new Size(251, 26); + продажаТовараToolStripMenuItem.Text = "Продажа товара"; + продажаТовараToolStripMenuItem.Click += продажаТовараToolStripMenuItem_Click; + // + // FormMain + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1169, 453); + Controls.Add(menuStrip1); + Controls.Add(buttonRefresh); + Controls.Add(buttonCompletedOrder); + Controls.Add(buttonOrderReady); + Controls.Add(buttonTakeOrderInWork); + Controls.Add(buttonCreateOrder); + Controls.Add(dataGridView); + MainMenuStrip = menuStrip1; + Name = "FormMain"; + Text = "Швейная фабрика"; + Load += FormMain_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + menuStrip1.ResumeLayout(false); + menuStrip1.PerformLayout(); + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private DataGridView dataGridView; - private Button buttonCreateOrder; - private Button buttonTakeOrderInWork; - private Button buttonOrderReady; - private Button buttonCompletedOrder; - private Button buttonRefresh; - private MenuStrip menuStrip1; - private ToolStripMenuItem справочникиToolStripMenuItem; - private ToolStripMenuItem компонентыToolStripMenuItem; - private ToolStripMenuItem текстилиToolStripMenuItem; - private ToolStripMenuItem магазиныToolStripMenuItem; - private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; - } + private DataGridView dataGridView; + private Button buttonCreateOrder; + private Button buttonTakeOrderInWork; + private Button buttonOrderReady; + private Button buttonCompletedOrder; + private Button buttonRefresh; + private MenuStrip menuStrip1; + private ToolStripMenuItem справочникиToolStripMenuItem; + private ToolStripMenuItem компонентыToolStripMenuItem; + private ToolStripMenuItem текстилиToolStripMenuItem; + private ToolStripMenuItem магазиныToolStripMenuItem; + private ToolStripMenuItem операцииToolStripMenuItem; + private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem1; + private ToolStripMenuItem продажаТовараToolStripMenuItem; + } } \ No newline at end of file diff --git a/GarmentFactory/FormMain.cs b/GarmentFactory/FormMain.cs index 41ce8b7..310a9f8 100644 --- a/GarmentFactory/FormMain.cs +++ b/GarmentFactory/FormMain.cs @@ -14,159 +14,168 @@ using System.Windows.Forms; namespace GarmentFactoryView { - public partial class FormMain : Form - { - private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic) - { - InitializeComponent(); - _logger = logger; - _orderLogic = orderLogic; - } - private void LoadData() - { - _logger.LogInformation("Загрузка заказов"); - try - { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["TextileId"].Visible = false; - dataGridView.Columns["TextileName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка заказов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки заказов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void FormMain_Load(object sender, EventArgs e) - { - LoadData(); - } + public partial class FormMain : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + } + private void LoadData() + { + _logger.LogInformation("Загрузка заказов"); + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["TextileId"].Visible = false; + dataGridView.Columns["TextileName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } - private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { - form.ShowDialog(); - } + private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + if (service is FormComponents form) + { + form.ShowDialog(); + } - } + } - private void текстилиToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormTextiles)); - if (service is FormTextiles form) - { - form.ShowDialog(); - } - } + private void текстилиToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormTextiles)); + if (service is FormTextiles form) + { + form.ShowDialog(); + } + } - private void магазиныToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + private void магазиныToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShops)); - if (service is FormShops form) - { - form.ShowDialog(); - } - } + if (service is FormShops form) + { + form.ShowDialog(); + } + } - private void пополнениеМагазинаToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormAddTextile)); + private void ButtonCreateOrder_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + if (service is FormCreateOrder form) + { + form.ShowDialog(); + LoadData(); + } + } + 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("Заказ №{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); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); + try + { + var operationResult = _orderLogic.FinishOrder(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 ButtonCompletedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Заказ №{id} выдан", id); + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void ButtonRefresh_Click(object sender, EventArgs e) + { + LoadData(); + } - if (service is FormAddTextile form) - { - form.ShowDialog(); - } - } + private void пополнениеМагазинаToolStripMenuItem1_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormAddTextile)); - private void ButtonCreateOrder_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) - { - form.ShowDialog(); - LoadData(); - } - } - 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("Заказ №{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); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); - try - { - var operationResult = _orderLogic.FinishOrder(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 ButtonCompletedOrder_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); - try - { - var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - _logger.LogInformation("Заказ №{id} выдан", id); - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - private void ButtonRefresh_Click(object sender, EventArgs e) - { - LoadData(); - } - } + if (service is FormAddTextile form) + { + form.ShowDialog(); + } + } + + private void продажаТовараToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormSellTextile)); + if (service is FormSellTextile form) + { + form.ShowDialog(); + } + } + } } diff --git a/GarmentFactory/FormSellTextile.Designer.cs b/GarmentFactory/FormSellTextile.Designer.cs new file mode 100644 index 0000000..c21f0f5 --- /dev/null +++ b/GarmentFactory/FormSellTextile.Designer.cs @@ -0,0 +1,119 @@ +namespace GarmentFactoryView +{ + partial class FormSellTextile + { + /// + /// 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() + { + labelTextile = new Label(); + comboBoxTextile = new ComboBox(); + labelCount = new Label(); + textBoxCount = new TextBox(); + buttonSell = new Button(); + buttonCancel = new Button(); + SuspendLayout(); + // + // labelTextile + // + labelTextile.AutoSize = true; + labelTextile.Location = new Point(12, 14); + labelTextile.Name = "labelTextile"; + labelTextile.Size = new Size(77, 20); + labelTextile.TabIndex = 0; + labelTextile.Text = "Текстиль: "; + // + // comboBoxTextile + // + comboBoxTextile.FormattingEnabled = true; + comboBoxTextile.Location = new Point(115, 11); + comboBoxTextile.Name = "comboBoxTextile"; + comboBoxTextile.Size = new Size(239, 28); + comboBoxTextile.TabIndex = 1; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(12, 55); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(97, 20); + labelCount.TabIndex = 2; + labelCount.Text = "Количество: "; + // + // textBoxCount + // + textBoxCount.Location = new Point(115, 52); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(239, 27); + textBoxCount.TabIndex = 3; + // + // buttonSell + // + buttonSell.Location = new Point(128, 99); + buttonSell.Name = "buttonSell"; + buttonSell.Size = new Size(94, 29); + buttonSell.TabIndex = 4; + buttonSell.Text = "Продать"; + buttonSell.UseVisualStyleBackColor = true; + buttonSell.Click += ButtonSell_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(242, 99); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 5; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // FormSellTextile + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(366, 140); + Controls.Add(buttonCancel); + Controls.Add(buttonSell); + Controls.Add(textBoxCount); + Controls.Add(labelCount); + Controls.Add(comboBoxTextile); + Controls.Add(labelTextile); + Name = "FormSellTextile"; + Text = "Продажа текстиля"; + Load += FormSellingTextile_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelTextile; + private ComboBox comboBoxTextile; + private Label labelCount; + private TextBox textBoxCount; + private Button buttonSell; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/GarmentFactory/FormSellTextile.cs b/GarmentFactory/FormSellTextile.cs new file mode 100644 index 0000000..b2a8705 --- /dev/null +++ b/GarmentFactory/FormSellTextile.cs @@ -0,0 +1,87 @@ +using GarmentFactoryContracts.BusinessLogicsContracts; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.ViewModels; +using Microsoft.Extensions.Logging; +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 GarmentFactoryView +{ + public partial class FormSellTextile : Form + { + private readonly ILogger _logger; + private readonly ITextileLogic _logicT; + private readonly IShopLogic _logicS; + private List _TextileList = new List(); + + public FormSellTextile(ILogger logger, ITextileLogic logicT, IShopLogic logicS) + { + InitializeComponent(); + _logger = logger; + _logicT = logicT; + _logicS = logicS; + } + + private void FormSellingTextile_Load(object sender, EventArgs e) + { + _TextileList = _logicT.ReadList(null); + if (_TextileList != null) + { + comboBoxTextile.DisplayMember = "TextileName"; + comboBoxTextile.ValueMember = "Id"; + comboBoxTextile.DataSource = _TextileList; + comboBoxTextile.SelectedItem = null; + _logger.LogInformation("Загрузка пиццы для продажи"); + } + } + + private void ButtonSell_Click(object sender, EventArgs e) + { + if (comboBoxTextile.SelectedValue == null) + { + MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Создание покупки"); + try + { + bool resout = _logicS.Sell(new SupplySearchModel + { + TextileId = Convert.ToInt32(comboBoxTextile.SelectedValue), + Count = Convert.ToInt32(textBoxCount.Text) + }); + if (resout) + { + _logger.LogInformation("Проверка была выполнена"); + MessageBox.Show("Продажа выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + else + { + _logger.LogInformation("Проверка не пройдена"); + MessageBox.Show("Продажа не может быть выполнена.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания покупки"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/GarmentFactory/FormSellTextile.resx b/GarmentFactory/FormSellTextile.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/GarmentFactory/FormSellTextile.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 diff --git a/GarmentFactory/FormShop.Designer.cs b/GarmentFactory/FormShop.Designer.cs index b21893c..3e1c300 100644 --- a/GarmentFactory/FormShop.Designer.cs +++ b/GarmentFactory/FormShop.Designer.cs @@ -1,205 +1,230 @@ namespace GarmentFactoryView { - partial class FormShop - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class FormShop + { + /// + /// 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); - } + /// + /// 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 + #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() - { - labelName = new Label(); - labelAddress = new Label(); - labelDateOpen = new Label(); - textBoxName = new TextBox(); - textBoxAddress = new TextBox(); - dateTimePicker = new DateTimePicker(); - groupBoxTextiles = new GroupBox(); - dataGridView = new DataGridView(); - ID = new DataGridViewTextBoxColumn(); - ColumnTextileName = new DataGridViewTextBoxColumn(); - ColumnCount = new DataGridViewTextBoxColumn(); - buttonCancel = new Button(); - buttonSave = new Button(); - groupBoxTextiles.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); - // - // labelName - // - labelName.AutoSize = true; - labelName.Location = new Point(30, 21); - labelName.Name = "labelName"; - labelName.Size = new Size(84, 20); - labelName.TabIndex = 0; - labelName.Text = "Название: "; - // - // labelAddress - // - labelAddress.AutoSize = true; - labelAddress.Location = new Point(40, 71); - labelAddress.Name = "labelAddress"; - labelAddress.Size = new Size(58, 20); - labelAddress.TabIndex = 1; - labelAddress.Text = "Адрес: "; - // - // labelDateOpen - // - labelDateOpen.AutoSize = true; - labelDateOpen.Location = new Point(12, 118); - labelDateOpen.Name = "labelDateOpen"; - labelDateOpen.Size = new Size(117, 20); - labelDateOpen.TabIndex = 2; - labelDateOpen.Text = "Дата открытия: "; - // - // textBoxName - // - textBoxName.Location = new Point(135, 21); - textBoxName.Name = "textBoxName"; - textBoxName.Size = new Size(243, 27); - textBoxName.TabIndex = 3; - // - // textBoxAddress - // - textBoxAddress.Location = new Point(135, 68); - textBoxAddress.Name = "textBoxAddress"; - textBoxAddress.Size = new Size(243, 27); - textBoxAddress.TabIndex = 4; - // - // dateTimePicker - // - dateTimePicker.Location = new Point(135, 113); - dateTimePicker.Name = "dateTimePicker"; - dateTimePicker.Size = new Size(243, 27); - dateTimePicker.TabIndex = 5; - // - // groupBoxTextiles - // - groupBoxTextiles.Controls.Add(dataGridView); - groupBoxTextiles.Location = new Point(12, 184); - groupBoxTextiles.Name = "groupBoxTextiles"; - groupBoxTextiles.Size = new Size(651, 306); - groupBoxTextiles.TabIndex = 6; - groupBoxTextiles.TabStop = false; - groupBoxTextiles.Text = "Изделия"; - // - // dataGridView - // - dataGridView.AllowUserToAddRows = false; - dataGridView.AllowUserToDeleteRows = false; - dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ID, ColumnTextileName, ColumnCount }); - dataGridView.Location = new Point(6, 26); - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersWidth = 51; - dataGridView.RowTemplate.Height = 29; - dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(633, 274); - dataGridView.TabIndex = 0; - // - // ID - // - ID.HeaderText = "ID"; - ID.MinimumWidth = 6; - ID.Name = "ID"; - ID.ReadOnly = true; - ID.Visible = false; - // - // ColumnTextileName - // - ColumnTextileName.HeaderText = "Изделие"; - ColumnTextileName.MinimumWidth = 6; - ColumnTextileName.Name = "ColumnTextileName"; - ColumnTextileName.ReadOnly = true; - // - // ColumnCount - // - ColumnCount.HeaderText = "Количество"; - ColumnCount.MinimumWidth = 6; - ColumnCount.Name = "ColumnCount"; - ColumnCount.ReadOnly = true; - // - // buttonCancel - // - buttonCancel.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - buttonCancel.Location = new Point(544, 521); - buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(103, 40); - buttonCancel.TabIndex = 9; - buttonCancel.Text = "Отмена"; - buttonCancel.UseVisualStyleBackColor = true; - buttonCancel.Click += ButtonCancel_Click; - // - // buttonSave - // - buttonSave.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - buttonSave.Location = new Point(426, 521); - buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(103, 40); - buttonSave.TabIndex = 8; - buttonSave.Text = "Сохранить"; - buttonSave.UseVisualStyleBackColor = true; - buttonSave.Click += ButtonSave_Click; - // - // FormShop - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(682, 584); - Controls.Add(buttonCancel); - Controls.Add(buttonSave); - Controls.Add(groupBoxTextiles); - Controls.Add(dateTimePicker); - Controls.Add(textBoxAddress); - Controls.Add(textBoxName); - Controls.Add(labelDateOpen); - Controls.Add(labelAddress); - Controls.Add(labelName); - Name = "FormShop"; - Text = "Магазин"; - Load += FormShop_Load; - groupBoxTextiles.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - PerformLayout(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + labelName = new Label(); + labelAddress = new Label(); + labelDateOpen = new Label(); + textBoxName = new TextBox(); + textBoxAddress = new TextBox(); + dateTimePicker = new DateTimePicker(); + groupBoxTextiles = new GroupBox(); + dataGridView = new DataGridView(); + ID = new DataGridViewTextBoxColumn(); + ColumnTextileName = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); + buttonCancel = new Button(); + buttonSave = new Button(); + numericUpTextileMaxCount = new NumericUpDown(); + label2 = new Label(); + groupBoxTextiles.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpTextileMaxCount).BeginInit(); + SuspendLayout(); + // + // labelName + // + labelName.AutoSize = true; + labelName.Location = new Point(30, 21); + labelName.Name = "labelName"; + labelName.Size = new Size(84, 20); + labelName.TabIndex = 0; + labelName.Text = "Название: "; + // + // labelAddress + // + labelAddress.AutoSize = true; + labelAddress.Location = new Point(40, 71); + labelAddress.Name = "labelAddress"; + labelAddress.Size = new Size(58, 20); + labelAddress.TabIndex = 1; + labelAddress.Text = "Адрес: "; + // + // labelDateOpen + // + labelDateOpen.AutoSize = true; + labelDateOpen.Location = new Point(12, 118); + labelDateOpen.Name = "labelDateOpen"; + labelDateOpen.Size = new Size(117, 20); + labelDateOpen.TabIndex = 2; + labelDateOpen.Text = "Дата открытия: "; + // + // textBoxName + // + textBoxName.Location = new Point(135, 21); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(243, 27); + textBoxName.TabIndex = 3; + // + // textBoxAddress + // + textBoxAddress.Location = new Point(135, 68); + textBoxAddress.Name = "textBoxAddress"; + textBoxAddress.Size = new Size(243, 27); + textBoxAddress.TabIndex = 4; + // + // dateTimePicker + // + dateTimePicker.Location = new Point(135, 113); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(243, 27); + dateTimePicker.TabIndex = 5; + // + // groupBoxTextiles + // + groupBoxTextiles.Controls.Add(dataGridView); + groupBoxTextiles.Location = new Point(12, 209); + groupBoxTextiles.Name = "groupBoxTextiles"; + groupBoxTextiles.Size = new Size(651, 306); + groupBoxTextiles.TabIndex = 6; + groupBoxTextiles.TabStop = false; + groupBoxTextiles.Text = "Изделия"; + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ID, ColumnTextileName, ColumnCount }); + dataGridView.Location = new Point(6, 26); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(633, 274); + dataGridView.TabIndex = 0; + // + // ID + // + ID.HeaderText = "ID"; + ID.MinimumWidth = 6; + ID.Name = "ID"; + ID.ReadOnly = true; + ID.Visible = false; + // + // ColumnTextileName + // + ColumnTextileName.HeaderText = "Изделие"; + ColumnTextileName.MinimumWidth = 6; + ColumnTextileName.Name = "ColumnTextileName"; + ColumnTextileName.ReadOnly = true; + // + // ColumnCount + // + ColumnCount.HeaderText = "Количество"; + ColumnCount.MinimumWidth = 6; + ColumnCount.Name = "ColumnCount"; + ColumnCount.ReadOnly = true; + // + // buttonCancel + // + buttonCancel.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); + buttonCancel.Location = new Point(550, 532); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(103, 40); + buttonCancel.TabIndex = 9; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // buttonSave + // + buttonSave.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); + buttonSave.Location = new Point(432, 532); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(103, 40); + buttonSave.TabIndex = 8; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += ButtonSave_Click; + // + // numericUpTextileMaxCount + // + numericUpTextileMaxCount.Location = new Point(135, 163); + numericUpTextileMaxCount.Maximum = new decimal(new int[] { 10000, 0, 0, 0 }); + numericUpTextileMaxCount.Name = "numericUpTextileMaxCount"; + numericUpTextileMaxCount.Size = new Size(243, 27); + numericUpTextileMaxCount.TabIndex = 13; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(19, 165); + label2.Name = "label2"; + label2.Size = new Size(103, 20); + label2.TabIndex = 12; + label2.Text = "Вместимость:"; + // + // FormShop + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(682, 584); + Controls.Add(numericUpTextileMaxCount); + Controls.Add(label2); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(groupBoxTextiles); + Controls.Add(dateTimePicker); + Controls.Add(textBoxAddress); + Controls.Add(textBoxName); + Controls.Add(labelDateOpen); + Controls.Add(labelAddress); + Controls.Add(labelName); + Name = "FormShop"; + Text = "Магазин"; + Load += FormShop_Load; + groupBoxTextiles.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpTextileMaxCount).EndInit(); + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private Label labelName; - private Label labelAddress; - private Label labelDateOpen; - private TextBox textBoxName; - private TextBox textBoxAddress; - private DateTimePicker dateTimePicker; - private GroupBox groupBoxTextiles; - private DataGridView dataGridView; - private DataGridViewTextBoxColumn ID; - private DataGridViewTextBoxColumn ColumnTextileName; - private DataGridViewTextBoxColumn ColumnCount; - private Button buttonCancel; - private Button buttonSave; - } + private Label labelName; + private Label labelAddress; + private Label labelDateOpen; + private TextBox textBoxName; + private TextBox textBoxAddress; + private DateTimePicker dateTimePicker; + private GroupBox groupBoxTextiles; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ID; + private DataGridViewTextBoxColumn ColumnTextileName; + private DataGridViewTextBoxColumn ColumnCount; + private Button buttonCancel; + private Button buttonSave; + private NumericUpDown numericUpTextileMaxCount; + private Label label2; + } } \ No newline at end of file diff --git a/GarmentFactory/FormShop.cs b/GarmentFactory/FormShop.cs index b09ef63..62a748c 100644 --- a/GarmentFactory/FormShop.cs +++ b/GarmentFactory/FormShop.cs @@ -15,119 +15,121 @@ using System.Windows.Forms; namespace GarmentFactoryView { - public partial class FormShop : Form - { - private readonly ILogger _logger; + public partial class FormShop : Form + { + private readonly ILogger _logger; - private readonly IShopLogic _logic; + private readonly IShopLogic _logic; - private int? _id; + private int? _id; - public int Id { set { _id = value; } } + public int Id { set { _id = value; } } - private Dictionary _shopTextiles; + private Dictionary _shopTextiles; - public FormShop(ILogger logger, IShopLogic logic) - { - InitializeComponent(); - _logger = logger; - _logic = logic; - _shopTextiles = new Dictionary(); - } + public FormShop(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _shopTextiles = new Dictionary(); + } - private void FormShop_Load(object sender, EventArgs e) - { - if (_id.HasValue) - { - _logger.LogInformation("Загрузка магазина"); - try - { - var view = _logic.ReadElement(new ShopSearchModel - { - Id = _id.Value - }); - if (view != null) - { - textBoxName.Text = view.ShopName; - textBoxAddress.Text = view.Address.ToString(); - dateTimePicker.Value = view.DateOpen; - _shopTextiles = view.ShopTextiles ?? new Dictionary(); - LoadData(); - } - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки магазина"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } + private void FormShop_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка магазина"); + try + { + var view = _logic.ReadElement(new ShopSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxName.Text = view.ShopName; + textBoxAddress.Text = view.Address.ToString(); + dateTimePicker.Value = view.DateOpen; + numericUpTextileMaxCount.Value = view.TextileMaxCount; + _shopTextiles = view.ShopTextiles ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } - private void LoadData() - { - _logger.LogInformation("Загрузка изделий в магазине"); - try - { - if (_shopTextiles != null) - { - dataGridView.Rows.Clear(); - foreach (var element in _shopTextiles) - { - dataGridView.Rows.Add(new object[] { element.Key, element.Value.Item1.TextileName, element.Value.Item2 }); - } - } - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки изделий в магазине"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + private void LoadData() + { + _logger.LogInformation("Загрузка изделий в магазине"); + try + { + if (_shopTextiles != null) + { + dataGridView.Rows.Clear(); + foreach (var element in _shopTextiles) + { + dataGridView.Rows.Add(new object[] { element.Key, element.Value.Item1.TextileName, element.Value.Item2 }); + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделий в магазине"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } - private void ButtonSave_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(textBoxName.Text)) - { - MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - if (string.IsNullOrEmpty(textBoxAddress.Text)) - { - MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - _logger.LogInformation("Сохранение магазина"); - try - { - var model = new ShopBindingModel - { - Id = _id ?? 0, - ShopName = textBoxName.Text, - Address = textBoxAddress.Text, - DateOpen = dateTimePicker.Value.Date, - ShopTextiles = _shopTextiles - }; - var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); - DialogResult = DialogResult.OK; - Close(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка сохранения магазина"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxAddress.Text)) + { + MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение магазина"); + try + { + var model = new ShopBindingModel + { + Id = _id ?? 0, + ShopName = textBoxName.Text, + Address = textBoxAddress.Text, + DateOpen = dateTimePicker.Value.Date, + ShopTextiles = _shopTextiles, + TextileMaxCount = (int)numericUpTextileMaxCount.Value + }; + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } - private void ButtonCancel_Click(object sender, EventArgs e) - { - DialogResult = DialogResult.Cancel; - Close(); - } - } + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } } diff --git a/GarmentFactory/GarmentFactory.sln b/GarmentFactory/GarmentFactory.sln index acceabb..d7bb194 100644 --- a/GarmentFactory/GarmentFactory.sln +++ b/GarmentFactory/GarmentFactory.sln @@ -13,6 +13,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarmentFactoryBusinessLogic EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarmentFactoryListImplement", "..\GarmentFactoryListImplement\GarmentFactoryListImplement.csproj", "{DEDDF6CC-7C47-4A10-A011-77395F4B7F30}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarmentFactoryFileImplement", "..\GarmentFactoryFileImplement\GarmentFactoryFileImplement.csproj", "{93AAEAF2-0725-44DE-9EC9-72701506D1F4}" + ProjectSection(ProjectDependencies) = postProject + {1B91BCBE-E608-4D05-A14D-51B1765D5203} = {1B91BCBE-E608-4D05-A14D-51B1765D5203} + {DB84150A-FB0D-4FCB-90DD-2CAC6845E1AF} = {DB84150A-FB0D-4FCB-90DD-2CAC6845E1AF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +45,10 @@ Global {DEDDF6CC-7C47-4A10-A011-77395F4B7F30}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEDDF6CC-7C47-4A10-A011-77395F4B7F30}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEDDF6CC-7C47-4A10-A011-77395F4B7F30}.Release|Any CPU.Build.0 = Release|Any CPU + {93AAEAF2-0725-44DE-9EC9-72701506D1F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93AAEAF2-0725-44DE-9EC9-72701506D1F4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93AAEAF2-0725-44DE-9EC9-72701506D1F4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93AAEAF2-0725-44DE-9EC9-72701506D1F4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GarmentFactory/GarmentFactoryView.csproj b/GarmentFactory/GarmentFactoryView.csproj index bb77e96..29785a6 100644 --- a/GarmentFactory/GarmentFactoryView.csproj +++ b/GarmentFactory/GarmentFactoryView.csproj @@ -14,6 +14,7 @@ + diff --git a/GarmentFactory/Program.cs b/GarmentFactory/Program.cs index 711a357..9302db5 100644 --- a/GarmentFactory/Program.cs +++ b/GarmentFactory/Program.cs @@ -1,7 +1,7 @@ using GarmentFactoryBusinessLogic; using GarmentFactoryContracts.BusinessLogicsContracts; using GarmentFactoryContracts.StoragesContracts; -using GarmentFactoryListImplement.Implements; +using GarmentFactoryFileImplement.Implements; using GarmentFactoryView; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -38,21 +38,25 @@ namespace GarmentFactory services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); - } + services.AddTransient(); + } } } \ No newline at end of file diff --git a/GarmentFactoryBusinessLogic/OrderLogic.cs b/GarmentFactoryBusinessLogic/OrderLogic.cs index 37c087a..9d6d131 100644 --- a/GarmentFactoryBusinessLogic/OrderLogic.cs +++ b/GarmentFactoryBusinessLogic/OrderLogic.cs @@ -19,14 +19,16 @@ namespace GarmentFactoryBusinessLogic private readonly ILogger _logger; //Хранение всех заказов private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) - { - _logger = logger; - _orderStorage = orderStorage; - } + private readonly IShopStorage _shopStorage; + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage) + { + _logger = logger; + _orderStorage = orderStorage; + _shopStorage = shopStorage; + } - //Чтение всего списка заказов - public List? ReadList(OrderSearchModel? model) + //Чтение всего списка заказов + public List? ReadList(OrderSearchModel? model) { _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id); var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); @@ -133,7 +135,18 @@ namespace GarmentFactoryBusinessLogic //Перевод заказа в состояние выдачи (окончательное завершение) public bool DeliveryOrder(OrderBindingModel model) { - return ChangeStatus(model, OrderStatus.Выдан); + var order = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); + if (order == null) + { + throw new ArgumentNullException(nameof(order)); + } + + //Если нельзя пополнить магазины таким кол-вом товаров (не хавтает места), то статус не меняем + if (!_shopStorage.RestockShops(new SupplyBindingModel { TextileId = order.TextileId, Count = order.Count })) + { + throw new ArgumentException("Недостаточно места"); + } + return ChangeStatus(model, OrderStatus.Выдан); } } } diff --git a/GarmentFactoryBusinessLogic/ShopLogic.cs b/GarmentFactoryBusinessLogic/ShopLogic.cs index 0e30de2..21ddadf 100644 --- a/GarmentFactoryBusinessLogic/ShopLogic.cs +++ b/GarmentFactoryBusinessLogic/ShopLogic.cs @@ -109,7 +109,7 @@ namespace GarmentFactoryBusinessLogic } // Пополнение магазина - public bool AddTextile(SupplyBindingModel model) + public bool MakeSupply(SupplyBindingModel model) { if (model == null) { @@ -121,35 +121,52 @@ namespace GarmentFactoryBusinessLogic throw new ArgumentNullException("Количество добавляемых изделий должно быть больше 0"); } - var shop = _shopStorage.GetElement(new ShopSearchModel{ Id = model.ShopId }); + var textile = _textileStorage.GetElement(new TextileSearchModel { Id = model.TextileId }); + if (textile == null) + { + throw new ArgumentException($"При добавлении товара в магазин товар с id={model.TextileId} не найден"); + } - if (shop == null) + var shop = _shopStorage.GetElement(new ShopSearchModel { Id = model.ShopId }); + if (shop == null) + { + throw new ArgumentException($"При добавлении товара в магазин магазин c id={model.ShopId} не найден"); + } + + int countTextilesInShop = shop.ShopTextiles.Select(x => x.Value.Item2).Sum(); + + //Если в текущий магазин помещается столько товаров + if (countTextilesInShop + model.Count <= shop.TextileMaxCount) { - throw new ArgumentException($"При добавлении товара в магазин магазин c id={model.ShopId} не найден"); - } - - // Если такой товар есть, то прибавление переданного кол-ва - if (shop.ShopTextiles.ContainsKey(model.TextileId)) - { - var oldValue = shop.ShopTextiles[model.TextileId]; - oldValue.Item2 += model.Count; - shop.ShopTextiles[model.TextileId] = oldValue; - } - // Если такого товара нет, то кол-во такого товара равно переданному кол-ву - else - { - var textile = _textileStorage.GetElement(new TextileSearchModel{ Id = model.TextileId }); - if (textile == null) + // Если такой товар есть, то прибавление переданного кол-ва + if (shop.ShopTextiles.ContainsKey(model.TextileId)) + { + var oldValue = shop.ShopTextiles[model.TextileId]; + oldValue.Item2 += model.Count; + shop.ShopTextiles[model.TextileId] = oldValue; + } + // Если такого товара нет, то кол-во такого товара равно переданному кол-ву + else + { + shop.ShopTextiles.Add(model.TextileId, (textile, model.Count)); + } + + _shopStorage.Update(new() { - throw new ArgumentException($"При добавлении товара в магазин товар с id={model.TextileId} не найден"); - } - shop.ShopTextiles.Add(model.TextileId, (textile, model.Count)); - } - return true; + Id = shop.Id, + ShopName = shop.ShopName, + Address = shop.Address, + DateOpen = shop.DateOpen, + ShopTextiles = shop.ShopTextiles, + TextileMaxCount = shop.TextileMaxCount, + }); + return true; + } + //Если не поместилось столько товара + _logger.LogWarning("Required shop is overflowed"); + return false; } - - // Проверка данных магазина при добавлении/удалении/обновлении private void CheckModel(ShopBindingModel model, bool withParams = true) { @@ -185,5 +202,20 @@ namespace GarmentFactoryBusinessLogic throw new InvalidOperationException("Магазин с таким названием уже есть"); } } - } + + public bool Sell(SupplySearchModel model) + { + if (!model.TextileId.HasValue || !model.Count.HasValue) + { + return false; + } + if (_shopStorage.Sell(model)) + { + _logger.LogInformation("Selling sucsess"); + return true; + } + _logger.LogInformation("Selling failed"); + return false; + } + } } diff --git a/GarmentFactoryContracts/BindingModels/ShopBindingModel.cs b/GarmentFactoryContracts/BindingModels/ShopBindingModel.cs index 65eb932..fa5a97f 100644 --- a/GarmentFactoryContracts/BindingModels/ShopBindingModel.cs +++ b/GarmentFactoryContracts/BindingModels/ShopBindingModel.cs @@ -18,5 +18,6 @@ namespace GarmentFactoryContracts.BindingModels public Dictionary ShopTextiles { get; set; } = new(); + public int TextileMaxCount { get; set; } } } diff --git a/GarmentFactoryContracts/BusinessLogicsContracts/IShopLogic.cs b/GarmentFactoryContracts/BusinessLogicsContracts/IShopLogic.cs index 034e475..7f43b4d 100644 --- a/GarmentFactoryContracts/BusinessLogicsContracts/IShopLogic.cs +++ b/GarmentFactoryContracts/BusinessLogicsContracts/IShopLogic.cs @@ -22,6 +22,8 @@ namespace GarmentFactoryContracts.BusinessLogicsContracts bool Delete(ShopBindingModel model); - bool AddTextile(SupplyBindingModel model); + bool MakeSupply(SupplyBindingModel model); + + bool Sell(SupplySearchModel model); } } diff --git a/GarmentFactoryContracts/SearchModels/SupplySearchModel.cs b/GarmentFactoryContracts/SearchModels/SupplySearchModel.cs new file mode 100644 index 0000000..360c8a8 --- /dev/null +++ b/GarmentFactoryContracts/SearchModels/SupplySearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryContracts.SearchModels +{ + public class SupplySearchModel + { + public int? TextileId { get; set; } + public int? Count { get; set; } + } +} diff --git a/GarmentFactoryContracts/StoragesContracts/IShopStorage.cs b/GarmentFactoryContracts/StoragesContracts/IShopStorage.cs index cad0d17..1d8cce9 100644 --- a/GarmentFactoryContracts/StoragesContracts/IShopStorage.cs +++ b/GarmentFactoryContracts/StoragesContracts/IShopStorage.cs @@ -17,5 +17,9 @@ namespace GarmentFactoryContracts.StoragesContracts ShopViewModel? Insert(ShopBindingModel model); ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model); + //Продажа изделий в нужном кол-ве + bool Sell(SupplySearchModel model); + //Пополнение магаз-ов + bool RestockShops(SupplyBindingModel model); } } diff --git a/GarmentFactoryContracts/ViewModels/ShopViewModel.cs b/GarmentFactoryContracts/ViewModels/ShopViewModel.cs index 2645018..1853fb6 100644 --- a/GarmentFactoryContracts/ViewModels/ShopViewModel.cs +++ b/GarmentFactoryContracts/ViewModels/ShopViewModel.cs @@ -22,5 +22,8 @@ namespace GarmentFactoryContracts.ViewModels public DateTime DateOpen { get; set; } = DateTime.Now; public Dictionary ShopTextiles { get; set; } = new(); - } + + [DisplayName("Вместимость")] + public int TextileMaxCount { get; set; } + } } diff --git a/GarmentFactoryDataModels/Models/IShopModel.cs b/GarmentFactoryDataModels/Models/IShopModel.cs index 23646ea..538079f 100644 --- a/GarmentFactoryDataModels/Models/IShopModel.cs +++ b/GarmentFactoryDataModels/Models/IShopModel.cs @@ -13,5 +13,7 @@ namespace GarmentFactoryDataModels.Models DateTime DateOpen { get; } //Изделия в магазине Dictionary ShopTextiles { get; } - } + //макс. кол-во изделий + int TextileMaxCount { get; } + } } diff --git a/GarmentFactoryFileImplement/DataFileSingleton.cs b/GarmentFactoryFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..90c144d --- /dev/null +++ b/GarmentFactoryFileImplement/DataFileSingleton.cs @@ -0,0 +1,59 @@ +using GarmentFactoryFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace GarmentFactoryFileImplement +{ + internal class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string TextileFileName = "Textile.xml"; + private readonly string ShopFileName = "Shop.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Textiles { get; private set; } + public List Shops { get; private set; } + public static DataFileSingleton GetInstance() + { + if (instance == null) + { + instance = new DataFileSingleton(); + } + return instance; + } + public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); + public void SaveTextiles() => SaveData(Textiles, TextileFileName, "Textiles", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Textiles = LoadData(TextileFileName, "Textile", x => Textile.Create(x)!)!; + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; + } + + private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) + { + if (File.Exists(filename)) + { + return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); + } + return new List(); + } + + private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction) + { + if (data != null) + { + new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename); + } + } + } +} diff --git a/GarmentFactoryFileImplement/GarmentFactoryFileImplement.csproj b/GarmentFactoryFileImplement/GarmentFactoryFileImplement.csproj new file mode 100644 index 0000000..ea73c98 --- /dev/null +++ b/GarmentFactoryFileImplement/GarmentFactoryFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/GarmentFactoryFileImplement/Implements/ComponentStorage.cs b/GarmentFactoryFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..408012e --- /dev/null +++ b/GarmentFactoryFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,82 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.StoragesContracts; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryFileImplement.Models; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryFileImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataFileSingleton source; + public ComponentStorage() + { + source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return source.Components.Select(x => x.GetViewModel).ToList(); + } + public List GetFilteredList(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName)) + { + return new(); + } + return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList(); + } + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + return source.Components.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + public ComponentViewModel? Insert(ComponentBindingModel model) + { + model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1; + var newComponent = Component.Create(model); + if (newComponent == null) + { + return null; + } + source.Components.Add(newComponent); + source.SaveComponents(); + return newComponent.GetViewModel; + } + + public ComponentViewModel? Update(ComponentBindingModel model) + { + var component = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (component == null) + { + return null; + } + component.Update(model); + source.SaveComponents(); + return component.GetViewModel; + } + + public ComponentViewModel? Delete(ComponentBindingModel model) + { + var element = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Components.Remove(element); + source.SaveComponents(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/GarmentFactoryFileImplement/Implements/OrderStorage.cs b/GarmentFactoryFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..f3ddbd3 --- /dev/null +++ b/GarmentFactoryFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,83 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.StoragesContracts; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + public List GetFullList() => source.Orders.Select(x => AddTextileName(x.GetViewModel)).ToList(); + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + return source.Orders.Where(x => x.Id == model.Id).Select(x => AddTextileName(x.GetViewModel)).ToList(); + } + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + return AddTextileName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel); + } + public OrderViewModel? Insert(OrderBindingModel model) + { + model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1; + var newOrder = Order.Create(model); + if (newOrder == null) + { + return null; + } + source.Orders.Add(newOrder); + source.SaveOrders(); + return AddTextileName(newOrder.GetViewModel); + } + public OrderViewModel? Update(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) + { + return null; + } + order.Update(model); + source.SaveOrders(); + return AddTextileName(order.GetViewModel); + } + public OrderViewModel? Delete(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order != null) + { + source.Orders.Remove(order); + source.SaveOrders(); + return AddTextileName(order.GetViewModel); + } + return null; + } + private OrderViewModel? AddTextileName(OrderViewModel? model) + { + if (model == null) + { + return null; + } + var textile = source.Textiles.FirstOrDefault(x => x.Id == model.TextileId); + model.TextileName = textile?.TextileName; + return model; + } + } +} diff --git a/GarmentFactoryFileImplement/Implements/ShopStorage.cs b/GarmentFactoryFileImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..e30ebbd --- /dev/null +++ b/GarmentFactoryFileImplement/Implements/ShopStorage.cs @@ -0,0 +1,183 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.StoragesContracts; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryFileImplement.Implements +{ + public class ShopStorage : IShopStorage + { + private readonly DataFileSingleton source; + + public ShopStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Shops.Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + return source.Shops.Where(x => x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList(); + } + + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + return source.Shops.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) || + (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1; + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + source.Shops.Add(newShop); + source.SaveShops(); + return newShop.GetViewModel; + } + + public ShopViewModel? Update(ShopBindingModel model) + { + var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop == null) + { + return null; + } + shop.Update(model); + source.SaveShops(); + return shop.GetViewModel; + } + + public ShopViewModel? Delete(ShopBindingModel model) + { + var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop != null) + { + source.Shops.Remove(shop); + source.SaveShops(); + return shop.GetViewModel; + } + return null; + } + + public bool Sell(SupplySearchModel model) + { + if (model == null || !model.TextileId.HasValue || !model.Count.HasValue) + { + return false; + } + + //магазины по степени наполненности (от самого наполненного) с этим текстилем + var shopsWithThisTextile = source.Shops.Where(x => x.Textiles.ContainsKey(model.TextileId.Value)).OrderByDescending(x => x.Textiles[model.TextileId.Value]).ToList(); + + int thisTextileInShops = shopsWithThisTextile.Select(x => x.Textiles[model.TextileId.Value]).Sum(); + + if (thisTextileInShops < model.Count) + { + return false; + } + + foreach (var shop in shopsWithThisTextile) + { + //кол-во необходимых текстилей после возможной продажи всех текстилей + int thisTextileNeed = model.Count.Value - shop.Textiles[model.TextileId.Value]; + + //Если текстиль ещё нужен будет + if (thisTextileNeed > 0) + { + //удаление всех текстилей в этом магазине + shop.Textiles.Remove(model.TextileId.Value); + shop.TextilesUpdate(); + model.Count = thisTextileNeed; + } + + else + { + //Если ровно хватает + if (thisTextileNeed == 0) + { + shop.Textiles.Remove(model.TextileId.Value); + } + //Если нужно меньше, чем есть в магазине + else + { + //уменьшение кол-ва + shop.Textiles[model.TextileId.Value] = -thisTextileNeed; + } + shop.TextilesUpdate(); + source.SaveShops(); + return true; + } + } + source.SaveShops(); + return false; + } + + public bool RestockShops(SupplyBindingModel model) + { + //подсчёт свободных мест через сумму свободных мест в каждом магазине + //в каждом магазине кол-во свободных мест = макс. кол-во - занятые места + int totalFreeSpace = source.Shops + .Select(x => x.TextileMaxCount - x.ShopTextiles.Select(y => y.Value.Item2).Sum()) + .Sum(); + + //если места не хватает + if (totalFreeSpace < model.Count) + { + return false; + } + + var shopsWithFreeSpace = source.Shops.Where(x => x.TextileMaxCount - x.ShopTextiles.Select(x => x.Value.Item2).Sum() > 0); + + foreach (Shop shop in shopsWithFreeSpace) + { + int freeSpace = shop.TextileMaxCount - shop.ShopTextiles.Select(x => x.Value.Item2).Sum(); + + freeSpace = Math.Min(freeSpace, model.Count); + model.Count -= freeSpace; + + if (shop.Textiles.ContainsKey(model.TextileId)) + { + shop.Textiles[model.TextileId] += freeSpace; + } + + else + { + shop.Textiles.Add(model.TextileId, freeSpace); + } + + shop.TextilesUpdate(); + + if (model.Count == 0) + { + source.SaveShops(); + return true; + } + } + return false; + } + } +} diff --git a/GarmentFactoryFileImplement/Implements/TextileStorage.cs b/GarmentFactoryFileImplement/Implements/TextileStorage.cs new file mode 100644 index 0000000..a58d6f3 --- /dev/null +++ b/GarmentFactoryFileImplement/Implements/TextileStorage.cs @@ -0,0 +1,81 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.StoragesContracts; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryFileImplement.Implements +{ + public class TextileStorage : ITextileStorage + { + private readonly DataFileSingleton source; + public TextileStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Textiles.Select(x => x.GetViewModel).ToList(); + } + + public List GetFilteredList(TextileSearchModel model) + { + if (string.IsNullOrEmpty(model.TextileName)) + { + return new(); + } + return source.Textiles.Where(x => x.TextileName.Contains(model.TextileName)).Select(x => x.GetViewModel).ToList(); + } + public TextileViewModel? GetElement(TextileSearchModel model) + { + if (string.IsNullOrEmpty(model.TextileName) && !model.Id.HasValue) + { + return null; + } + return source.Textiles.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.TextileName) && x.TextileName == model.TextileName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + public TextileViewModel? Insert(TextileBindingModel model) + { + model.Id = source.Textiles.Count > 0 ? source.Textiles.Max(x => x.Id) + 1 : 1; + var newTextile = Textile.Create(model); + if (newTextile == null) + { + return null; + } + source.Textiles.Add(newTextile); + source.SaveTextiles(); + return newTextile.GetViewModel; + } + public TextileViewModel? Update(TextileBindingModel model) + { + var Textile = source.Textiles.FirstOrDefault(x => x.Id == model.Id); + if (Textile == null) + { + return null; + } + Textile.Update(model); + source.SaveTextiles(); + return Textile.GetViewModel; + } + public TextileViewModel? Delete(TextileBindingModel model) + { + var textile = source.Textiles.FirstOrDefault(x => x.Id == model.Id); + if (textile != null) + { + source.Textiles.Remove(textile); + source.SaveTextiles(); + return textile.GetViewModel; + } + return null; + } + } +} diff --git a/GarmentFactoryFileImplement/Models/Component.cs b/GarmentFactoryFileImplement/Models/Component.cs new file mode 100644 index 0000000..4ebf8fe --- /dev/null +++ b/GarmentFactoryFileImplement/Models/Component.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; + +namespace GarmentFactoryFileImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + public string ComponentName { get; private set; } = string.Empty; + public double Cost { get; set; } + public static Component? Create(ComponentBindingModel model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public static Component? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Component() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComponentName = element.Element("ComponentName")!.Value, + Cost = Convert.ToDouble(element.Element("Cost")!.Value) + }; + } + + public void Update(ComponentBindingModel model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + public XElement GetXElement => new("Component", new XAttribute("Id", Id), new XElement("ComponentName", ComponentName), new XElement("Cost", Cost.ToString())); + } +} diff --git a/GarmentFactoryFileImplement/Models/Order.cs b/GarmentFactoryFileImplement/Models/Order.cs new file mode 100644 index 0000000..be954a5 --- /dev/null +++ b/GarmentFactoryFileImplement/Models/Order.cs @@ -0,0 +1,89 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Enums; +using GarmentFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace GarmentFactoryFileImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + public int TextileId { get; private set; } + public int Count { get; private set; } + public double Sum { get; private set; } + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime? DateComplete { get; private set; } + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + TextileId = model.TextileId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateComplete = model.DateComplete + }; + } + public static Order? Create(XElement element) + { + if (element == null) + { + return null; + } + string dateComplete = element.Element("DateComplete")!.Value; + return new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + TextileId = Convert.ToInt32(element.Element("TextileId")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + Status = (OrderStatus)(Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value)), + DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), + DateComplete = (dateComplete == "" || dateComplete is null) ? Convert.ToDateTime(null) : Convert.ToDateTime(dateComplete) + }; + + } + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + if (model.Status == OrderStatus.Выдан) { + DateComplete = model.DateComplete; + } + } + public OrderViewModel GetViewModel => new() + { + Id = Id, + TextileId = TextileId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateComplete = DateComplete + }; + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("TextileId", TextileId.ToString()), + new XElement("Count", Count.ToString()), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateComplete", DateComplete.ToString())); + } +} diff --git a/GarmentFactoryFileImplement/Models/Shop.cs b/GarmentFactoryFileImplement/Models/Shop.cs new file mode 100644 index 0000000..27f7010 --- /dev/null +++ b/GarmentFactoryFileImplement/Models/Shop.cs @@ -0,0 +1,111 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace GarmentFactoryFileImplement.Models +{ + public class Shop : IShopModel + { + public int Id { get; private set; } + public string ShopName { get; private set; } = string.Empty; + public string Address { get; private set; } = string.Empty; + public DateTime DateOpen { get; private set; } + public Dictionary Textiles { get; private set; } = new(); + private Dictionary? _shopTextiles = null; + + public Dictionary ShopTextiles + { + get + { + if (_shopTextiles == null) + { + var source = DataFileSingleton.GetInstance(); + _shopTextiles = Textiles.ToDictionary(x => x.Key, y => ((source.Textiles.FirstOrDefault(z => z.Id == y.Key) as ITextileModel)!, y.Value)); + } + return _shopTextiles; + } + } + + public int TextileMaxCount { get; private set; } + + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + DateOpen = model.DateOpen, + Textiles = model.ShopTextiles.ToDictionary(x => x.Key, x => x.Value.Item2), + TextileMaxCount = model.TextileMaxCount + }; + } + + public static Shop? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ShopName = element.Element("ShopName")!.Value, + Address = element.Element("Address")!.Value, + DateOpen = Convert.ToDateTime(element.Element("DateOpen")!.Value), + Textiles = element.Element("ShopTextiles")!.Elements("ShopTextile")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), + x => Convert.ToInt32(x.Element("Value")?.Value)), + TextileMaxCount = Convert.ToInt32(element.Element("TextileMaxCount")!.Value) + }; + } + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + Address = model.Address; + DateOpen = model.DateOpen; + TextileMaxCount = model.TextileMaxCount; + Textiles = model.ShopTextiles.ToDictionary(x => x.Key, x => x.Value.Item2); + _shopTextiles = null; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpen = DateOpen, + ShopTextiles = ShopTextiles, + TextileMaxCount = TextileMaxCount + }; + + public XElement GetXElement => new("Shop", + new XAttribute("Id", Id), + new XElement("ShopName", ShopName), + new XElement("Address", Address), + new XElement("DateOpen", DateOpen.ToString()), + new XElement("ShopTextiles", Textiles.Select( + x => new XElement("ShopTextile", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()), + new XElement("TextileMaxCount", TextileMaxCount.ToString()) + ); + + public void TextilesUpdate() + { + _shopTextiles = null; + } + } +} diff --git a/GarmentFactoryFileImplement/Models/Textile.cs b/GarmentFactoryFileImplement/Models/Textile.cs new file mode 100644 index 0000000..0e7e160 --- /dev/null +++ b/GarmentFactoryFileImplement/Models/Textile.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; +using System.Xml.Linq; + +namespace GarmentFactoryFileImplement.Models +{ + public class Textile : ITextileModel + { + public int Id { get; private set; } + public string TextileName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + private Dictionary? _textileComponents = null; + public Dictionary TextileComponents + { + get + { + if (_textileComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _textileComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, + y.Value)); + } + return _textileComponents; + } + } + public static Textile? Create(TextileBindingModel model) + { + if (model == null) + { + return null; + } + return new Textile() + { + Id = model.Id, + TextileName = model.TextileName, + Price = model.Price, + Components = model.TextileComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Textile? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Textile() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + TextileName = element.Element("TextileName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("TextileComponents")!.Elements("TextileComponent").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(TextileBindingModel model) + { + if (model == null) + { + return; + } + TextileName = model.TextileName; + Price = model.Price; + Components = model.TextileComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _textileComponents = null; + } + public TextileViewModel GetViewModel => new() + { + Id = Id, + TextileName = TextileName, + Price = Price, + TextileComponents = TextileComponents + }; + public XElement GetXElement => new("Textile", + new XAttribute("Id", Id), + new XElement("TextileName", TextileName), + new XElement("Price", Price.ToString()), + new XElement("TextileComponents", Components.Select(x => + new XElement("TextileComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray())); + } +} diff --git a/GarmentFactoryListImplement/Implements/ShopStorage.cs b/GarmentFactoryListImplement/Implements/ShopStorage.cs index a5442ac..d28bf04 100644 --- a/GarmentFactoryListImplement/Implements/ShopStorage.cs +++ b/GarmentFactoryListImplement/Implements/ShopStorage.cs @@ -2,6 +2,7 @@ using GarmentFactoryContracts.SearchModels; using GarmentFactoryContracts.StoragesContracts; using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; using GarmentFactoryListImplement.Models; using System; using System.Collections.Generic; @@ -109,5 +110,15 @@ namespace GarmentFactoryListImplement.Implements } return null; } - } + + public bool Sell(SupplySearchModel model) + { + throw new NotImplementedException(); + } + + public bool RestockShops(SupplyBindingModel model) + { + throw new NotImplementedException(); + } + } } diff --git a/GarmentFactoryListImplement/Models/Shop.cs b/GarmentFactoryListImplement/Models/Shop.cs index c3911ad..34f85e3 100644 --- a/GarmentFactoryListImplement/Models/Shop.cs +++ b/GarmentFactoryListImplement/Models/Shop.cs @@ -20,7 +20,10 @@ namespace GarmentFactoryListImplement.Models public Dictionary ShopTextiles { get; private set; } = new(); - public static Shop? Create(ShopBindingModel? model) + public int TextileMaxCount { get; private set; } + + + public static Shop? Create(ShopBindingModel? model) { if (model == null) { @@ -33,7 +36,8 @@ namespace GarmentFactoryListImplement.Models ShopName = model.ShopName, Address = model.Address, DateOpen = model.DateOpen, - ShopTextiles = model.ShopTextiles + ShopTextiles = model.ShopTextiles, + TextileMaxCount = model.TextileMaxCount }; } public void Update(ShopBindingModel? model) @@ -46,14 +50,17 @@ namespace GarmentFactoryListImplement.Models Address = model.Address; DateOpen = model.DateOpen; ShopTextiles = model.ShopTextiles; - } + TextileMaxCount = model.TextileMaxCount; + + } public ShopViewModel GetViewModel => new() { Id = Id, ShopName = ShopName, Address = Address, DateOpen = DateOpen, - ShopTextiles = ShopTextiles - }; + ShopTextiles = ShopTextiles, + TextileMaxCount = TextileMaxCount + }; } }