This commit is contained in:
Kate 2023-04-21 04:01:40 +03:00
parent 2d496a2b59
commit a846d80715
20 changed files with 685 additions and 32 deletions

View File

@ -14,9 +14,11 @@ namespace PrecastConcretePlantFileImplement
private readonly string ComponentFileName = "Component.xml";
private readonly string OrderFileName = "Order.xml";
private readonly string ReinforcedFileName = "Reinforced.xml";
private readonly string ShopFileName = "Shop.xml";
public List<Component> Components { get; private set; }
public List<Order> Orders { get; private set; }
public List<Reinforced> Reinforceds { get; private set; }
public List<Shop> Shops { get; private set; }
public static DataFileSingleton GetInstance()
{
if (instance == null)
@ -31,6 +33,7 @@ namespace PrecastConcretePlantFileImplement
"Reiforceds", 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 =>
@ -38,6 +41,7 @@ namespace PrecastConcretePlantFileImplement
Reinforceds = LoadData(ReinforcedFileName, "Reinforced", x =>
Reinforced.Create(x)!)!;
Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
}
private static List<T>? LoadData<T>(string filename, string xmlNodeName,
Func<XElement, T> selectFunction)

View File

@ -0,0 +1,123 @@
using PrecastConcretePlantContracts.BindingModels;
using PrecastConcretePlantContracts.SearchModels;
using PrecastConcretePlantContracts.StoragesContracts;
using PrecastConcretePlantContracts.ViewModels;
using PrecastConcretePlantDataModels.Models;
using PrecastConcretePlantFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PrecastConcretePlantFileImplement.Implements
{
public class ShopStorage : IShopStorage
{
private readonly DataFileSingleton source;
public ShopStorage()
{
source = DataFileSingleton.GetInstance();
}
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 List<ShopViewModel> 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 List<ShopViewModel> GetFullList()
{
return source.Shops.Select(x => x.GetViewModel).ToList();
}
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 element = source.Shops.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
source.Shops.Remove(element);
source.SaveShops();
return element.GetViewModel;
}
return null;
}
public bool SellReinforceds(IReinforcedModel model, int count)
{
int availableQuantity = source.Shops.Select(x => x.Reinforceds.FirstOrDefault(y => y.Key == model.Id).Value.Item2).Sum();
if (availableQuantity < count)
{
return false;
}
var shops = source.Shops.Where(x => x.Reinforceds.ContainsKey(model.Id));
foreach (var shop in shops)
{
int countInCurrentShop = shop.Reinforceds[model.Id].Item2;
if (countInCurrentShop <= count)
{
shop.Reinforceds[model.Id] = (shop.Reinforceds[model.Id].Item1, 0);
count -= countInCurrentShop;
}
else
{
shop.Reinforceds[model.Id] = (shop.Reinforceds[model.Id].Item1, countInCurrentShop - count);
count = 0;
}
Update(new ShopBindingModel
{
Id = shop.Id,
ShopName = shop.ShopName,
Address = shop.Address,
DateOpening = shop.DateOpening,
Reinforceds = shop.Reinforceds,
Capacity = shop.Capacity
});
if (count == 0)
{
return true;
}
}
return false;
}
}
}

View File

