k_ihnkn/PIbd-21_Ihonkina_E.S._PrecastConcretePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

улр6

Browse Source
This commit is contained in:
Kate 2023-06-15 07:06:21 +03:00
parent 3a95c270ab
commit bea3595368
18 changed files with 1084 additions and 1076 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PrecastConcreteFileImplement/Implements/ImplementerStorage.cs
View File

@ -1,4 +1,9 @@
using System; using PrecastConcretePlantContracts.BindingModels;
using PrecastConcretePlantContracts.SearchModels;
using PrecastConcretePlantContracts.StoragesContracts;
using PrecastConcretePlantContracts.ViewModels;
using PrecastConcretePlantFileImplement.Models;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -69,7 +74,9 @@ namespace PrecastConcretePlantFileImplement.Implements
public List<ImplementerViewModel> GetFullList() public List<ImplementerViewModel> GetFullList()
{ {
return _source.Implementers.Select(x => x.GetViewModel).ToList(); return _source.Implementers
.Select(x => x.GetViewModel)
.ToList();
} }
public ImplementerViewModel? Insert(ImplementerBindingModel model) public ImplementerViewModel? Insert(ImplementerBindingModel model)

6
PrecastConcreteFileImplement/Models/Implementer.cs
View File

@ -1,8 +1,12 @@
using System; using PrecastConcretePlantContracts.BindingModels;
using PrecastConcretePlantContracts.ViewModels;
using PrecastConcretePlantDataModels.Models;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq;
namespace PrecastConcretePlantFileImplement.Models namespace PrecastConcretePlantFileImplement.Models
{ {

193
PrecastConcretePlant/FormImplementer.Designer.cs generated
View File

@ -28,138 +28,133 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.buttonSave = new System.Windows.Forms.Button(); buttonSave = new Button();
this.buttonCancel = new System.Windows.Forms.Button(); buttonCancel = new Button();
this.numericUpDownQualification = new System.Windows.Forms.NumericUpDown(); numericUpDownQualification = new NumericUpDown();
this.numericUpDownWorkExperience = new System.Windows.Forms.NumericUpDown(); numericUpDownWorkExperience = new NumericUpDown();
this.textBoxPassword = new System.Windows.Forms.TextBox(); textBoxPassword = new TextBox();
this.textBoxFio = new System.Windows.Forms.TextBox(); textBoxFio = new TextBox();
this.label4 = new System.Windows.Forms.Label(); label4 = new Label();
this.label3 = new System.Windows.Forms.Label(); label3 = new Label();
this.label2 = new System.Windows.Forms.Label(); label2 = new Label();
this.label1 = new System.Windows.Forms.Label(); label1 = new Label();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualification)).BeginInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownQualification).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExperience)).BeginInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownWorkExperience).BeginInit();
this.SuspendLayout(); SuspendLayout();
// //
// buttonSave // buttonSave
// //
this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); buttonSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
this.buttonSave.Location = new System.Drawing.Point(108, 151); buttonSave.Location = new Point(108, 151);
this.buttonSave.Name = "buttonSave"; buttonSave.Name = "buttonSave";
this.buttonSave.Size = new System.Drawing.Size(89, 33); buttonSave.Size = new Size(89, 33);
this.buttonSave.TabIndex = 19; buttonSave.TabIndex = 19;
this.buttonSave.Text = "Сохранить"; buttonSave.Text = "Сохранить";
this.buttonSave.UseVisualStyleBackColor = true; buttonSave.UseVisualStyleBackColor = true;
this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); buttonSave.Click += ButtonSave_Click;
// //
// buttonCancel // buttonCancel
// //
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
this.buttonCancel.Location = new System.Drawing.Point(219, 151); buttonCancel.Location = new Point(219, 151);
this.buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(89, 33); buttonCancel.Size = new Size(89, 33);
this.buttonCancel.TabIndex = 18; buttonCancel.TabIndex = 18;
this.buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
this.buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); buttonCancel.Click += ButtonCancel_Click;
// //
// numericUpDownQualification // numericUpDownQualification
// //
this.numericUpDownQualification.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) numericUpDownQualification.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
| System.Windows.Forms.AnchorStyles.Right))); numericUpDownQualification.Location = new Point(116, 97);
this.numericUpDownQualification.Location = new System.Drawing.Point(116, 97); numericUpDownQualification.Name = "numericUpDownQualification";
this.numericUpDownQualification.Name = "numericUpDownQualification"; numericUpDownQualification.Size = new Size(264, 23);
this.numericUpDownQualification.Size = new System.Drawing.Size(264, 23); numericUpDownQualification.TabIndex = 17;
this.numericUpDownQualification.TabIndex = 17;
// //
// numericUpDownWorkExperience // numericUpDownWorkExperience
// //
this.numericUpDownWorkExperience.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) numericUpDownWorkExperience.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
| System.Windows.Forms.AnchorStyles.Right))); numericUpDownWorkExperience.Location = new Point(116, 68);
this.numericUpDownWorkExperience.Location = new System.Drawing.Point(116, 68); numericUpDownWorkExperience.Name = "numericUpDownWorkExperience";
this.numericUpDownWorkExperience.Name = "numericUpDownWorkExperience"; numericUpDownWorkExperience.Size = new Size(264, 23);
this.numericUpDownWorkExperience.Size = new System.Drawing.Size(264, 23); numericUpDownWorkExperience.TabIndex = 16;
this.numericUpDownWorkExperience.TabIndex = 16;
// //
// textBoxPassword // textBoxPassword
// //
this.textBoxPassword.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) textBoxPassword.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
| System.Windows.Forms.AnchorStyles.Right))); textBoxPassword.Location = new Point(116, 40);
this.textBoxPassword.Location = new System.Drawing.Point(116, 40); textBoxPassword.Name = "textBoxPassword";
this.textBoxPassword.Name = "textBoxPassword"; textBoxPassword.PasswordChar = '*';
this.textBoxPassword.PasswordChar = '*'; textBoxPassword.Size = new Size(264, 23);
this.textBoxPassword.Size = new System.Drawing.Size(264, 23); textBoxPassword.TabIndex = 15;
this.textBoxPassword.TabIndex = 15;
// //
// textBoxFio // textBoxFio
// //
this.textBoxFio.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) textBoxFio.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
| System.Windows.Forms.AnchorStyles.Right))); textBoxFio.Location = new Point(116, 11);
this.textBoxFio.Location = new System.Drawing.Point(116, 11); textBoxFio.Name = "textBoxFio";
this.textBoxFio.Name = "textBoxFio"; textBoxFio.Size = new Size(264, 23);
this.textBoxFio.Size = new System.Drawing.Size(264, 23); textBoxFio.TabIndex = 14;
this.textBoxFio.TabIndex = 14;
// //
// label4 // label4
// //
this.label4.AutoSize = true; label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(14, 99); label4.Location = new Point(14, 99);
this.label4.Name = "label4"; label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(91, 15); label4.Size = new Size(91, 15);
this.label4.TabIndex = 13; label4.TabIndex = 13;
this.label4.Text = "Квалификация:"; label4.Text = "Квалификация:";
// //
// label3 // label3
// //
this.label3.AutoSize = true; label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(67, 70); label3.Location = new Point(67, 70);
this.label3.Name = "label3"; label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(38, 15); label3.Size = new Size(38, 15);
this.label3.TabIndex = 12; label3.TabIndex = 12;
this.label3.Text = "Стаж:"; label3.Text = "Стаж:";
// //
// label2 // label2
// //
this.label2.AutoSize = true; label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(58, 43); label2.Location = new Point(58, 43);
this.label2.Name = "label2"; label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(52, 15); label2.Size = new Size(52, 15);
this.label2.TabIndex = 11; label2.TabIndex = 11;
this.label2.Text = "Пароль:"; label2.Text = "Пароль:";
// //
// label1 // label1
// //
this.label1.AutoSize = true; label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(68, 14); label1.Location = new Point(68, 14);
this.label1.Name = "label1"; label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(37, 15); label1.Size = new Size(37, 15);
this.label1.TabIndex = 10; label1.TabIndex = 10;
this.label1.Text = "ФИО:"; label1.Text = "ФИО:";
// //
// FormImplementer // FormImplementer
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(402, 196); ClientSize = new Size(402, 196);
this.Controls.Add(this.buttonSave); Controls.Add(buttonSave);
this.Controls.Add(this.buttonCancel); Controls.Add(buttonCancel);
this.Controls.Add(this.numericUpDownQualification); Controls.Add(numericUpDownQualification);
this.Controls.Add(this.numericUpDownWorkExperience); Controls.Add(numericUpDownWorkExperience);
this.Controls.Add(this.textBoxPassword); Controls.Add(textBoxPassword);
this.Controls.Add(this.textBoxFio); Controls.Add(textBoxFio);
this.Controls.Add(this.label4); Controls.Add(label4);
this.Controls.Add(this.label3); Controls.Add(label3);
this.Controls.Add(this.label2); Controls.Add(label2);
this.Controls.Add(this.label1); Controls.Add(label1);
this.Name = "FormImplementer"; Name = "FormImplementer";
this.Text = "FormImplementer"; Text = "Исполнитель";
this.Load += new System.EventHandler(this.FormImplementer_Load); Load += FormImplementer_Load;
((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualification)).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownQualification).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExperience)).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownWorkExperience).EndInit();
this.ResumeLayout(false); ResumeLayout(false);
this.PerformLayout(); PerformLayout();
} }
#endregion #endregion

