diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.Designer.cs b/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.Designer.cs
new file mode 100644
index 0000000..cc46963
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.Designer.cs
@@ -0,0 +1,173 @@
+namespace PrecastConcretePlantView
+{
+ partial class FormImplementer
+ {
+ ///
+ /// 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()
+ {
+ label1 = new Label();
+ label2 = new Label();
+ label3 = new Label();
+ label4 = new Label();
+ textBoxFio = new TextBox();
+ textBoxPassword = new TextBox();
+ numericUpDownWorkExperience = new NumericUpDown();
+ numericUpDownQualification = new NumericUpDown();
+ buttonCancel = new Button();
+ buttonSave = new Button();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownWorkExperience).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownQualification).BeginInit();
+ SuspendLayout();
+ //
+ // label1
+ //
+ label1.AutoSize = true;
+ label1.Location = new Point(79, 12);
+ label1.Name = "label1";
+ label1.Size = new Size(37, 15);
+ label1.TabIndex = 0;
+ label1.Text = "ФИО:";
+ //
+ // label2
+ //
+ label2.AutoSize = true;
+ label2.Location = new Point(69, 41);
+ label2.Name = "label2";
+ label2.Size = new Size(52, 15);
+ label2.TabIndex = 1;
+ label2.Text = "Пароль:";
+ //
+ // label3
+ //
+ label3.AutoSize = true;
+ label3.Location = new Point(78, 68);
+ label3.Name = "label3";
+ label3.Size = new Size(38, 15);
+ label3.TabIndex = 2;
+ label3.Text = "Стаж:";
+ //
+ // label4
+ //
+ label4.AutoSize = true;
+ label4.Location = new Point(25, 97);
+ label4.Name = "label4";
+ label4.Size = new Size(91, 15);
+ label4.TabIndex = 3;
+ label4.Text = "Квалификация:";
+ //
+ // textBoxFio
+ //
+ textBoxFio.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ textBoxFio.Location = new Point(127, 9);
+ textBoxFio.Name = "textBoxFio";
+ textBoxFio.Size = new Size(271, 23);
+ textBoxFio.TabIndex = 4;
+ //
+ // textBoxPassword
+ //
+ textBoxPassword.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ textBoxPassword.Location = new Point(127, 38);
+ textBoxPassword.Name = "textBoxPassword";
+ textBoxPassword.PasswordChar = '*';
+ textBoxPassword.Size = new Size(271, 23);
+ textBoxPassword.TabIndex = 5;
+ //
+ // numericUpDownWorkExperience
+ //
+ numericUpDownWorkExperience.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ numericUpDownWorkExperience.Location = new Point(127, 66);
+ numericUpDownWorkExperience.Name = "numericUpDownWorkExperience";
+ numericUpDownWorkExperience.Size = new Size(271, 23);
+ numericUpDownWorkExperience.TabIndex = 6;
+ //
+ // numericUpDownQualification
+ //
+ numericUpDownQualification.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ numericUpDownQualification.Location = new Point(127, 95);
+ numericUpDownQualification.Name = "numericUpDownQualification";
+ numericUpDownQualification.Size = new Size(271, 23);
+ numericUpDownQualification.TabIndex = 7;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonCancel.Location = new Point(309, 138);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(89, 33);
+ buttonCancel.TabIndex = 8;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ buttonCancel.Click += ButtonCancel_Click;
+ //
+ // buttonSave
+ //
+ buttonSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonSave.Location = new Point(214, 138);
+ buttonSave.Name = "buttonSave";
+ buttonSave.Size = new Size(89, 33);
+ buttonSave.TabIndex = 9;
+ buttonSave.Text = "Сохранить";
+ buttonSave.UseVisualStyleBackColor = true;
+ buttonSave.Click += ButtonSave_Click;
+ //
+ // FormImplementer
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(410, 183);
+ Controls.Add(buttonSave);
+ Controls.Add(buttonCancel);
+ Controls.Add(numericUpDownQualification);
+ Controls.Add(numericUpDownWorkExperience);
+ Controls.Add(textBoxPassword);
+ Controls.Add(textBoxFio);
+ Controls.Add(label4);
+ Controls.Add(label3);
+ Controls.Add(label2);
+ Controls.Add(label1);
+ Name = "FormImplementer";
+ Text = "Добавление / Редактирование исполнителя";
+ Load += FormImplementer_Load;
+ ((System.ComponentModel.ISupportInitialize)numericUpDownWorkExperience).EndInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownQualification).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private Label label1;
+ private Label label2;
+ private Label label3;
+ private Label label4;
+ private TextBox textBoxFio;
+ private TextBox textBoxPassword;
+ private NumericUpDown numericUpDownWorkExperience;
+ private NumericUpDown numericUpDownQualification;
+ private Button buttonCancel;
+ private Button buttonSave;
+ }
+}
\ No newline at end of file
diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.cs b/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.cs
new file mode 100644
index 0000000..ce15479
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.cs
@@ -0,0 +1,101 @@
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.BusinessLogicsContracts;
+using PrecastConcretePlantContracts.SearchModels;
+using Microsoft.Extensions.Logging;
+using System.Windows.Forms;
+
+namespace PrecastConcretePlantView
+{
+ public partial class FormImplementer : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IImplementerLogic _logic;
+ private int? _id;
+ public int Id { set { _id = value; } }
+
+ public FormImplementer(ILogger logger, IImplementerLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormImplementer_Load(object sender, EventArgs e)
+ {
+ if (_id.HasValue)
+ {
+ try
+ {
+ _logger.LogInformation("Получение исполнителя");
+ var view = _logic.ReadElement(new ImplementerSearchModel
+ {
+ Id = _id.Value
+ });
+ if (view != null)
+ {
+ textBoxFio.Text = view.ImplementerFIO;
+ textBoxPassword.Text = view.Password;
+ numericUpDownQualification.Value = view.Qualification;
+ numericUpDownWorkExperience.Value = view.WorkExperience;
+ }
+ }
+ 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(textBoxPassword.Text))
+ {
+ MessageBox.Show("Заполните пароль", "Ошибка",
+ MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ if (string.IsNullOrEmpty(textBoxFio.Text))
+ {
+ MessageBox.Show("Заполните фио", "Ошибка",
+ MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _logger.LogInformation("Сохранение исполнителя");
+ try
+ {
+ var model = new ImplementerBindingModel
+ {
+ Id = _id ?? 0,
+ ImplementerFIO = textBoxFio.Text,
+ Password = textBoxPassword.Text,
+ Qualification = (int)numericUpDownQualification.Value,
+ WorkExperience = (int)numericUpDownWorkExperience.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();
+ }
+
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.resx b/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormImplementer.resx
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs b/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs
index 2476113..c4a1133 100644
--- a/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs
@@ -33,7 +33,8 @@
this.ИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.КлиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.магазиныToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.исполнителиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.МагазинtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.списокДокументовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.компонентыПоДокументамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -41,14 +42,11 @@
this.списокМагазиновToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.магазиныСИзделиямиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.списокГруппЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DataGridView = new System.Windows.Forms.DataGridView();
this.CreateOrderButton = new System.Windows.Forms.Button();
- this.TakeOrderInWorkButton = new System.Windows.Forms.Button();
- this.OrderReadyButton = new System.Windows.Forms.Button();
this.IssuedOrderButton = new System.Windows.Forms.Button();
this.UpdateListButton = new System.Windows.Forms.Button();
- this.SellReinforcedButton = new System.Windows.Forms.Button();
this.buttonSellReinforced = new System.Windows.Forms.Button();
this.buttonAddReinforcedInShop = new System.Windows.Forms.Button();
this.MenuStrip.SuspendLayout();
@@ -60,7 +58,8 @@
this.MenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.СправочникиToolStripMenuItem,
- this.отчетыToolStripMenuItem});
+ this.отчетыToolStripMenuItem,
+ this.запускРаботToolStripMenuItem});
this.MenuStrip.Location = new System.Drawing.Point(0, 0);
this.MenuStrip.Name = "MenuStrip";
this.MenuStrip.Size = new System.Drawing.Size(1058, 24);
@@ -73,7 +72,8 @@
this.ИзделияToolStripMenuItem,
this.КомпонентыToolStripMenuItem,
this.КлиентыToolStripMenuItem,
- this.магазиныToolStripMenuItem1});
+ this.исполнителиToolStripMenuItem,
+ this.МагазинtoolStripMenuItem});
this.СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem";
this.СправочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
this.СправочникиToolStripMenuItem.Text = "Cправочники";
@@ -81,30 +81,37 @@
// ИзделияToolStripMenuItem
//
this.ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem";
- this.ИзделияToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.ИзделияToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.ИзделияToolStripMenuItem.Text = "Изделия";
this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click);
//
// КомпонентыToolStripMenuItem
//
this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
- this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.КомпонентыToolStripMenuItem.Text = "Компоненты";
this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
//
// КлиентыToolStripMenuItem
//
this.КлиентыToolStripMenuItem.Name = "КлиентыToolStripMenuItem";
- this.КлиентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
+ this.КлиентыToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.КлиентыToolStripMenuItem.Text = "Клиенты";
this.КлиентыToolStripMenuItem.Click += new System.EventHandler(this.КлиентыToolStripMenuItem_Click);
//
- // магазиныToolStripMenuItem1
+ // исполнителиToolStripMenuItem
//
- this.магазиныToolStripMenuItem1.Name = "магазиныToolStripMenuItem1";
- this.магазиныToolStripMenuItem1.Size = new System.Drawing.Size(145, 22);
- this.магазиныToolStripMenuItem1.Text = "Магазины";
- this.магазиныToolStripMenuItem1.Click += new System.EventHandler(this.магазиныToolStripMenuItem1_Click);
+ this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
+ this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
+ this.исполнителиToolStripMenuItem.Text = "Исполнители";
+ this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.исполнителиToolStripMenuItem_Click);
+ //
+ // МагазинtoolStripMenuItem
+ //
+ this.МагазинtoolStripMenuItem.Name = "МагазинtoolStripMenuItem";
+ this.МагазинtoolStripMenuItem.Size = new System.Drawing.Size(149, 22);
+ this.МагазинtoolStripMenuItem.Text = "Магазины";
+ this.МагазинtoolStripMenuItem.Click += new System.EventHandler(this.МагазинtoolStripMenuItem_Click);
//
// отчетыToolStripMenuItem
//
@@ -152,19 +159,21 @@
this.магазиныСИзделиямиToolStripMenuItem.Name = "магазиныСИзделиямиToolStripMenuItem";
this.магазиныСИзделиямиToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
this.магазиныСИзделиямиToolStripMenuItem.Text = "Магазины с изделиями";
- this.магазиныСИзделиямиToolStripMenuItem.Click += new System.EventHandler(this.магазиныСИзделиямиToolStripMenuItem_Click_1);
+ this.магазиныСИзделиямиToolStripMenuItem.Click += new System.EventHandler(this.магазиныСИзделиямиToolStripMenuItem_Click);
//
// списокГруппЗаказовToolStripMenuItem
//
this.списокГруппЗаказовToolStripMenuItem.Name = "списокГруппЗаказовToolStripMenuItem";
this.списокГруппЗаказовToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
this.списокГруппЗаказовToolStripMenuItem.Text = "Список групп заказов";
- this.списокГруппЗаказовToolStripMenuItem.Click += new System.EventHandler(this.списокГруппЗаказовToolStripMenuItem_Click_1);
+ this.списокГруппЗаказовToolStripMenuItem.Click += new System.EventHandler(this.списокГруппЗаказовToolStripMenuItem_Click);
//
- // магазиныToolStripMenuItem
+ // запускРаботToolStripMenuItem
//
- this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
- this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(32, 19);
+ this.запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
+ this.запускРаботToolStripMenuItem.Size = new System.Drawing.Size(92, 20);
+ this.запускРаботToolStripMenuItem.Text = "Запуск работ";
+ this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.запускРаботToolStripMenuItem_Click);
//
// DataGridView
//
@@ -186,29 +195,10 @@
this.CreateOrderButton.UseVisualStyleBackColor = true;
this.CreateOrderButton.Click += new System.EventHandler(this.CreateOrderButton_Click);
//
- // TakeOrderInWorkButton
- //
- this.TakeOrderInWorkButton.Location = new System.Drawing.Point(905, 66);
- this.TakeOrderInWorkButton.Name = "TakeOrderInWorkButton";
- this.TakeOrderInWorkButton.Size = new System.Drawing.Size(125, 39);
- this.TakeOrderInWorkButton.TabIndex = 3;
- this.TakeOrderInWorkButton.Text = "Отдать на выполнение";
- this.TakeOrderInWorkButton.UseVisualStyleBackColor = true;
- this.TakeOrderInWorkButton.Click += new System.EventHandler(this.TakeOrderInWorkButton_Click);
- //
- // OrderReadyButton
- //
- this.OrderReadyButton.Location = new System.Drawing.Point(905, 111);
- this.OrderReadyButton.Name = "OrderReadyButton";
- this.OrderReadyButton.Size = new System.Drawing.Size(125, 33);
- this.OrderReadyButton.TabIndex = 4;
- this.OrderReadyButton.Text = "Заказ готов";
- this.OrderReadyButton.UseVisualStyleBackColor = true;
- this.OrderReadyButton.Click += new System.EventHandler(this.OrderReadyButton_Click);
- //
// IssuedOrderButton
//
- this.IssuedOrderButton.Location = new System.Drawing.Point(905, 150);
+ this.IssuedOrderButton.Location = new System.Drawing.Point(905, 112);
+ this.IssuedOrderButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.IssuedOrderButton.Name = "IssuedOrderButton";
this.IssuedOrderButton.Size = new System.Drawing.Size(125, 33);
this.IssuedOrderButton.TabIndex = 5;
@@ -226,21 +216,11 @@
this.UpdateListButton.UseVisualStyleBackColor = true;
this.UpdateListButton.Click += new System.EventHandler(this.UpdateListButton_Click);
//
- // SellReinforcedButton
- //
- this.SellReinforcedButton.Location = new System.Drawing.Point(905, 276);
- this.SellReinforcedButton.Name = "SellReinforcedButton";
- this.SellReinforcedButton.Size = new System.Drawing.Size(125, 29);
- this.SellReinforcedButton.TabIndex = 8;
- this.SellReinforcedButton.Text = "Продать изделие";
- this.SellReinforcedButton.UseVisualStyleBackColor = true;
- this.SellReinforcedButton.Click += new System.EventHandler(this.SellReinforcedButton_Click);
- //
// buttonSellReinforced
//
- this.buttonSellReinforced.Location = new System.Drawing.Point(905, 228);
+ this.buttonSellReinforced.Location = new System.Drawing.Point(905, 295);
this.buttonSellReinforced.Name = "buttonSellReinforced";
- this.buttonSellReinforced.Size = new System.Drawing.Size(125, 34);
+ this.buttonSellReinforced.Size = new System.Drawing.Size(125, 33);
this.buttonSellReinforced.TabIndex = 7;
this.buttonSellReinforced.Text = "Продать изделие";
this.buttonSellReinforced.UseVisualStyleBackColor = true;
@@ -248,9 +228,9 @@
//
// buttonAddReinforcedInShop
//
- this.buttonAddReinforcedInShop.Location = new System.Drawing.Point(905, 268);
+ this.buttonAddReinforcedInShop.Location = new System.Drawing.Point(905, 365);
this.buttonAddReinforcedInShop.Name = "buttonAddReinforcedInShop";
- this.buttonAddReinforcedInShop.Size = new System.Drawing.Size(125, 43);
+ this.buttonAddReinforcedInShop.Size = new System.Drawing.Size(125, 39);
this.buttonAddReinforcedInShop.TabIndex = 8;
this.buttonAddReinforcedInShop.Text = "Пополнение магазина";
this.buttonAddReinforcedInShop.UseVisualStyleBackColor = true;
@@ -260,13 +240,11 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1058, 338);
+ this.ClientSize = new System.Drawing.Size(1058, 475);
this.Controls.Add(this.buttonAddReinforcedInShop);
this.Controls.Add(this.buttonSellReinforced);
this.Controls.Add(this.UpdateListButton);
this.Controls.Add(this.IssuedOrderButton);
- this.Controls.Add(this.OrderReadyButton);
- this.Controls.Add(this.TakeOrderInWorkButton);
this.Controls.Add(this.CreateOrderButton);
this.Controls.Add(this.DataGridView);
this.Controls.Add(this.MenuStrip);
@@ -288,24 +266,22 @@
private ToolStripMenuItem СправочникиToolStripMenuItem;
private ToolStripMenuItem ИзделияToolStripMenuItem;
private ToolStripMenuItem КомпонентыToolStripMenuItem;
- private ToolStripMenuItem магазиныToolStripMenuItem;
private ToolStripMenuItem отчетыToolStripMenuItem;
private ToolStripMenuItem списокДокументовToolStripMenuItem;
private ToolStripMenuItem компонентыПоДокументамToolStripMenuItem;
private ToolStripMenuItem списокЗаказовToolStripMenuItem;
private DataGridView DataGridView;
private Button CreateOrderButton;
- private Button TakeOrderInWorkButton;
- private Button OrderReadyButton;
private Button IssuedOrderButton;
private Button UpdateListButton;
private ToolStripMenuItem КлиентыToolStripMenuItem;
- public Button SellReinforcedButton;
+ private ToolStripMenuItem запускРаботToolStripMenuItem;
+ private ToolStripMenuItem исполнителиToolStripMenuItem;
+ private ToolStripMenuItem МагазинtoolStripMenuItem;
+ private Button buttonSellReinforced;
+ private Button buttonAddReinforcedInShop;
private ToolStripMenuItem списокМагазиновToolStripMenuItem;
private ToolStripMenuItem магазиныСИзделиямиToolStripMenuItem;
private ToolStripMenuItem списокГруппЗаказовToolStripMenuItem;
- private ToolStripMenuItem магазиныToolStripMenuItem1;
- private Button buttonSellReinforced;
- private Button buttonAddReinforcedInShop;
}
}
\ No newline at end of file
diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs b/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs
index 136b7b7..ab4a5d4 100644
--- a/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs
@@ -23,12 +23,14 @@ namespace PrecastConcretePlantView
private readonly ILogger _logger;
private readonly IOrderLogic _orderLogic;
private readonly IReportLogic _reportLogic;
- public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic)
+ private readonly IWorkProcess _workProcess;
+ public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
{
InitializeComponent();
_logger = logger;
_orderLogic = orderLogic;
_reportLogic = reportLogic;
+ _workProcess = workProcess;
LoadData();
}
@@ -50,6 +52,7 @@ namespace PrecastConcretePlantView
DataGridView.DataSource = list;
DataGridView.Columns["ReinforcedId"].Visible = false;
DataGridView.Columns["ClientId"].Visible = false;
+ DataGridView.Columns["ImplementerId"].Visible = false;
}
_logger.LogInformation("Загрузка заказов");
@@ -127,7 +130,7 @@ namespace PrecastConcretePlantView
if (DataGridView.SelectedRows.Count == 1)
{
int id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id);
+ _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id);
try
{
@@ -188,16 +191,6 @@ namespace PrecastConcretePlantView
}
- private void SellReinforcedButton_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormSellReinforced));
-
- if (service is FormSellReinforced form)
- {
- form.ShowDialog();
- }
- }
-
private void списокДокументовToolStripMenuItem_Click(object sender, EventArgs e)
{
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
@@ -238,7 +231,25 @@ namespace PrecastConcretePlantView
}
}
- private void магазиныToolStripMenuItem1_Click(object sender, EventArgs e)
+ private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ _workProcess.DoWork((
+ Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!,
+ _orderLogic);
+ MessageBox.Show("Процесс обработки запущен", "Сообщение",
+ MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+
+ private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormViewImplementers));
+ if (service is FormViewImplementers form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void МагазинtoolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormShops));
if (service is FormShops form)
@@ -247,6 +258,25 @@ namespace PrecastConcretePlantView
}
}
+ private void buttonSellReinforced_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormSellReinforced));
+
+ if (service is FormSellReinforced form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void buttonAddReinforcedInShop_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReinforcedShop));
+ if (service is FormReinforcedShop form)
+ {
+ form.ShowDialog();
+ }
+ }
+
private void списокМагазиновToolStripMenuItem_Click(object sender, EventArgs e)
{
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
@@ -257,7 +287,7 @@ namespace PrecastConcretePlantView
}
}
- private void магазиныСИзделиямиToolStripMenuItem_Click_1(object sender, EventArgs e)
+ private void магазиныСИзделиямиToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportShopReinforcedies));
if (service is FormReportShopReinforcedies form)
@@ -266,7 +296,7 @@ namespace PrecastConcretePlantView
}
}
- private void списокГруппЗаказовToolStripMenuItem_Click_1(object sender, EventArgs e)
+ private void списокГруппЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupOrders));
if (service is FormReportGroupOrders form)
@@ -274,23 +304,5 @@ namespace PrecastConcretePlantView
form.ShowDialog();
}
}
-
- private void buttonSellReinforced_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormSellReinforced));
- if (service is FormSellReinforced form)
- {
- form.ShowDialog();
- }
- }
-
- private void buttonAddReinforcedInShop_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormReinforcedShop));
- if (service is FormReinforcedShop form)
- {
- form.ShowDialog();
- }
- }
}
}
diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.Designer.cs b/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.Designer.cs
new file mode 100644
index 0000000..7203b96
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.Designer.cs
@@ -0,0 +1,118 @@
+namespace PrecastConcretePlantView
+{
+ partial class FormViewImplementers
+ {
+ ///
+ /// 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()
+ {
+ buttonRef = new Button();
+ buttonDel = new Button();
+ buttonUpd = new Button();
+ buttonAdd = new Button();
+ dataGridView = new DataGridView();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // buttonRef
+ //
+ buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+ buttonRef.Location = new Point(626, 202);
+ buttonRef.Name = "buttonRef";
+ buttonRef.Size = new Size(90, 37);
+ buttonRef.TabIndex = 9;
+ buttonRef.Text = "Обновить";
+ buttonRef.UseVisualStyleBackColor = true;
+ buttonRef.Click += ButtonRef_Click;
+ //
+ // buttonDel
+ //
+ buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+ buttonDel.Location = new Point(626, 151);
+ buttonDel.Name = "buttonDel";
+ buttonDel.Size = new Size(90, 33);
+ buttonDel.TabIndex = 8;
+ buttonDel.Text = "Удалить";
+ buttonDel.UseVisualStyleBackColor = true;
+ buttonDel.Click += ButtonDel_Click;
+ //
+ // buttonUpd
+ //
+ buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+ buttonUpd.Location = new Point(626, 102);
+ buttonUpd.Name = "buttonUpd";
+ buttonUpd.Size = new Size(90, 34);
+ buttonUpd.TabIndex = 7;
+ buttonUpd.Text = "Изменить";
+ buttonUpd.UseVisualStyleBackColor = true;
+ buttonUpd.Click += ButtonUpd_Click;
+ //
+ // buttonAdd
+ //
+ buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+ buttonAdd.Location = new Point(626, 57);
+ buttonAdd.Name = "buttonAdd";
+ buttonAdd.Size = new Size(90, 30);
+ buttonAdd.TabIndex = 6;
+ buttonAdd.Text = "Добавить";
+ buttonAdd.UseVisualStyleBackColor = true;
+ buttonAdd.Click += ButtonAdd_Click;
+ //
+ // dataGridView
+ //
+ dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Location = new Point(12, 12);
+ dataGridView.Name = "dataGridView";
+ dataGridView.RowTemplate.Height = 25;
+ dataGridView.Size = new Size(553, 302);
+ dataGridView.TabIndex = 5;
+ //
+ // FormViewImplementers
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(722, 319);
+ Controls.Add(buttonRef);
+ Controls.Add(buttonDel);
+ Controls.Add(buttonUpd);
+ Controls.Add(buttonAdd);
+ Controls.Add(dataGridView);
+ Name = "FormViewImplementers";
+ Text = "Просмотр списка исполнителей";
+ Load += FormViewImplementers_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private Button buttonRef;
+ private Button buttonDel;
+ private Button buttonUpd;
+ private Button buttonAdd;
+ private DataGridView dataGridView;
+ }
+}
\ No newline at end of file
diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.cs b/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.cs
new file mode 100644
index 0000000..f9b9ad5
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.cs
@@ -0,0 +1,112 @@
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.BusinessLogicsContracts;
+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 PrecastConcretePlantView
+{
+ public partial class FormViewImplementers : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IImplementerLogic _logic;
+ public FormViewImplementers(ILogger logger, IImplementerLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormViewImplementers_Load(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+ private void LoadData()
+ {
+ try
+ {
+ var list = _logic.ReadList(null);
+ if (list != null)
+ {
+ dataGridView.DataSource = list;
+ dataGridView.Columns["Id"].Visible = false;
+ dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ }
+ _logger.LogInformation("Загрузка исполнителей");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки исполнителей");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ private void ButtonAdd_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+ if (service is FormImplementer form)
+ {
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ LoadData();
+ }
+ }
+ }
+ private void ButtonUpd_Click(object sender, EventArgs e)
+ {
+ if (dataGridView.SelectedRows.Count == 1)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+ if (service is FormImplementer form)
+ {
+ form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ LoadData();
+ }
+ }
+ }
+ }
+ private void ButtonDel_Click(object sender, EventArgs e)
+ {
+ if (dataGridView.SelectedRows.Count == 1)
+ {
+ if (MessageBox.Show("Удалить запись?", "Вопрос",
+ MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+ {
+ int id =
+ Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+ _logger.LogInformation("Удаление исполнителя");
+ try
+ {
+ if (!_logic.Delete(new ImplementerBindingModel
+ {
+ Id = id
+ }))
+ {
+ throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+ }
+ LoadData();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка удаления исполнителя");
+ MessageBox.Show(ex.Message, "Ошибка",
+ MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+ }
+ private void ButtonRef_Click(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.resx b/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormViewImplementers.resx
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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/PrecastConcretePlant/PrecastConcretePlant/Program.cs b/PrecastConcretePlant/PrecastConcretePlant/Program.cs
index 3328679..a6828ee 100644
--- a/PrecastConcretePlant/PrecastConcretePlant/Program.cs
+++ b/PrecastConcretePlant/PrecastConcretePlant/Program.cs
@@ -43,6 +43,9 @@ namespace PrecastConcretePlantView
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
@@ -65,6 +68,9 @@ namespace PrecastConcretePlantView
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+
}
}
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ImplementerLogic.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ImplementerLogic.cs
new file mode 100644
index 0000000..a6728cf
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ImplementerLogic.cs
@@ -0,0 +1,129 @@
+using Microsoft.Extensions.Logging;
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.BusinessLogicsContracts;
+using PrecastConcretePlantContracts.SearchModels;
+using PrecastConcretePlantContracts.StoragesContracts;
+using PrecastConcretePlantContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantBusinessLogic.BusinessLogic
+{
+ public class ImplementerLogic : IImplementerLogic
+ {
+ private readonly ILogger _logger;
+ private readonly IImplementerStorage _implementerStorage;
+ public ImplementerLogic(ILogger logger, IImplementerStorage implementerStorage)
+ {
+ _logger = logger;
+ _implementerStorage = implementerStorage;
+ }
+
+ public bool Create(ImplementerBindingModel model)
+ {
+ CheckModel(model);
+ if (_implementerStorage.Insert(model) == null)
+ {
+ _logger.LogWarning("Insert operation failed");
+ return false;
+ }
+ return true;
+ }
+
+ public bool Delete(ImplementerBindingModel model)
+ {
+ CheckModel(model, false);
+ _logger.LogInformation("Delete. Id:{Id}", model.Id);
+ if (_implementerStorage.Delete(model) == null)
+ {
+ _logger.LogWarning("Delete operation failed");
+ return false;
+ }
+ return true;
+ }
+
+ public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+ _logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}",
+ model.ImplementerFIO, model.Id);
+ var element = _implementerStorage.GetElement(model);
+ if (element == null)
+ {
+ _logger.LogWarning("ReadElement element not found");
+ return null;
+ }
+ _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+ return element;
+ }
+
+ public List? ReadList(ImplementerSearchModel? model)
+ {
+ _logger.LogInformation("ReadList. FIO:{FIO}.Id:{ Id} ", model?.ImplementerFIO, model?.Id);
+ var list = (model == null) ? _implementerStorage.GetFullList() :
+ _implementerStorage.GetFilteredList(model);
+ if (list == null)
+ {
+ _logger.LogWarning("ReadList return null list");
+ return null;
+ }
+ _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+ return list;
+ }
+
+ public bool Update(ImplementerBindingModel model)
+ {
+ CheckModel(model);
+ if (_implementerStorage.Update(model) == null)
+ {
+ _logger.LogWarning("Update operation failed");
+ return false;
+ }
+ return true;
+ }
+
+ private void CheckModel(ImplementerBindingModel model, bool withParams = true)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+ if (!withParams)
+ {
+ return;
+ }
+ if (model.WorkExperience < 0)
+ {
+ throw new ArgumentException("Опыт работы не должен быть отрицательным", nameof(model.WorkExperience));
+ }
+ if (model.Qualification < 0)
+ {
+ throw new ArgumentException("Квалификация не должна быть отрицательной", nameof(model.Qualification));
+ }
+ if (string.IsNullOrEmpty(model.Password))
+ {
+ throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.ImplementerFIO));
+ }
+ if (string.IsNullOrEmpty(model.ImplementerFIO))
+ {
+ throw new ArgumentNullException("Нет фио исполнителя", nameof(model.ImplementerFIO));
+ }
+ _logger.LogInformation("Implementer. Id: {Id}, FIO: {FIO}", model.Id, model.ImplementerFIO);
+ var element = _implementerStorage.GetElement(new ImplementerSearchModel
+ {
+ ImplementerFIO = model.ImplementerFIO,
+ });
+ if (element != null && element.Id != model.Id)
+ {
+ throw new InvalidOperationException("Исполнитель с таким фио уже есть");
+ }
+ }
+
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs
index 31a6a90..bbcf170 100644
--- a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs
@@ -10,6 +10,7 @@ using PrecastConcretePlantContracts.StoragesContracts;
using PrecastConcretePlantContracts.ViewModels;
using Microsoft.Extensions.Logging;
using PrecastConcretePlantDataModels.Enums;
+using DocumentFormat.OpenXml.EMMA;
namespace PrecastConcretePlantBusinessLogic.BusinessLogic
{
@@ -91,32 +92,39 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
private bool SetOrderStatus(OrderBindingModel model, OrderStatus orderStatus)
{
+ // Находим статус заказа по его айди
var vmodel = _orderStorage.GetElement(new() { Id = model.Id });
if (vmodel == null)
{
throw new ArgumentNullException(nameof(model));
}
- if ((int)vmodel.Status + 1 != (int)orderStatus)
+ if ((int)vmodel.Status + 1 != (int)orderStatus && !(vmodel.Status == OrderStatus.Ожидается && orderStatus == OrderStatus.Готов))
{
- throw new ArgumentException($"Попытка перевести заказ не в следующий статус: " +
+ throw new InvalidOperationException($"Попытка перевести заказ не в следующий статус: " +
$"Текущий статус: {vmodel.Status} \n" +
$"Планируемый статус: {orderStatus} \n" +
- $"Доступный статус: {(OrderStatus)((int)vmodel.Status + 1)}",
- nameof(vmodel));
+ $"Доступный статус: {(OrderStatus)((int)vmodel.Status + 1)}");
}
- if (orderStatus == OrderStatus.Готов)
+ if (orderStatus == OrderStatus.Готов || orderStatus == OrderStatus.Ожидается)
{
var vreinforced = _reinforcedStorage.GetElement(new() { Id = vmodel.ReinforcedId });
if (vreinforced == null || !_shopLogic.AddReinforcediesInShops(vreinforced, vmodel.Count))
{
- throw new Exception($"Не удалось заполнить магазины изделием '{vreinforced?.ReinforcedName ?? string.Empty}' из заказа {vmodel.Id}");
+ _logger.LogWarning($"Не удалось заполнить магазины изделием '{vreinforced?.ReinforcedName ?? string.Empty}' из заказа {vmodel.Id}");
+ orderStatus = OrderStatus.Ожидается;
+ }
+ else
+ {
+ orderStatus = OrderStatus.Готов;
}
}
model.Status = orderStatus;
model.DateCreate = vmodel.DateCreate;
if (model.DateImplement == null)
model.DateImplement = vmodel.DateImplement;
+ if (vmodel.ImplementerId.HasValue)
+ model.ImplementerId = vmodel.ImplementerId;
model.ReinforcedId = vmodel.ReinforcedId;
model.Sum = vmodel.Sum;
model.Count = vmodel.Count;
@@ -127,5 +135,22 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
}
return true;
}
+
+ public OrderViewModel? ReadElement(OrderSearchModel model)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+ _logger.LogInformation("ReadElement. Id:{ Id}", model.Id);
+ var element = _orderStorage.GetElement(model);
+ if (element == null)
+ {
+ _logger.LogWarning("ReadElement element not found");
+ return null;
+ }
+ _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+ return element;
+ }
}
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/WorkModeling.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/WorkModeling.cs
new file mode 100644
index 0000000..dea9eca
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/WorkModeling.cs
@@ -0,0 +1,160 @@
+using Microsoft.Extensions.Logging;
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.BusinessLogicsContracts;
+using PrecastConcretePlantContracts.SearchModels;
+using PrecastConcretePlantContracts.ViewModels;
+using PrecastConcretePlantDataModels.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantBusinessLogic.BusinessLogic
+{
+ public class WorkModeling : IWorkProcess
+ {
+ private readonly ILogger _logger;
+
+ private readonly Random _rnd;
+
+ private IOrderLogic? _orderLogic;
+
+ public WorkModeling(ILogger logger)
+ {
+ _logger = logger;
+ _rnd = new Random(1000);
+ }
+
+ public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic)
+ {
+ _orderLogic = orderLogic;
+ var implementers = implementerLogic.ReadList(null);
+ if (implementers == null)
+ {
+ _logger.LogWarning("DoWork. Implementers is null");
+ return;
+ }
+ var orders = _orderLogic.ReadList(new OrderSearchModel { Statusses = new() { OrderStatus.Принят, OrderStatus.Выполняется, OrderStatus.Ожидается } });
+ if (orders == null || orders.Count == 0)
+ {
+ _logger.LogWarning("DoWork. Orders is null or empty");
+ return;
+ }
+ _logger.LogDebug("DoWork for {Count} orders", orders.Count);
+ foreach (var implementer in implementers)
+ {
+ Task.Run(() => WorkerWorkAsync(implementer, orders));
+ }
+ }
+
+ private async Task WorkerWorkAsync(ImplementerViewModel implementer, List orders)
+ {
+ if (_orderLogic == null || implementer == null)
+ {
+ return;
+ }
+
+ await Task.Run(() =>
+ {
+ foreach (var order in orders.Where(x => x.Status == OrderStatus.Ожидается && x.ImplementerId == implementer.Id))
+ {
+ try
+ {
+ _orderLogic.FinishOrder(new OrderBindingModel
+ {
+ Id = order.Id
+ });
+ }
+
+ catch (InvalidOperationException ex)
+ {
+ _logger.LogWarning(ex, "Error try get work");
+ }
+
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Error while do work");
+ throw;
+ }
+
+ Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+ }
+ });
+
+ await RunOrderInWork(implementer, orders);
+
+ await Task.Run(() =>
+ {
+ foreach (var order in orders.Where(x => x.Status == OrderStatus.Принят))
+ {
+ try
+ {
+ _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
+
+ _orderLogic.TakeOrderInWork(new OrderBindingModel
+ {
+ Id = order.Id,
+ ImplementerId = implementer.Id
+ });
+
+ Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
+ _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
+ _orderLogic.FinishOrder(new OrderBindingModel
+ {
+ Id = order.Id
+ });
+
+ Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+ }
+
+ catch (InvalidOperationException ex)
+ {
+ _logger.LogWarning(ex, "Error try get work");
+ }
+
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Error while do work");
+ throw;
+ }
+ }
+ });
+
+
+ }
+ private async Task RunOrderInWork(ImplementerViewModel implementer, List allOrders)
+ {
+ if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)
+ {
+ return;
+ }
+ try
+ {
+ var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
+ if (runOrder == null)
+ {
+ return;
+ }
+
+ _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
+ Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
+ _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
+ _orderLogic.FinishOrder(new OrderBindingModel
+ {
+ Id = runOrder.Id
+ });
+ Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+ }
+ catch (InvalidOperationException ex)
+ {
+ _logger.LogWarning(ex, "Error try get work");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Error while do work");
+ throw;
+ }
+ }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/ImplementerBindingModel.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/ImplementerBindingModel.cs
new file mode 100644
index 0000000..e600bc9
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/ImplementerBindingModel.cs
@@ -0,0 +1,22 @@
+using PrecastConcretePlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantContracts.BindingModels
+{
+ public class ImplementerBindingModel : IImplementerModel
+ {
+ public int Id { get; set; }
+
+ public string ImplementerFIO { get; set; } = string.Empty;
+
+ public string Password { get; set; } = string.Empty;
+
+ public int WorkExperience { get; set; }
+
+ public int Qualification { get; set; }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/OrderBindingModel.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/OrderBindingModel.cs
index f7d54e5..2747633 100644
--- a/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/OrderBindingModel.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/OrderBindingModel.cs
@@ -13,6 +13,7 @@ namespace PrecastConcretePlantContracts.BindingModels
public int Id { get; set; }
public int ReinforcedId { get; set; }
public int ClientId { get; set; }
+ public int? ImplementerId { get; set; }
public int Count { get; set; }
public double Sum { get; set; }
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IImplementerLogic.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IImplementerLogic.cs
new file mode 100644
index 0000000..37fbec9
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IImplementerLogic.cs
@@ -0,0 +1,24 @@
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.SearchModels;
+using PrecastConcretePlantContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantContracts.BusinessLogicsContracts
+{
+ public interface IImplementerLogic
+ {
+ List? ReadList(ImplementerSearchModel? model);
+
+ ImplementerViewModel? ReadElement(ImplementerSearchModel model);
+
+ bool Create(ImplementerBindingModel model);
+
+ bool Update(ImplementerBindingModel model);
+
+ bool Delete(ImplementerBindingModel model);
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IOrderLogic.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IOrderLogic.cs
index 7eaf577..eeff9a4 100644
--- a/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IOrderLogic.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IOrderLogic.cs
@@ -12,6 +12,7 @@ namespace PrecastConcretePlantContracts.BusinessLogicsContracts
public interface IOrderLogic
{
List? ReadList(OrderSearchModel? model);
+ OrderViewModel? ReadElement(OrderSearchModel model);
bool CreateOrder(OrderBindingModel model);
bool TakeOrderInWork(OrderBindingModel model);
bool FinishOrder(OrderBindingModel model);
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IWorkProcess.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IWorkProcess.cs
new file mode 100644
index 0000000..19af068
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IWorkProcess.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantContracts.BusinessLogicsContracts
+{
+ public interface IWorkProcess
+ {
+ void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/SearchModels/ImplementerSearchModel.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/SearchModels/ImplementerSearchModel.cs
new file mode 100644
index 0000000..8e9b321
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/SearchModels/ImplementerSearchModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantContracts.SearchModels
+{
+ public class ImplementerSearchModel
+ {
+ public int? Id { get; set; }
+
+ public string? ImplementerFIO { get; set; }
+
+ public string? Password { get; set; }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/SearchModels/OrderSearchModel.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/SearchModels/OrderSearchModel.cs
index 9bfcba7..16f540b 100644
--- a/PrecastConcretePlant/PrecastConcretePlantContracts/SearchModels/OrderSearchModel.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/SearchModels/OrderSearchModel.cs
@@ -1,4 +1,5 @@
-using System;
+using PrecastConcretePlantDataModels.Enums;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -12,5 +13,8 @@ namespace PrecastConcretePlantContracts.SearchModels
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
public int? ClientId { get; set; }
+ public int? ImplementerId { get; set; }
+
+ public List? Statusses { get; set; }
}
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IImplementerStorage.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IImplementerStorage.cs
new file mode 100644
index 0000000..a0c0e80
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IImplementerStorage.cs
@@ -0,0 +1,26 @@
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.SearchModels;
+using PrecastConcretePlantContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantContracts.StoragesContracts
+{
+ public interface IImplementerStorage
+ {
+ List GetFullList();
+
+ List GetFilteredList(ImplementerSearchModel model);
+
+ ImplementerViewModel? GetElement(ImplementerSearchModel model);
+
+ ImplementerViewModel? Insert(ImplementerBindingModel model);
+
+ ImplementerViewModel? Update(ImplementerBindingModel model);
+
+ ImplementerViewModel? Delete(ImplementerBindingModel model);
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ImplementerViewModel.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ImplementerViewModel.cs
new file mode 100644
index 0000000..b41daf9
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ImplementerViewModel.cs
@@ -0,0 +1,27 @@
+using PrecastConcretePlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantContracts.ViewModels
+{
+ public class ImplementerViewModel : IImplementerModel
+ {
+ public int Id { get; set; }
+
+ [DisplayName("ФИО исполнителя")]
+ public string ImplementerFIO { get; set; } = string.Empty;
+
+ [DisplayName("Пароль")]
+ public string Password { get; set; } = string.Empty;
+
+ [DisplayName("Стаж работы")]
+ public int WorkExperience { get; set; }
+
+ [DisplayName("Квалификация")]
+ public int Qualification { get; set; }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/OrderViewModel.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/OrderViewModel.cs
index b26d563..b80245e 100644
--- a/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/OrderViewModel.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/OrderViewModel.cs
@@ -19,9 +19,12 @@ namespace PrecastConcretePlantContracts.ViewModels
public string ReinforcedName { get; set; } = string.Empty;
public int ClientId { get; set; }
+ public int? ImplementerId { get; set; }
[DisplayName("ФИО клиента")]
public string ClientFIO { get; set; } = string.Empty;
+ [DisplayName("Фамилия исполнителя")]
+ public string ImplementerFIO { get; set; } = string.Empty;
[DisplayName("Количество")]
public int Count { get; set; }
diff --git a/PrecastConcretePlant/PrecastConcretePlantDataModels/Enums/OrderStatus.cs b/PrecastConcretePlant/PrecastConcretePlantDataModels/Enums/OrderStatus.cs
index 1ec34c9..6a96605 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDataModels/Enums/OrderStatus.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDataModels/Enums/OrderStatus.cs
@@ -12,6 +12,7 @@ namespace PrecastConcretePlantDataModels.Enums
Принят = 0,
Выполняется = 1,
Готов = 2,
- Выдан = 3
+ Выдан = 3,
+ Ожидается = 4,
}
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IImplementerModel.cs b/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IImplementerModel.cs
new file mode 100644
index 0000000..7386da8
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IImplementerModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantDataModels.Models
+{
+ public interface IImplementerModel : IId
+ {
+ string ImplementerFIO { get; }
+ string Password { get; }
+ int WorkExperience { get; }
+ int Qualification { get; }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IOrderModel.cs b/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IOrderModel.cs
index 67f1b72..94d64ec 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IOrderModel.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IOrderModel.cs
@@ -11,6 +11,7 @@ namespace PrecastConcretePlantDataModels.Enums
{
int ReinforcedId { get; }
int ClientId { get; }
+ int? ImplementerId { get; }
int Count { get; }
double Sum { get; }
OrderStatus Status { get; }
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Implements/ImplementerStorage.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Implements/ImplementerStorage.cs
new file mode 100644
index 0000000..ddadfee
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Implements/ImplementerStorage.cs
@@ -0,0 +1,95 @@
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.SearchModels;
+using PrecastConcretePlantContracts.StoragesContracts;
+using PrecastConcretePlantContracts.ViewModels;
+using PrecastConcretePlantDatabaseImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantDatabaseImplement.Implements
+{
+ public class ImplementerStorage : IImplementerStorage
+ {
+ public ImplementerViewModel? Delete(ImplementerBindingModel model)
+ {
+ using var context = new PrecastConcretePlantDataBase();
+ var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
+ if (res != null)
+ {
+ context.Implementers.Remove(res);
+ context.SaveChanges();
+ }
+ return res?.GetViewModel;
+ }
+
+ public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+ {
+ using var context = new PrecastConcretePlantDataBase();
+ if (model.Id.HasValue)
+ return context.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+ if (model.ImplementerFIO != null && model.Password != null)
+ return context.Implementers
+ .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)
+ && x.Password.Equals(model.Password))
+ ?.GetViewModel;
+ if (model.ImplementerFIO != null)
+ return context.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
+ return null;
+ }
+
+ public List GetFilteredList(ImplementerSearchModel model)
+ {
+ if (model == null)
+ {
+ return new();
+ }
+ if (model.Id.HasValue)
+ {
+ var res = GetElement(model);
+ return res != null ? new() { res } : new();
+ }
+ if (model.ImplementerFIO != null)
+ {
+ using var context = new PrecastConcretePlantDataBase();
+ return context.Implementers
+ .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+ return new();
+ }
+
+ public List GetFullList()
+ {
+ using var context = new PrecastConcretePlantDataBase();
+ return context.Implementers.Select(x => x.GetViewModel).ToList();
+ }
+
+ public ImplementerViewModel? Insert(ImplementerBindingModel model)
+ {
+ using var context = new PrecastConcretePlantDataBase();
+ var res = Implementer.Create(model);
+ if (res != null)
+ {
+ context.Implementers.Add(res);
+ context.SaveChanges();
+ }
+ return res?.GetViewModel;
+ }
+
+ public ImplementerViewModel? Update(ImplementerBindingModel model)
+ {
+ using var context = new PrecastConcretePlantDataBase();
+ var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
+ if (res != null)
+ {
+ res.Update(model);
+ context.SaveChanges();
+ }
+ return res?.GetViewModel;
+ }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Implements/OrderStorage.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Implements/OrderStorage.cs
index 42050e0..795a424 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Implements/OrderStorage.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Implements/OrderStorage.cs
@@ -14,42 +14,80 @@ namespace PrecastConcretePlantDatabaseImplement.Implements
{
public class OrderStorage : IOrderStorage
{
+ public OrderViewModel? Delete(OrderBindingModel model)
+ {
+ using var context = new PrecastConcretePlantDataBase();
+ var element = context.Orders
+ .Include(x => x.Client)
+ .Include(x => x.Implementer)
+ .FirstOrDefault(x => x.Id == model.Id);
+ if (element != null)
+ {
+ context.Orders.Remove(element);
+ context.SaveChanges();
+ return element.GetViewModel;
+ }
+ return null;
+ }
+
public OrderViewModel? GetElement(OrderSearchModel model)
{
- if (!model.Id.HasValue)
- {
- return null;
- }
using var context = new PrecastConcretePlantDataBase();
- return context.Orders.Include(x => x.Reinforced).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ return context.Orders
+ .Include(x => x.Client)
+ .Include(x => x.Implementer)
+ .FirstOrDefault(x =>
+ (model.Statusses == null || model.Statusses != null && model.Statusses.Contains(x.Status)) &&
+ model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
+ model.Id.HasValue && x.Id == model.Id
+ )
+ ?.GetViewModel;
}
public List GetFilteredList(OrderSearchModel model)
{
- if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue)
+ if (model.Id.HasValue)
+ {
+ var result = GetElement(model);
+ return result != null ? new() { result } : new();
+ }
+
+ using var context = new PrecastConcretePlantDataBase();
+ IQueryable? queryWhere = null;
+
+ if (model.DateFrom.HasValue && model.DateTo.HasValue)
+ {
+ queryWhere = context.Orders
+ .Where(x => model.DateFrom <= x.DateCreate.Date &&
+ x.DateCreate.Date <= model.DateTo);
+ }
+ else if (model.Statusses != null)
+ {
+ queryWhere = context.Orders.Where(x => model.Statusses.Contains(x.Status));
+ }
+ else if (model.ClientId.HasValue)
+ {
+ queryWhere = context.Orders.Where(x => x.ClientId == model.ClientId);
+ }
+ else
{
return new();
}
- using var context = new PrecastConcretePlantDataBase();
- if (model.ClientId.HasValue)
- {
- return context.Orders
+ return queryWhere
.Include(x => x.Client)
- .Where(x => x.ClientId == model.ClientId)
+ .Include(x => x.Implementer)
.Select(x => x.GetViewModel)
.ToList();
- }
- return context.Orders
- .Include(x => x.Reinforced)
- .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
- .Select(x => x.GetViewModel)
- .ToList();
}
public List GetFullList()
{
using var context = new PrecastConcretePlantDataBase();
- return context.Orders.Include(x => x.Reinforced).Select(x => x.GetViewModel).ToList();
+ return context.Orders
+ .Include(x => x.Client)
+ .Include(x => x.Implementer)
+ .Select(x => x.GetViewModel)
+ .ToList();
}
public OrderViewModel? Insert(OrderBindingModel model)
@@ -62,32 +100,23 @@ namespace PrecastConcretePlantDatabaseImplement.Implements
using var context = new PrecastConcretePlantDataBase();
context.Orders.Add(newOrder);
context.SaveChanges();
- return context.Orders.Include(x => x.Reinforced).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
+ return newOrder.GetViewModel;
}
public OrderViewModel? Update(OrderBindingModel model)
{
using var context = new PrecastConcretePlantDataBase();
- var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
+ var order = context.Orders
+ .Include(x => x.Client)
+ .Include(x => x.Implementer)
+ .FirstOrDefault(x => x.Id == model.Id);
if (order == null)
{
return null;
}
order.Update(model);
context.SaveChanges();
- return context.Orders.Include(x => x.Reinforced).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
- }
- public OrderViewModel? Delete(OrderBindingModel model)
- {
- using var context = new PrecastConcretePlantDataBase();
- var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
- if (element != null)
- {
- context.Orders.Remove(element);
- context.SaveChanges();
- return element.GetViewModel;
- }
- return null;
+ return order.GetViewModel;
}
}
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230423161330_LabWork5Hard.Designer.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230424164351_lab6hard.Designer.cs
similarity index 86%
rename from PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230423161330_LabWork5Hard.Designer.cs
rename to PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230424164351_lab6hard.Designer.cs
index bd5b425..e50db5b 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230423161330_LabWork5Hard.Designer.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230424164351_lab6hard.Designer.cs
@@ -12,8 +12,8 @@ using PrecastConcretePlantDatabaseImplement;
namespace PrecastConcretePlantDatabaseImplement.Migrations
{
[DbContext(typeof(PrecastConcretePlantDataBase))]
- [Migration("20230423161330_LabWork5Hard")]
- partial class LabWork5Hard
+ [Migration("20230424164351_lab6hard")]
+ partial class lab6hard
{
///
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -70,6 +70,33 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.ToTable("Components");
});
+ modelBuilder.Entity("PrecastConcretePlantDatabaseImplement.Models.Implementer", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ImplementerFIO")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Password")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Qualification")
+ .HasColumnType("int");
+
+ b.Property("WorkExperience")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Implementers");
+ });
+
modelBuilder.Entity("PrecastConcretePlantDatabaseImplement.Models.Order", b =>
{
b.Property("Id")
@@ -90,6 +117,9 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.Property("DateImplement")
.HasColumnType("datetime2");
+ b.Property("ImplementerId")
+ .HasColumnType("int");
+
b.Property("ReinforcedId")
.HasColumnType("int");
@@ -103,6 +133,8 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.HasIndex("ClientId");
+ b.HasIndex("ImplementerId");
+
b.HasIndex("ReinforcedId");
b.ToTable("Orders");
@@ -215,6 +247,10 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
+ b.HasOne("PrecastConcretePlantDatabaseImplement.Models.Implementer", "Implementer")
+ .WithMany("Orders")
+ .HasForeignKey("ImplementerId");
+
b.HasOne("PrecastConcretePlantDatabaseImplement.Models.Reinforced", "Reinforced")
.WithMany("Orders")
.HasForeignKey("ReinforcedId")
@@ -223,6 +259,8 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.Navigation("Client");
+ b.Navigation("Implementer");
+
b.Navigation("Reinforced");
});
@@ -274,6 +312,11 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.Navigation("ReinforcedComponents");
});
+ modelBuilder.Entity("PrecastConcretePlantDatabaseImplement.Models.Implementer", b =>
+ {
+ b.Navigation("Orders");
+ });
+
modelBuilder.Entity("PrecastConcretePlantDatabaseImplement.Models.Reinforced", b =>
{
b.Navigation("Components");
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230423161330_LabWork5Hard.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230424164351_lab6hard.cs
similarity index 86%
rename from PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230423161330_LabWork5Hard.cs
rename to PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230424164351_lab6hard.cs
index a4aca6d..19af643 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230423161330_LabWork5Hard.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230424164351_lab6hard.cs
@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace PrecastConcretePlantDatabaseImplement.Migrations
{
///
- public partial class LabWork5Hard : Migration
+ public partial class lab6hard : Migration
{
///
protected override void Up(MigrationBuilder migrationBuilder)
@@ -40,6 +40,22 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
table.PrimaryKey("PK_Components", x => x.Id);
});
+ migrationBuilder.CreateTable(
+ name: "Implementers",
+ columns: table => new
+ {
+ Id = table.Column(type: "int", nullable: false)
+ .Annotation("SqlServer:Identity", "1, 1"),
+ ImplementerFIO = table.Column(type: "nvarchar(max)", nullable: false),
+ Password = table.Column(type: "nvarchar(max)", nullable: false),
+ WorkExperience = table.Column(type: "int", nullable: false),
+ Qualification = table.Column(type: "int", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Implementers", x => x.Id);
+ });
+
migrationBuilder.CreateTable(
name: "Reinforcedies",
columns: table => new
@@ -78,6 +94,7 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
.Annotation("SqlServer:Identity", "1, 1"),
ReinforcedId = table.Column(type: "int", nullable: false),
ClientId = table.Column(type: "int", nullable: false),
+ ImplementerId = table.Column(type: "int", nullable: true),
Count = table.Column(type: "int", nullable: false),
Sum = table.Column(type: "float", nullable: false),
Status = table.Column(type: "int", nullable: false),
@@ -93,6 +110,11 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
principalTable: "Clients",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
+ table.ForeignKey(
+ name: "FK_Orders_Implementers_ImplementerId",
+ column: x => x.ImplementerId,
+ principalTable: "Implementers",
+ principalColumn: "Id");
table.ForeignKey(
name: "FK_Orders_Reinforcedies_ReinforcedId",
column: x => x.ReinforcedId,
@@ -160,6 +182,11 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
table: "Orders",
column: "ClientId");
+ migrationBuilder.CreateIndex(
+ name: "IX_Orders_ImplementerId",
+ table: "Orders",
+ column: "ImplementerId");
+
migrationBuilder.CreateIndex(
name: "IX_Orders_ReinforcedId",
table: "Orders",
@@ -201,6 +228,9 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
migrationBuilder.DropTable(
name: "Clients");
+ migrationBuilder.DropTable(
+ name: "Implementers");
+
migrationBuilder.DropTable(
name: "Components");
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/PrecastConcretePlantDataBaseModelSnapshot.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/PrecastConcretePlantDataBaseModelSnapshot.cs
index bae6e1b..f6617e8 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/PrecastConcretePlantDataBaseModelSnapshot.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/PrecastConcretePlantDataBaseModelSnapshot.cs
@@ -67,6 +67,33 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.ToTable("Components");
});
+ modelBuilder.Entity("PrecastConcretePlantDatabaseImplement.Models.Implementer", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ImplementerFIO")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Password")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Qualification")
+ .HasColumnType("int");
+
+ b.Property("WorkExperience")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Implementers");
+ });
+
modelBuilder.Entity("PrecastConcretePlantDatabaseImplement.Models.Order", b =>
{
b.Property("Id")
@@ -87,6 +114,9 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.Property("DateImplement")
.HasColumnType("datetime2");
+ b.Property("ImplementerId")
+ .HasColumnType("int");
+
b.Property("ReinforcedId")
.HasColumnType("int");
@@ -100,6 +130,8 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.HasIndex("ClientId");
+ b.HasIndex("ImplementerId");
+
b.HasIndex("ReinforcedId");
b.ToTable("Orders");
@@ -212,6 +244,10 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
+ b.HasOne("PrecastConcretePlantDatabaseImplement.Models.Implementer", "Implementer")
+ .WithMany("Orders")
+ .HasForeignKey("ImplementerId");
+
b.HasOne("PrecastConcretePlantDatabaseImplement.Models.Reinforced", "Reinforced")
.WithMany("Orders")
.HasForeignKey("ReinforcedId")
@@ -220,6 +256,8 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.Navigation("Client");
+ b.Navigation("Implementer");
+
b.Navigation("Reinforced");
});
@@ -271,6 +309,11 @@ namespace PrecastConcretePlantDatabaseImplement.Migrations
b.Navigation("ReinforcedComponents");
});
+ modelBuilder.Entity("PrecastConcretePlantDatabaseImplement.Models.Implementer", b =>
+ {
+ b.Navigation("Orders");
+ });
+
modelBuilder.Entity("PrecastConcretePlantDatabaseImplement.Models.Reinforced", b =>
{
b.Navigation("Components");
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Models/Implementer.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Models/Implementer.cs
new file mode 100644
index 0000000..a99f089
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Models/Implementer.cs
@@ -0,0 +1,65 @@
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.ViewModels;
+using PrecastConcretePlantDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantDatabaseImplement.Models
+{
+ public class Implementer : IImplementerModel
+ {
+ public int Id { get; private set; }
+
+ public string ImplementerFIO { get; private set; } = string.Empty;
+
+ public string Password { get; private set; } = string.Empty;
+
+ public int WorkExperience { get; private set; }
+
+ public int Qualification { get; private set; }
+
+ [ForeignKey("ImplementerId")]
+ public virtual List Orders { get; private set; } = new();
+
+ public static Implementer? Create(ImplementerBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new()
+ {
+ Id = model.Id,
+ Password = model.Password,
+ Qualification = model.Qualification,
+ ImplementerFIO = model.ImplementerFIO,
+ WorkExperience = model.WorkExperience,
+ };
+ }
+
+ public void Update(ImplementerBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ Password = model.Password;
+ Qualification = model.Qualification;
+ ImplementerFIO = model.ImplementerFIO;
+ WorkExperience = model.WorkExperience;
+ }
+
+ public ImplementerViewModel GetViewModel => new()
+ {
+ Id = Id,
+ Password = Password,
+ Qualification = Qualification,
+ ImplementerFIO = ImplementerFIO,
+ WorkExperience = WorkExperience,
+ };
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Models/Order.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Models/Order.cs
index c46cc95..c282176 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Models/Order.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Models/Order.cs
@@ -18,6 +18,7 @@ namespace PrecastConcretePlantDatabaseImplement.Models
public int ReinforcedId { get; private set; }
[Required]
public int ClientId { get; private set; }
+ public int? ImplementerId { get; private set; }
[Required]
public int Count { get; private set; }
[Required]
@@ -30,6 +31,7 @@ namespace PrecastConcretePlantDatabaseImplement.Models
public DateTime? DateImplement { get; private set; }
public virtual Reinforced Reinforced { get; set; }
public virtual Client Client { get; set; }
+ public Implementer? Implementer { get; private set; }
public static Order? Create(OrderBindingModel? model)
{
@@ -45,6 +47,7 @@ namespace PrecastConcretePlantDatabaseImplement.Models
Sum = model.Sum,
Status = model.Status,
DateCreate = model.DateCreate,
+ ImplementerId = model.ImplementerId,
DateImplement = model.DateImplement,
Id = model.Id,
};
@@ -58,6 +61,7 @@ namespace PrecastConcretePlantDatabaseImplement.Models
}
Status = model.Status;
DateImplement = model.DateImplement;
+ ImplementerId = model.ImplementerId;
}
public OrderViewModel GetViewModel
@@ -70,6 +74,7 @@ namespace PrecastConcretePlantDatabaseImplement.Models
ReinforcedId = ReinforcedId,
ClientId = ClientId,
+ ImplementerId = ImplementerId,
Count = Count,
Sum = Sum,
DateCreate = DateCreate,
@@ -77,6 +82,7 @@ namespace PrecastConcretePlantDatabaseImplement.Models
Id = Id,
Status = Status,
ReinforcedName = context.Reinforcedies.FirstOrDefault(x => x.Id == ReinforcedId)?.ReinforcedName ?? string.Empty,
+ ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty
};
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/PrecastConcretePlantDataBase.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/PrecastConcretePlantDataBase.cs
index 36d38d1..361765c 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/PrecastConcretePlantDataBase.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/PrecastConcretePlantDataBase.cs
@@ -25,5 +25,6 @@ namespace PrecastConcretePlantDatabaseImplement
public virtual DbSet Shops { set; get; }
public virtual DbSet ShopReinforcedies { set; get; }
public virtual DbSet Clients { set; get; }
+ public virtual DbSet Implementers { set; get; }
}
}
\ No newline at end of file
diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs
index 5741b33..f860a5a 100644
--- a/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs
@@ -16,11 +16,13 @@ namespace PrecastConcretePlantFileImplement
private readonly string OrderFileName = "Order.xml";
private readonly string ReinforcedFileName = "Reinforced.xml";
private readonly string ClientFileName = "Client.xml";
+ private readonly string ImplementerFileName = "Implementer.xml";
private readonly string ShopFileName = "Shop.xml";
public List Components { get; private set; }
public List Orders { get; private set; }
public List Reinforcedies { get; private set; }
public List Clients { get; private set; }
+ public List Implementers { get; private set; }
public List Reinforceds { get; private set; }
public List Shops { get; private set; }
public static DataFileSingleton GetInstance()
@@ -38,6 +40,7 @@ namespace PrecastConcretePlantFileImplement
public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x
=> x.GetXElement);
public void SaveClients() => SaveData(Clients, OrderFileName, "Clients", x => x.GetXElement);
+ public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement);
public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
private DataFileSingleton()
{
@@ -47,6 +50,7 @@ namespace PrecastConcretePlantFileImplement
Reinforced.Create(x)!)!;
Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
+ Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
}
private static List? LoadData(string filename, string xmlNodeName,
diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ImplementerStorage.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ImplementerStorage.cs
new file mode 100644
index 0000000..2e1e48b
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ImplementerStorage.cs
@@ -0,0 +1,96 @@
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.SearchModels;
+using PrecastConcretePlantContracts.StoragesContracts;
+using PrecastConcretePlantContracts.ViewModels;
+using PrecastConcretePlantFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantFileImplement.Implements
+{
+ public class ImplementerStorage : IImplementerStorage
+ {
+ private readonly DataFileSingleton _source;
+ public ImplementerStorage()
+ {
+ _source = DataFileSingleton.GetInstance();
+ }
+
+ public ImplementerViewModel? Delete(ImplementerBindingModel model)
+ {
+ var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+ if (res != null)
+ {
+ _source.Implementers.Remove(res);
+ _source.SaveImplementers();
+ }
+ return res?.GetViewModel;
+ }
+
+ public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+ {
+ if (model.Id.HasValue)
+ return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+ if (model.ImplementerFIO != null && model.Password != null)
+ return _source.Implementers
+ .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)
+ && x.Password.Equals(model.Password))
+ ?.GetViewModel;
+ if (model.ImplementerFIO != null)
+ return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
+ return null;
+ }
+
+ public List GetFilteredList(ImplementerSearchModel model)
+ {
+ if (model == null)
+ {
+ return new();
+ }
+ if (model.Id.HasValue)
+ {
+ var res = GetElement(model);
+ return res != null ? new() { res } : new();
+ }
+ if (model.ImplementerFIO != null)
+ {
+ return _source.Implementers
+ .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+ return new();
+ }
+
+ public List GetFullList()
+ {
+ return _source.Implementers.Select(x => x.GetViewModel).ToList();
+ }
+
+ public ImplementerViewModel? Insert(ImplementerBindingModel model)
+ {
+ model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1;
+ var res = Implementer.Create(model);
+ if (res != null)
+ {
+ _source.Implementers.Add(res);
+ _source.SaveImplementers();
+ }
+ return res?.GetViewModel;
+ }
+
+ public ImplementerViewModel? Update(ImplementerBindingModel model)
+ {
+ var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+ if (res != null)
+ {
+ res.Update(model);
+ _source.SaveImplementers();
+ }
+ return res?.GetViewModel;
+ }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs
index 8b12331..267d969 100644
--- a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs
@@ -13,91 +13,100 @@ namespace PrecastConcretePlantFileImplement.Implements
{
public class OrderStorage : IOrderStorage
{
- private readonly DataFileSingleton source;
-
+ private readonly DataFileSingleton _source;
public OrderStorage()
{
- source = DataFileSingleton.GetInstance();
+ _source = DataFileSingleton.GetInstance();
}
public OrderViewModel? Delete(OrderBindingModel model)
{
- var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-
+ var element = _source.Orders.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
- source.Orders.Remove(element);
- source.SaveOrders();
-
+ _source.Orders.Remove(element);
+ _source.SaveOrders();
return element.GetViewModel;
}
-
return null;
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
- if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
+ if (model.ImplementerId.HasValue && model.Statusses != null)
+ {
+ return _source.Orders
+ .FirstOrDefault(x => x.ImplementerId == model.ImplementerId &&
+ model.Statusses.Contains(x.Status))
+ ?.GetViewModel;
+ }
+ if (model.ImplementerId.HasValue)
+ {
+ return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
+ }
+ if (!model.Id.HasValue)
{
return null;
}
-
- return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ return _source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
}
public List GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
{
- return source.Orders
+ return _source.Orders
.Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate <= model.DateTo)
.Select(x => x.GetViewModel)
.ToList();
}
if (!model.Id.HasValue && model.ClientId.HasValue)
{
- return source.Orders
+ return _source.Orders
.Where(x => x.ClientId == model.ClientId)
.Select(x => x.GetViewModel)
.ToList();
}
+ if (!model.Id.HasValue && model.Statusses != null)
+ {
+ return _source.Orders
+ .Where(x => model.Statusses.Contains(x.Status))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
var result = GetElement(model);
return result != null ? new() { result } : new();
}
public List GetFullList()
{
- return source.Orders.Select(x => x.GetViewModel).ToList();
+ return _source.Orders
+ .Select(x => x.GetViewModel)
+ .ToList();
}
public OrderViewModel? Insert(OrderBindingModel model)
{
- model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
+ 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();
-
+ _source.Orders.Add(newOrder);
+ _source.SaveOrders();
return newOrder.GetViewModel;
}
public OrderViewModel? Update(OrderBindingModel model)
{
- var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-
+ var order = _source.Orders.FirstOrDefault(x => x.Id == model.Id);
if (order == null)
{
return null;
}
-
order.Update(model);
- source.SaveOrders();
-
+ _source.SaveOrders();
return order.GetViewModel;
}
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Implementer.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Implementer.cs
new file mode 100644
index 0000000..59a2872
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Implementer.cs
@@ -0,0 +1,87 @@
+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 Implementer : IImplementerModel
+ {
+ public int Id { get; private set; }
+
+ public string ImplementerFIO { get; private set; } = string.Empty;
+
+ public string Password { get; private set; } = string.Empty;
+
+ public int WorkExperience { get; private set; }
+
+ public int Qualification { get; private set; }
+
+ public static Implementer? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new()
+ {
+ ImplementerFIO = element.Element("FIO")!.Value,
+ Password = element.Element("Password")!.Value,
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ Qualification = Convert.ToInt32(element.Element("Qualification")!.Value),
+ WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value),
+ };
+ }
+
+ public static Implementer? Create(ImplementerBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new()
+ {
+ Id = model.Id,
+ Password = model.Password,
+ Qualification = model.Qualification,
+ ImplementerFIO = model.ImplementerFIO,
+ WorkExperience = model.WorkExperience,
+ };
+ }
+
+
+
+ public void Update(ImplementerBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ Password = model.Password;
+ Qualification = model.Qualification;
+ ImplementerFIO = model.ImplementerFIO;
+ WorkExperience = model.WorkExperience;
+ }
+
+ public ImplementerViewModel GetViewModel => new()
+ {
+ Id = Id,
+ Password = Password,
+ Qualification = Qualification,
+ ImplementerFIO = ImplementerFIO,
+ };
+
+ public XElement GetXElement => new("Client",
+ new XAttribute("Id", Id),
+ new XElement("Password", Password),
+ new XElement("FIO", ImplementerFIO),
+ new XElement("Qualification", Qualification),
+ new XElement("WorkExperience", WorkExperience)
+ );
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs
index e8bd5b8..19d4bb8 100644
--- a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs
@@ -14,6 +14,7 @@ namespace PrecastConcretePlantFileImplement.Models
{
public int ReinforcedId { get; private set; }
public int ClientId { get; set; }
+ public int? ImplementerId { get; set; }
public int Count { get; private set; }
@@ -35,6 +36,7 @@ namespace PrecastConcretePlantFileImplement.Models
}
return new Order()
{
+ ImplementerId = model.ImplementerId,
Id = model.Id,
ReinforcedId = model.ReinforcedId,
ClientId = model.ClientId,
@@ -61,6 +63,7 @@ namespace PrecastConcretePlantFileImplement.Models
Count = Convert.ToInt32(element.Element("Count")!.Value),
Sum = Convert.ToDouble(element.Element("Sum")!.Value),
Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+ ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null)
};
@@ -79,6 +82,7 @@ namespace PrecastConcretePlantFileImplement.Models
ReinforcedId = model.ReinforcedId;
Count = model.Count;
Sum = model.Sum;
+ ImplementerId = model.ImplementerId;
Status = model.Status;
DateCreate = model.DateCreate;
DateImplement = model.DateImplement;
@@ -88,6 +92,8 @@ namespace PrecastConcretePlantFileImplement.Models
{
Id = Id,
ReinforcedId = ReinforcedId,
+ ImplementerId = ImplementerId,
+ ImplementerFIO = DataFileSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty,
ReinforcedName = DataFileSingleton.GetInstance().Reinforcedies.FirstOrDefault(x => x.Id == ReinforcedId)?.ReinforcedName ?? string.Empty,
ClientFIO = DataFileSingleton.GetInstance().Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
ClientId = ClientId,
@@ -104,8 +110,10 @@ namespace PrecastConcretePlantFileImplement.Models
new XElement("ClientId", ClientId),
new XElement("Count", Count.ToString()),
new XElement("Sum", Sum.ToString()),
+ new XElement("ImplementerId", ImplementerId),
new XElement("Status", Status.ToString()),
new XElement("DateCreate", DateCreate.ToString()),
new XElement("DateImplement", DateImplement.ToString()));
+
}
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/DataListSingleton.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/DataListSingleton.cs
index a37b41a..4180133 100644
--- a/PrecastConcretePlant/PrecastConcretePlantListImplement/DataListSingleton.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/DataListSingleton.cs
@@ -14,6 +14,7 @@ namespace PrecastConcretePlantListImplement
public List Orders { get; set; }
public List Reinforcedies { get; set; }
public List Clients { get; set; }
+ public List Implementers { get; set; }
public List Reinforceds { get; set; }
public List Shops { get; set; }
private DataListSingleton()
@@ -22,6 +23,7 @@ namespace PrecastConcretePlantListImplement
Orders = new List();
Reinforcedies = new List();
Clients = new List();
+ Implementers = new List();
Reinforceds = new List();
Shops = new List();
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/ImplementerStorage.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/ImplementerStorage.cs
new file mode 100644
index 0000000..354340b
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/ImplementerStorage.cs
@@ -0,0 +1,118 @@
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.SearchModels;
+using PrecastConcretePlantContracts.StoragesContracts;
+using PrecastConcretePlantContracts.ViewModels;
+using PrecastConcretePlantListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PrecastConcretePlantListImplement.Implements
+{
+ public class ImplementerStorage : IImplementerStorage
+ {
+ private readonly DataListSingleton _source;
+ public ImplementerStorage()
+ {
+ _source = DataListSingleton.GetInstance();
+ }
+
+ public ImplementerViewModel? Delete(ImplementerBindingModel model)
+ {
+ for (int i = 0; i < _source.Implementers.Count; ++i)
+ {
+ if (_source.Implementers[i].Id == model.Id)
+ {
+ var element = _source.Implementers[i];
+ _source.Implementers.RemoveAt(i);
+ return element.GetViewModel;
+ }
+ }
+ return null;
+ }
+
+ public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+ {
+ foreach (var x in _source.Implementers)
+ {
+ if (model.Id.HasValue && x.Id == model.Id)
+ return x.GetViewModel;
+ if (model.ImplementerFIO != null && model.Password != null &&
+ x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))
+ return x.GetViewModel;
+ if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO))
+ return x.GetViewModel;
+ }
+ return null;
+ }
+
+ public List GetFilteredList(ImplementerSearchModel model)
+ {
+ if (model == null)
+ {
+ return new();
+ }
+ if (model.Id.HasValue)
+ {
+ var res = GetElement(model);
+ return res != null ? new() { res } : new();
+ }
+
+ List result = new();
+ if (model.ImplementerFIO != null)
+ {
+ foreach (var implementer in _source.Implementers)
+ {
+ if (implementer.ImplementerFIO.Equals(model.ImplementerFIO))
+ {
+ result.Add(implementer.GetViewModel);
+ }
+ }
+ }
+ return result;
+ }
+
+ public List GetFullList()
+ {
+ var result = new List();
+ foreach (var implementer in _source.Implementers)
+ {
+ result.Add(implementer.GetViewModel);
+ }
+ return result;
+ }
+
+ public ImplementerViewModel? Insert(ImplementerBindingModel model)
+ {
+ model.Id = 1;
+ foreach (var implementer in _source.Implementers)
+ {
+ if (model.Id <= implementer.Id)
+ {
+ model.Id = implementer.Id + 1;
+ }
+ }
+ var res = Implementer.Create(model);
+ if (res != null)
+ {
+ _source.Implementers.Add(res);
+ }
+ return res?.GetViewModel;
+ }
+
+ public ImplementerViewModel? Update(ImplementerBindingModel model)
+ {
+ foreach (var implementer in _source.Implementers)
+ {
+ if (implementer.Id == model.Id)
+ {
+ implementer.Update(model);
+ return implementer.GetViewModel;
+ }
+ }
+ return null;
+ }
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/OrderStorage.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/OrderStorage.cs
index da7369f..5f3426c 100644
--- a/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/OrderStorage.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/OrderStorage.cs
@@ -47,6 +47,17 @@ namespace PrecastConcretePlantListImplement.Implements
{
return order.GetViewModel;
}
+ else if (model.ImplementerId.HasValue
+ && model.Statusses != null
+ && order.ImplementerId == model.ImplementerId
+ && model.Statusses.Contains(order.Status))
+ {
+ return GetViewModel(order);
+ }
+ else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId)
+ {
+ return GetViewModel(order);
+ }
}
return null;
@@ -72,6 +83,14 @@ namespace PrecastConcretePlantListImplement.Implements
{
result.Add(GetViewModel(order));
}
+ else if (model.ImplementerId.HasValue && order.ImplementerId == model.ImplementerId)
+ {
+ result.Add(GetViewModel(order));
+ }
+ else if (model.Statusses != null && model.Statusses.Contains(order.Status))
+ {
+ result.Add(GetViewModel(order));
+ }
}
return result;
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Implementer.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Implementer.cs
new file mode 100644
index 0000000..132554e
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Implementer.cs
@@ -0,0 +1,60 @@
+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;
+
+namespace PrecastConcretePlantListImplement.Models
+{
+ public class Implementer : IImplementerModel
+ {
+ public int Id { get; private set; }
+
+ public string ImplementerFIO { get; private set; } = string.Empty;
+
+ public string Password { get; private set; } = string.Empty;
+
+ public int WorkExperience { get; private set; }
+
+ public int Qualification { get; private set; }
+
+ public static Implementer? Create(ImplementerBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new()
+ {
+ Id = model.Id,
+ Password = model.Password,
+ Qualification = model.Qualification,
+ ImplementerFIO = model.ImplementerFIO,
+ WorkExperience = model.WorkExperience,
+ };
+ }
+
+ public void Update(ImplementerBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ Password = model.Password;
+ Qualification = model.Qualification;
+ ImplementerFIO = model.ImplementerFIO;
+ WorkExperience = model.WorkExperience;
+ }
+
+ public ImplementerViewModel GetViewModel => new()
+ {
+ Id = Id,
+ Password = Password,
+ Qualification = Qualification,
+ ImplementerFIO = ImplementerFIO,
+ };
+ }
+}
diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Order.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Order.cs
index ed5376d..bc5e45f 100644
--- a/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Order.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Order.cs
@@ -15,7 +15,7 @@ namespace PrecastConcretePlantListImplement.Models
{
public int ReinforcedId { get; private set; }
public int ClientId { get; private set; }
-
+ public int? ImplementerId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }
@@ -43,6 +43,7 @@ namespace PrecastConcretePlantListImplement.Models
Sum = model.Sum,
Status = model.Status,
DateCreate = model.DateCreate,
+ ImplementerId = model.ImplementerId,
DateImplement = model.DateImplement
};
}
@@ -56,6 +57,7 @@ namespace PrecastConcretePlantListImplement.Models
ReinforcedId = model.ReinforcedId;
Count = model.Count;
Sum = model.Sum;
+ ImplementerId = model.ImplementerId;
Status = model.Status;
DateCreate = model.DateCreate;
DateImplement = model.DateImplement;
@@ -70,6 +72,8 @@ namespace PrecastConcretePlantListImplement.Models
Sum = Sum,
Status = Status,
DateCreate = DateCreate,
+ ImplementerId = ImplementerId,
+ ImplementerFIO = DataListSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty,
DateImplement = DateImplement
};
}
diff --git a/PrecastConcretePlant/PrecastConcretePlantRestApi/Controllers/ImplementerController.cs b/PrecastConcretePlant/PrecastConcretePlantRestApi/Controllers/ImplementerController.cs
new file mode 100644
index 0000000..a89d1fe
--- /dev/null
+++ b/PrecastConcretePlant/PrecastConcretePlantRestApi/Controllers/ImplementerController.cs
@@ -0,0 +1,109 @@
+using Microsoft.AspNetCore.Mvc;
+using PrecastConcretePlantContracts.BindingModels;
+using PrecastConcretePlantContracts.BusinessLogicsContracts;
+using PrecastConcretePlantContracts.SearchModels;
+using PrecastConcretePlantContracts.ViewModels;
+using PrecastConcretePlantDataModels.Enums;
+
+namespace PrecastConcretePlantRestApi.Controllers
+{
+
+ [Route("api/[controller]/[action]")]
+ [ApiController]
+ public class ImplementerController : Controller
+ {
+ private readonly ILogger _logger;
+
+ private readonly IOrderLogic _order;
+
+ private readonly IImplementerLogic _logic;
+
+ public ImplementerController(IOrderLogic order, IImplementerLogic logic, ILogger logger)
+ {
+ _logger = logger;
+ _order = order;
+ _logic = logic;
+ }
+
+ [HttpGet]
+ public ImplementerViewModel? Login(string login, string password)
+ {
+ try
+ {
+ return _logic.ReadElement(new ImplementerSearchModel
+ {
+ ImplementerFIO = login,
+ Password = password
+ });
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка авторизации сотрудника");
+ throw;
+ }
+ }
+
+ [HttpGet]
+ public List? GetNewOrders()
+ {
+ try
+ {
+ return _order.ReadList(new OrderSearchModel
+ {
+ Statusses = new() { OrderStatus.Принят }
+ });
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка получения новых заказов");
+ throw;
+ }
+ }
+
+ [HttpGet]
+ public OrderViewModel? GetImplementerOrder(int implementerId)
+ {
+ try
+ {
+ return _order.ReadElement(new OrderSearchModel
+ {
+ ImplementerId = implementerId
+ });
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка получения текущего заказа исполнителя");
+ throw;
+ }
+ }
+
+ [HttpPost]
+ public void TakeOrderInWork(OrderBindingModel model)
+ {
+ try
+ {
+ _order.TakeOrderInWork(model);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу", model.Id);
+ throw;
+ }
+ }
+
+ [HttpPost]
+ public void FinishOrder(OrderBindingModel model)
+ {
+ try
+ {
+ _order.FinishOrder(model);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка отметки о готовности заказа с №{Id}", model.Id);
+ throw;
+ }
+ }
+ }
+ }
+