@ -0,0 +1,109 @@
using PrecastConcretePlantContracts.BindingModels;
using PrecastConcretePlantContracts.ViewModels;
using PrecastConcretePlantDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace PrecastConcretePlantFileImplement.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 DateOpening { get; private set; }
public int Capacity { get; private set; }
public Dictionary<int, int> ReinforcedsCount = new();
public Dictionary<int, (IReinforcedModel, int)>? _reinforceds = null;
public Dictionary<int, (IReinforcedModel, int)> Reinforceds
{
get
{
if (_reinforceds == null)
{
var source = DataFileSingleton.GetInstance();
_reinforceds = ReinforcedsCount.ToDictionary(
x => x.Key,
y => ((source.Reinforceds.FirstOrDefault(z => z.Id == y.Key) as IReinforcedModel)!,
y.Value)
);
}
return _reinforceds;
}
}
public static Shop? Create(ShopBindingModel? model)
{
if (model == null)
{
return null;
}
return new Shop()
{
Id = model.Id,
ShopName = model.ShopName,
Address = model.Address,
DateOpening = model.DateOpening,
Capacity = model.Capacity,
ReinforcedsCount = model.Reinforceds.ToDictionary(x => x.Key, x => x.Value.Item2)
};
}
public static Shop? Create(XElement element)
{
if (element == null)
{
return null;
}
return new Shop()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
ShopName = element.Element("ShopName")!.Value,
Address = element.Element("Address")!.Value,
DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value),
Capacity = Convert.ToInt32(element.Element("Capacity")!.Value),
ReinforcedsCount = element.Element("Reinforceds")!.Elements("Reinforced")
.ToDictionary(
x => Convert.ToInt32(x.Element("Key")?.Value),
x => Convert.ToInt32(x.Element("Value")?.Value))
};
}
public void Update(ShopBindingModel? model)
{
if (model == null)
{
return;
}
ShopName = model.ShopName;
Address = model.Address;
DateOpening = model.DateOpening;
Capacity = model.Capacity;
ReinforcedsCount = model.Reinforceds.ToDictionary(x => x.Key, x => x.Value.Item2);
_reinforceds = null;
}
public ShopViewModel GetViewModel => new()
{
Id = Id,
ShopName = ShopName,
Address = Address,
DateOpening = DateOpening,
Capacity = Capacity,
Reinforceds = Reinforceds
};
public XElement GetXElement => new("Shop",
new XAttribute("Id", Id),
new XElement("ShopName", ShopName),
new XElement("Address", Address),
new XElement("DateOpening", DateOpening.ToString()),
new XElement("Capacity", Capacity.ToString()),
new XElement("Reinforceds", ReinforcedsCount.Select(x =>
new XElement("Reinforced",
new XElement("Key", x.Key),
new XElement("Value", x.Value)))
.ToArray()));
}
}

View File

@ -40,6 +40,7 @@
this.IssuedOrderButton = new System.Windows.Forms.Button();
this.UpdateListButton = new System.Windows.Forms.Button();
this.AddShopButton = new System.Windows.Forms.Button();
this.ButtonSell = new System.Windows.Forms.Button();
this.MenuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DataGridView)).BeginInit();
this.SuspendLayout();
@ -154,11 +155,22 @@
this.AddShopButton.UseVisualStyleBackColor = true;
this.AddShopButton.Click += new System.EventHandler(this.AddShopButton_Click);
//
// ButtonSell
//
this.ButtonSell.Location = new System.Drawing.Point(825, 272);
this.ButtonSell.Name = "ButtonSell";
this.ButtonSell.Size = new System.Drawing.Size(104, 38);
this.ButtonSell.TabIndex = 8;
this.ButtonSell.Text = "Продать";
this.ButtonSell.UseVisualStyleBackColor = true;
this.ButtonSell.Click += new System.EventHandler(this.ButtonSell_Click);
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(953, 450);
this.Controls.Add(this.ButtonSell);
this.Controls.Add(this.AddShopButton);
this.Controls.Add(this.UpdateListButton);
this.Controls.Add(this.IssuedOrderButton);
@ -193,5 +205,6 @@
private Button UpdateListButton;
private ToolStripMenuItem магазиныToolStripMenuItem;
private Button AddShopButton;
private Button ButtonSell;
}
}

View File

@ -198,5 +198,15 @@ namespace PrecastConcretePlantView
LoadData();
}
}
private void ButtonSell_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormSellReinforced));
if (service is FormSellReinforced form)
{
form.ShowDialog();
LoadData();
}
}
}
}

View File