123
PrecastConcretePlant/FormImplementers.Designer.cs generated
View File

@ -28,86 +28,83 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.buttonRef = new System.Windows.Forms.Button(); buttonRef = new Button();
this.buttonDel = new System.Windows.Forms.Button(); buttonDel = new Button();
this.buttonUpd = new System.Windows.Forms.Button(); buttonUpd = new Button();
this.buttonAdd = new System.Windows.Forms.Button(); buttonAdd = new Button();
this.dataGridView = new System.Windows.Forms.DataGridView(); dataGridView = new DataGridView();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
this.SuspendLayout(); SuspendLayout();
// //
// buttonRef // buttonRef
// //
this.buttonRef.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
this.buttonRef.Location = new System.Drawing.Point(532, 149); buttonRef.Location = new Point(532, 149);
this.buttonRef.Name = "buttonRef"; buttonRef.Name = "buttonRef";
this.buttonRef.Size = new System.Drawing.Size(90, 37); buttonRef.Size = new Size(90, 37);
this.buttonRef.TabIndex = 14; buttonRef.TabIndex = 14;
this.buttonRef.Text = "Обновить"; buttonRef.Text = "Обновить";
this.buttonRef.UseVisualStyleBackColor = true; buttonRef.UseVisualStyleBackColor = true;
this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); buttonRef.Click += ButtonRef_Click;
// //
// buttonDel // buttonDel
// //
this.buttonDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
this.buttonDel.Location = new System.Drawing.Point(532, 110); buttonDel.Location = new Point(532, 110);
this.buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
this.buttonDel.Size = new System.Drawing.Size(90, 33); buttonDel.Size = new Size(90, 33);
this.buttonDel.TabIndex = 13; buttonDel.TabIndex = 13;
this.buttonDel.Text = "Удалить"; buttonDel.Text = "Удалить";
this.buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click); buttonDel.Click += ButtonDel_Click;
// //
// buttonUpd // buttonUpd
// //
this.buttonUpd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Right;
this.buttonUpd.Location = new System.Drawing.Point(532, 70); buttonUpd.Location = new Point(532, 70);
this.buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
this.buttonUpd.Size = new System.Drawing.Size(90, 34); buttonUpd.Size = new Size(90, 34);
this.buttonUpd.TabIndex = 12; buttonUpd.TabIndex = 12;
this.buttonUpd.Text = "Изменить"; buttonUpd.Text = "Изменить";
this.buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); buttonUpd.Click += ButtonUpd_Click;
// //
// buttonAdd // buttonAdd
// //
this.buttonAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Right;
this.buttonAdd.Location = new System.Drawing.Point(532, 34); buttonAdd.Location = new Point(532, 34);
this.buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
this.buttonAdd.Size = new System.Drawing.Size(90, 30); buttonAdd.Size = new Size(90, 30);
this.buttonAdd.TabIndex = 11; buttonAdd.TabIndex = 11;
this.buttonAdd.Text = "Добавить"; buttonAdd.Text = "Добавить";
this.buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); buttonAdd.Click += ButtonAdd_Click;
// //
// dataGridView // dataGridView
// //
this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
| System.Windows.Forms.AnchorStyles.Left) dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
| System.Windows.Forms.AnchorStyles.Right))); dataGridView.Location = new Point(12, 12);
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Name = "dataGridView";
this.dataGridView.Location = new System.Drawing.Point(12, 12); dataGridView.RowTemplate.Height = 25;
this.dataGridView.Name = "dataGridView"; dataGridView.Size = new Size(469, 290);
this.dataGridView.RowTemplate.Height = 25; dataGridView.TabIndex = 10;
this.dataGridView.Size = new System.Drawing.Size(469, 290);
this.dataGridView.TabIndex = 10;
// //
// FormViewImplementers // FormImplementers
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(634, 314); ClientSize = new Size(634, 314);
this.Controls.Add(this.buttonRef); Controls.Add(buttonRef);
this.Controls.Add(this.buttonDel); Controls.Add(buttonDel);
this.Controls.Add(this.buttonUpd); Controls.Add(buttonUpd);
this.Controls.Add(this.buttonAdd); Controls.Add(buttonAdd);
this.Controls.Add(this.dataGridView); Controls.Add(dataGridView);
this.Name = "FormViewImplementers"; Name = "FormImplementers";
this.Text = "FormViewImplementers"; Text = "Исполнители";
this.Load += new System.EventHandler(this.FormViewImplementers_Load); Load += FormViewImplementers_Load;
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
this.ResumeLayout(false); ResumeLayout(false);
} }
#endregion #endregion