@ -0,0 +1,128 @@
namespace PrecastConcretePlantView
{
partial class FormSellReinforced
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.labelReinforced = new System.Windows.Forms.Label();
this.comboBoxReinforced = new System.Windows.Forms.ComboBox();
this.labelCount = new System.Windows.Forms.Label();
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonSave = new System.Windows.Forms.Button();
this.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
this.SuspendLayout();
//
// labelReinforced
//
this.labelReinforced.AutoSize = true;
this.labelReinforced.Location = new System.Drawing.Point(27, 9);
this.labelReinforced.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelReinforced.Name = "labelReinforced";
this.labelReinforced.Size = new System.Drawing.Size(34, 15);
this.labelReinforced.TabIndex = 1;
this.labelReinforced.Text = "ЖБИ";
//
// comboBoxReinforced
//
this.comboBoxReinforced.FormattingEnabled = true;
this.comboBoxReinforced.Location = new System.Drawing.Point(88, 7);
this.comboBoxReinforced.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.comboBoxReinforced.Name = "comboBoxReinforced";
this.comboBoxReinforced.Size = new System.Drawing.Size(195, 23);
this.comboBoxReinforced.TabIndex = 2;
//
// labelCount
//
this.labelCount.AutoSize = true;
this.labelCount.Location = new System.Drawing.Point(8, 41);
this.labelCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelCount.Name = "labelCount";
this.labelCount.Size = new System.Drawing.Size(72, 15);
this.labelCount.TabIndex = 3;
this.labelCount.Text = "Количество";
//
// buttonCancel
//
this.buttonCancel.Location = new System.Drawing.Point(203, 77);
this.buttonCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(78, 20);
this.buttonCancel.TabIndex = 4;
this.buttonCancel.Text = "Отмена";
this.buttonCancel.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
//
// buttonSave
//
this.buttonSave.Location = new System.Drawing.Point(120, 77);
this.buttonSave.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.buttonSave.Name = "buttonSave";
this.buttonSave.Size = new System.Drawing.Size(78, 20);
this.buttonSave.TabIndex = 5;
this.buttonSave.Text = "Сохранить";
this.buttonSave.UseVisualStyleBackColor = true;
this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
//
// numericUpDownCount
//
this.numericUpDownCount.Location = new System.Drawing.Point(88, 40);
this.numericUpDownCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.numericUpDownCount.Name = "numericUpDownCount";
this.numericUpDownCount.Size = new System.Drawing.Size(194, 23);
this.numericUpDownCount.TabIndex = 6;
//
// FormSellReinforced
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(293, 105);
this.Controls.Add(this.numericUpDownCount);
this.Controls.Add(this.buttonSave);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.labelCount);
this.Controls.Add(this.comboBoxReinforced);
this.Controls.Add(this.labelReinforced);
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "FormSellReinforced";
this.Text = "Продажа ЖБИ";
((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private Label labelReinforced;
private ComboBox comboBoxReinforced;
private Label labelCount;
private Button buttonCancel;
private Button buttonSave;
private NumericUpDown numericUpDownCount;
}
}

View File

@ -0,0 +1,86 @@
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;
using PrecastConcretePlantBusinessLogic.BusinessLogic;
using PrecastConcretePlantContracts.BusinessLogicsContracts;
using PrecastConcretePlantContracts.ViewModels;
namespace PrecastConcretePlantView
{
public partial class FormSellReinforced : Form
{
private readonly ILogger _logger;
private readonly IShopLogic _shopLogic;
private readonly IReinforcedLogic _reinforcedLogic;
private readonly List<ReinforcedViewModel>? _listReinforced;
public FormSellReinforced(ILogger<FormSellReinforced> logger, IShopLogic shopLogic, IReinforcedLogic reinforcedLogic)
{
InitializeComponent();
_logger = logger;
_shopLogic = shopLogic;
_reinforcedLogic = reinforcedLogic;
_listReinforced = reinforcedLogic.ReadList(null);
if (_listReinforced != null)
{
comboBoxReinforced.DisplayMember = "ReinforcedName";
comboBoxReinforced.ValueMember = "Id";
comboBoxReinforced.DataSource = _listReinforced;
comboBoxReinforced.SelectedItem = null;
}
}
private void ButtonSave_Click(object sender, EventArgs e)
{
if (comboBoxReinforced.SelectedValue == null)
{
MessageBox.Show("Выберите ЖБИ", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (string.IsNullOrEmpty(numericUpDownCount.Text))
{
MessageBox.Show("Заполните количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
_logger.LogInformation("Продажа ЖБИ");
try
{
var reinforced = _reinforcedLogic.ReadElement(new()
{
Id = (int)comboBoxReinforced.SelectedValue
});
if (reinforced == null)
{
throw new Exception("ЖБИ не найдено. Дополнительная информация в логах.");
}
var operationResult = _shopLogic.SellReinforced(
model: reinforced,
count: (int)numericUpDownCount.Value
);
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();
}
}
}

View File

@ -0,0 +1,60 @@
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -36,25 +36,28 @@
this.labelTime = new System.Windows.Forms.Label();
this.labelAddress = new System.Windows.Forms.Label();
this.dataGridView = new System.Windows.Forms.DataGridView();
this.labelShop = new System.Windows.Forms.Label();
this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnReinforcedName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.labelShop = new System.Windows.Forms.Label();
this.labelCapacity = new System.Windows.Forms.Label();
this.numericUpDownCapacity = new System.Windows.Forms.NumericUpDown();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownCapacity)).BeginInit();
this.SuspendLayout();
//
// dateTimePicker
//
this.dateTimePicker.Location = new System.Drawing.Point(393, 33);
this.dateTimePicker.Location = new System.Drawing.Point(296, 33);
this.dateTimePicker.Name = "dateTimePicker";
this.dateTimePicker.Size = new System.Drawing.Size(207, 23);
this.dateTimePicker.Size = new System.Drawing.Size(124, 23);
this.dateTimePicker.TabIndex = 28;
//
// textBoxShop
//
this.textBoxShop.Location = new System.Drawing.Point(19, 33);
this.textBoxShop.Name = "textBoxShop";
this.textBoxShop.Size = new System.Drawing.Size(141, 23);
this.textBoxShop.Size = new System.Drawing.Size(119, 23);
this.textBoxShop.TabIndex = 27;
//
// buttonSave
@ -81,15 +84,15 @@
//
// textBoxAddress
//
this.textBoxAddress.Location = new System.Drawing.Point(166, 33);
this.textBoxAddress.Location = new System.Drawing.Point(146, 33);
this.textBoxAddress.Name = "textBoxAddress";
this.textBoxAddress.Size = new System.Drawing.Size(221, 23);
this.textBoxAddress.Size = new System.Drawing.Size(141, 23);
this.textBoxAddress.TabIndex = 24;
//
// labelTime
//
this.labelTime.AutoSize = true;
this.labelTime.Location = new System.Drawing.Point(393, 15);
this.labelTime.Location = new System.Drawing.Point(296, 15);
this.labelTime.Name = "labelTime";
this.labelTime.Size = new System.Drawing.Size(87, 15);
this.labelTime.TabIndex = 23;
@ -98,7 +101,7 @@
// labelAddress
//
this.labelAddress.AutoSize = true;
this.labelAddress.Location = new System.Drawing.Point(166, 15);
this.labelAddress.Location = new System.Drawing.Point(146, 15);
this.labelAddress.Name = "labelAddress";
this.labelAddress.Size = new System.Drawing.Size(40, 15);
this.labelAddress.TabIndex = 22;
@ -121,15 +124,6 @@
this.dataGridView.Size = new System.Drawing.Size(581, 240);
this.dataGridView.TabIndex = 21;
//
// labelShop
//
this.labelShop.AutoSize = true;
this.labelShop.Location = new System.Drawing.Point(19, 15);
this.labelShop.Name = "labelShop";
this.labelShop.Size = new System.Drawing.Size(54, 15);
this.labelShop.TabIndex = 20;
this.labelShop.Text = "Магазин";
//
// ColumnID
//
this.ColumnID.HeaderText = "ID";
@ -152,11 +146,40 @@
this.ColumnCount.Name = "ColumnCount";
this.ColumnCount.Width = 150;
//
// labelShop
//
this.labelShop.AutoSize = true;
this.labelShop.Location = new System.Drawing.Point(19, 15);
this.labelShop.Name = "labelShop";
this.labelShop.Size = new System.Drawing.Size(54, 15);
this.labelShop.TabIndex = 20;
this.labelShop.Text = "Магазин";
//
// labelCapacity
//
this.labelCapacity.AutoSize = true;
this.labelCapacity.Location = new System.Drawing.Point(428, 15);
this.labelCapacity.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelCapacity.Name = "labelCapacity";
this.labelCapacity.Size = new System.Drawing.Size(80, 15);
this.labelCapacity.TabIndex = 30;
this.labelCapacity.Text = "Вместимость";
//
// numericUpDownCapacity
//
this.numericUpDownCapacity.Location = new System.Drawing.Point(428, 33);
this.numericUpDownCapacity.Margin = new System.Windows.Forms.Padding(2);
this.numericUpDownCapacity.Name = "numericUpDownCapacity";
this.numericUpDownCapacity.Size = new System.Drawing.Size(158, 23);
this.numericUpDownCapacity.TabIndex = 29;
//
// FormShop
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(618, 347);
this.Controls.Add(this.labelCapacity);
this.Controls.Add(this.numericUpDownCapacity);
this.Controls.Add(this.dateTimePicker);
this.Controls.Add(this.textBoxShop);
this.Controls.Add(this.buttonSave);
@ -170,6 +193,7 @@
this.Text = "Магазин";
this.Load += new System.EventHandler(this.FormShop_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownCapacity)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -189,5 +213,7 @@
private DataGridViewTextBoxColumn ColumnID;
private DataGridViewTextBoxColumn ColumnReinforcedName;
private DataGridViewTextBoxColumn ColumnCount;
private Label labelCapacity;
private NumericUpDown numericUpDownCapacity;
}
}

View File

@ -47,6 +47,7 @@ namespace PrecastConcretePlantView
textBoxShop.Text = view.ShopName;
textBoxAddress.Text = view.Address;
dateTimePicker.Text = view.DateOpening.ToString();
numericUpDownCapacity.Value = view.Capacity;
_shopReinforceds = view.Reinforceds ?? new Dictionary<int, (IReinforcedModel, int)>();
LoadData();
}
@ -101,6 +102,7 @@ namespace PrecastConcretePlantView
ShopName = textBoxShop.Text,
Address = textBoxAddress.Text,
DateOpening = dateTimePicker.Value.Date,
Capacity = (int)numericUpDownCapacity.Value,
Reinforceds = _shopReinforceds
};
var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
@ -124,5 +126,7 @@ namespace PrecastConcretePlantView
DialogResult = DialogResult.Cancel;
Close();
}
}
}