43
PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs
View File

@ -51,7 +51,6 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
} }
public OrderViewModel? ReadElement(OrderSearchModel model) public OrderViewModel? ReadElement(OrderSearchModel model)
private bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
{ {
if (model == null) if (model == null)
{ {
@ -75,24 +74,29 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
{ {
throw new ArgumentNullException(nameof(model)); throw new ArgumentNullException(nameof(model));
} }
if (viewModel.Status + 1 != newStatus) if (viewModel.Status + 1 != newStatus && viewModel.Status != OrderStatus.Ожидание)
{ {
_logger.LogWarning("Change status operation failed"); _logger.LogWarning("Change status operation failed");
throw new InvalidOperationException(); throw new InvalidOperationException();
var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
if (viewModel == null)
{
throw new ArgumentNullException(nameof(model));
}
if (viewModel.Status + 1 != newStatus)
{
_logger.LogWarning("Change status operation failed");
return false;
} }
model.Status = newStatus; model.Status = newStatus;
if (model.Status == OrderStatus.Готов) if (model.Status == OrderStatus.Готов || viewModel.Status == OrderStatus.Ожидание)
{ {
model.DateImplement = DateTime.Now; model.DateImplement = DateTime.Now;
var reinforced = _reinforcedStorage.GetElement(new() { Id = viewModel.ReinforcedId });
if (reinforced == null)
{
throw new ArgumentNullException(nameof(reinforced));
}
if (!_shopLogic.AddReinforced(reinforced, viewModel.Count))
{
model.Status = OrderStatus.Ожидание;
_logger.LogWarning($"AddReinforced operation failed");
}
else
{
model.DateImplement = DateTime.Now;
}
} }
else else
{ {
@ -102,21 +106,6 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
{ {
model.ImplementerId = viewModel.ImplementerId.Value; model.ImplementerId = viewModel.ImplementerId.Value;
} }
CheckModel(model, false);
var reinforced = _reinforcedStorage.GetElement(new() { Id = viewModel.ReinforcedId });
if (reinforced == null)
{
throw new ArgumentNullException(nameof(reinforced));
}
if (!_shopLogic.AddReinforced(reinforced, viewModel.Count))
{
throw new Exception($"AddReinforced operation failed");
}
}
else
{
model.DateImplement = viewModel.DateImplement;
}
CheckModel(model, false); CheckModel(model, false);
if (_orderStorage.Update(model) == null) if (_orderStorage.Update(model) == null)
{ {

38
PrecastConcretePlantBusinessLogic/BusinessLogic/WorkModeling.cs
View File

@ -36,7 +36,7 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
return; return;
} }
var orders = _orderLogic.ReadList(new OrderSearchModel { Status = new() { OrderStatus.Принят, OrderStatus.Выполняется } }); var orders = _orderLogic.ReadList(new OrderSearchModel { Statuses = new() { OrderStatus.Принят, OrderStatus.Выполняется, OrderStatus.Ожидание } });
if (orders == null || orders.Count == 0) if (orders == null || orders.Count == 0)
{ {
_logger.LogWarning("DoWork. Orders is null or empty"); _logger.LogWarning("DoWork. Orders is null or empty");
@ -61,35 +61,54 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
await Task.Run(() => await Task.Run(() =>
{ {
foreach (var order in orders) foreach (var order in orders.Where(x => x.Status == OrderStatus.Ожидание && x.ImplementerId == implementer.Id))
{
try
{
_orderLogic.DeliveryOrder(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 try
{ {
_logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id); _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
_orderLogic.TakeOrderInWork(new OrderBindingModel _orderLogic.TakeOrderInWork(new OrderBindingModel
{ {
Id = order.Id, Id = order.Id,
ImplementerId = implementer.Id ImplementerId = implementer.Id
}); });
Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count); Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id); _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
_orderLogic.DeliveryOrder(new OrderBindingModel _orderLogic.DeliveryOrder(new OrderBindingModel
{ {
Id = order.Id Id = order.Id
}); });
Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
} }
catch (InvalidOperationException ex) catch (InvalidOperationException ex)
{ {
_logger.LogWarning(ex, "Error try get work"); _logger.LogWarning(ex, "Error try get work");
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error while do work"); _logger.LogError(ex, "Error while do work");
@ -98,7 +117,6 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
} }
}); });
} }
private async Task RunOrderInWork(ImplementerViewModel implementer, List<OrderViewModel> allOrders) private async Task RunOrderInWork(ImplementerViewModel implementer, List<OrderViewModel> allOrders)
{ {
if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0) if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)

2
PrecastConcretePlantDataBaseImplemet/Implements/ImplementerStorage.cs
View File

@ -38,7 +38,7 @@ namespace PrecastConcretePlantDatabaseImplement.Implements
if (model.ImplementerFIO != null) if (model.ImplementerFIO != null)
{ {
using var context = new SoftwareInstallationDataBase(); using var context = new PrecastConcretePlantDatabase();
return context.Implementers return context.Implementers
.Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO)) .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))

3
PrecastConcretePlantDataModels/Enums/OrderStatus.cs
View File

@ -12,7 +12,8 @@ namespace PrecastConcretePlantDataModels.Enums
Принят = 0, Принят = 0,
Выполняется = 1, Выполняется = 1,
Готов = 2, Готов = 2,
Выдан = 3 Выдан = 3,
Ожидание = 4
} }
} }

1
PrecastConcretePlantListImplement/Implements/ImplementerStorage.cs
View File

@ -2,6 +2,7 @@
using PrecastConcretePlantContracts.SearchModels; using PrecastConcretePlantContracts.SearchModels;
using PrecastConcretePlantContracts.StoragesContracts; using PrecastConcretePlantContracts.StoragesContracts;
using PrecastConcretePlantContracts.ViewModels; using PrecastConcretePlantContracts.ViewModels;
using PrecastConcretePlantListImplement.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

25
PrecastConcretePlantListImplement/Implements/OrderStorage.cs
View File

@ -36,31 +36,26 @@ namespace PrecastConcretePlantListImplement.Implements
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
if (!model.Id.HasValue) if (model.Id.HasValue)
{ {
return null;
}
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if (model.Id.HasValue && order.Id == model.Id) if (model.Id.HasValue && order.Id == model.Id)
{ {
return order.GetViewModel; return order.GetViewModel;
} }
else if (model.ImplementerId.HasValue && model.Statuses != null && }
order.ImplementerId == model.ImplementerId && }
model.Statuses.Contains(order.Status)) else if (model.ImplementerId.HasValue && model.Statuses != null)
{ {
return GetViewModel(order); foreach (var order in _source.Orders)
}
else if (model.ImplementerId.HasValue &&
model.ImplementerId == order.ImplementerId)
{ {
return GetViewModel(order); if (model.ImplementerId == order.ImplementerId && model.Statuses.Contains(order.Status))
{
return order.GetViewModel;
}
} }
} }
return null; return null;
} }
@ -86,7 +81,7 @@ namespace PrecastConcretePlantListImplement.Implements
result.Add(order.GetViewModel); result.Add(order.GetViewModel);
} }
else if (model.Status != null && model.Status.Contains(order.Status)) else if (model.Statuses != null && model.Statuses.Contains(order.Status))
{ {
result.Add(order.GetViewModel); result.Add(order.GetViewModel);
} }

1
PrecastConcretePlantListImplement/Models/Implementer.cs
View File

@ -54,6 +54,7 @@ namespace PrecastConcretePlantListImplement.Models
Id = Id, Id = Id,
Password = Password, Password = Password,
Qualification = Qualification, Qualification = Qualification,
WorkExperience = WorkExperience,
ImplementerFIO = ImplementerFIO, ImplementerFIO = ImplementerFIO,
}; };
} }

2
PrecastConcretePlantRestApi/Controllers/ImplementerController.cs
View File

@ -46,7 +46,7 @@ namespace PrecastConcretePlantRestApi.Controllers
{ {
return _order.ReadList(new OrderSearchModel return _order.ReadList(new OrderSearchModel
{ {
Status = new() { OrderStatus.Принят } Statuses = new() { OrderStatus.Принят }
}); });
} }
catch (Exception ex) catch (Exception ex)