View File

@ -49,6 +49,7 @@ namespace PrecastConcretePlant
services.AddTransient<FormShopReinforced>();
services.AddTransient<FormShops>();
services.AddTransient<FormShop>();
services.AddTransient<FormSellReinforced>();
}
}
}

View File

@ -17,11 +17,15 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
{
private readonly ILogger _logger;
private readonly IOrderStorage _orderStorage;
private readonly IShopLogic _shopLogic;
private readonly IReinforcedStorage _reinforcedStorage;
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, IReinforcedStorage reinforcedStorage)
{
_logger = logger;
_orderStorage = orderStorage;
_shopLogic = shopLogic;
_reinforcedStorage = reinforcedStorage;
}
public bool CreateOrder(OrderBindingModel model)
@ -46,28 +50,42 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
return true;
}
public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
private bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
{
CheckModel(model);
if (model.Status + 1 != newStatus)
var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
if (viewModel == null)
{
_logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect.");
throw new ArgumentNullException(nameof(model));
}
if (viewModel.Status + 1 != newStatus)
{
_logger.LogWarning("Change status operation failed");
return false;
}
model.Status = newStatus;
if (model.Status == OrderStatus.Выдан)
if (model.Status == OrderStatus.Готов)
{
model.DateImplement = DateTime.Now;
var reinforced = _reinforcedStorage.GetElement(new() { Id = viewModel.ReinforcedId });
if (reinforced == null)
{
throw new ArgumentNullException(nameof(reinforced));
}
if (!_shopLogic.AddReinforced(reinforced, viewModel.Count))
{
throw new Exception($"AddReinforced operation failed");
}
}
else
{
model.DateImplement = viewModel.DateImplement;
}
CheckModel(model, false);
if (_orderStorage.Update(model) == null)
{
model.Status--;
_logger.LogWarning("Update operation failed");
_logger.LogWarning("Change status operation failed");
return false;
}
return true;
}
public bool TakeOrderInWork(OrderBindingModel model)

View File

@ -124,7 +124,11 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
_logger.LogWarning("AddReinforcedInShop element not found");
return false;
}
_logger.LogInformation("AddReinforcedInShop find. Id:{Id}", shop.Id);
if (shop.Capacity - shop.Reinforceds.Select(x => x.Value.Item2).Sum() < count)
{
throw new ArgumentNullException("В магазине не хватает места", nameof(count));
}
else _logger.LogInformation("AddReinforcedInShop find. Id:{Id}", shop.Id);
if (shop.Reinforceds.ContainsKey(reinforced.Id))
{
@ -144,9 +148,61 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
Address = shop.Address,
ShopName = shop.ShopName,
DateOpening = shop.DateOpening,
Reinforceds = shop.Reinforceds
Reinforceds = shop.Reinforceds,
Capacity = shop.Capacity
});
return true;
}
public bool AddReinforced(IReinforcedModel model, int count)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
if (count <= 0)
{
throw new ArgumentException("Количество ЖБИ должно быть больше 0", nameof(count));
}
_logger.LogInformation("AddReinforceds. ShopName:{ShopName}. Id:{Id}", model.ReinforcedName, model.Id);
var allFreeQuantity = _shopStorage.GetFullList().Select(x => x.Capacity - x.Reinforceds.Select(x => x.Value.Item2).Sum()).Sum();
if (allFreeQuantity < count)
{
_logger.LogWarning("AddReinforceds operation failed.");
return false;
}
foreach (var shop in _shopStorage.GetFullList())
{
int freeQuantity = shop.Capacity - shop.Reinforceds.Select(x => x.Value.Item2).Sum();
if (freeQuantity < count)
{
if (!AddReinforcedInShop(new() { Id = shop.Id }, model, freeQuantity))
{
_logger.LogWarning("AddReinforceds operation failed.");
return false;
}
count -= freeQuantity;
}
else
{
if (!AddReinforcedInShop(new() { Id = shop.Id }, model, count))
{
_logger.LogWarning("AddReinforceds operation failed.");
return false;
}
count = 0;
}
if (count == 0)
{
return true;
}
}
_logger.LogWarning("AddReinforceds operation failed.");
return false;
}
public bool SellReinforced(IReinforcedModel model, int count)
{
return _shopStorage.SellReinforceds(model, count);
}
}
}

View File

@ -16,6 +16,8 @@ namespace PrecastConcretePlantContracts.BindingModels
public DateTime DateOpening { get; set; } = DateTime.Now;
public int Capacity { get; set; }
public Dictionary<int, (IReinforcedModel, int)> Reinforceds
{
get;

View File

@ -18,5 +18,7 @@ namespace PrecastConcretePlantContracts.BusinessLogicsContracts
bool Update(ShopBindingModel model);
bool Delete(ShopBindingModel model);
bool AddReinforcedInShop(ShopSearchModel model, IReinforcedModel reinforced, int count);
bool AddReinforced(IReinforcedModel model, int count);
bool SellReinforced(IReinforcedModel model, int count);
}
}

View File

@ -6,6 +6,7 @@ using System.Threading.Tasks;
using PrecastConcretePlantContracts.ViewModels;
using PrecastConcretePlantContracts.BindingModels;
using PrecastConcretePlantContracts.SearchModels;
using PrecastConcretePlantDataModels.Models;
namespace PrecastConcretePlantContracts.StoragesContracts
{
@ -17,5 +18,6 @@ namespace PrecastConcretePlantContracts.StoragesContracts
ShopViewModel? Insert(ShopBindingModel model);
ShopViewModel? Update(ShopBindingModel model);
ShopViewModel? Delete(ShopBindingModel model);
bool SellReinforceds(IReinforcedModel model, int count);
}
}

View File

@ -20,6 +20,8 @@ namespace PrecastConcretePlantContracts.ViewModels
[DisplayName("Дата открытия")]
public DateTime DateOpening { get; set; } = DateTime.Now;
[DisplayName("Вместимость магазина")]
public int Capacity { get; set; }
public Dictionary<int, (IReinforcedModel, int)> Reinforceds
{
get;

View File

@ -11,6 +11,7 @@ namespace PrecastConcretePlantDataModels.Models
string ShopName { get; }
string Address { get; }
DateTime DateOpening { get; }
public int Capacity { get; }
Dictionary<int, (IReinforcedModel, int)> Reinforceds { get; }
}
}

View File

@ -2,6 +2,7 @@
using PrecastConcretePlantContracts.SearchModels;
using PrecastConcretePlantContracts.StoragesContracts;
using PrecastConcretePlantContracts.ViewModels;
using PrecastConcretePlantDataModels.Models;
using PrecastConcretePlantListImplement.Models;
using System;
using System.Collections.Generic;
@ -103,5 +104,9 @@ namespace PrecastConcretePlantListImplement.Implements
}
return null;
}
public bool SellReinforceds(IReinforcedModel model, int count)
{
throw new NotImplementedException();
}
}
}

View File

@ -15,6 +15,7 @@ namespace PrecastConcretePlantListImplement.Models
public string ShopName { get; private set; } = string.Empty;
public string Address { get; private set; } = string.Empty;
public DateTime DateOpening { get; private set; }
public int Capacity { get; private set; }
public Dictionary<int, (IReinforcedModel, int)> Reinforceds
{
get;