Zyzf/PIbd-22_Kalyshev_Y_V_BlacksmithWorkshop_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

another changes

Browse Source
This commit is contained in:
Калышев Ян 2023-04-18 07:05:24 -07:00
parent 0ce604e5f9
commit bc3f42e37e
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
BlacksmithWorkshop/BlacksmithListImplement/Implements/OrderStorage.cs
View File

@ -76,8 +76,28 @@ namespace BlacksmithWorkshopListImplement.Implements
return Order.GetViewModel;
}
}
return null;
}
if (model.Id.HasValue)
{
foreach (var Order in _source.Orders)
{
if (Order.Id == model.Id)
{
return Order.GetViewModel;
}
}
}
else if (model.ImplementerId.HasValue && model.Status.HasValue)
{
foreach (var Order in _source.Orders)
{
if (Order.ImplementerId == model.ImplementerId && Order.Status == model.Status)
{
return Order.GetViewModel;
}
}
}
return null;
}
public OrderViewModel? Insert(OrderBindingModel model)
{
model.Id = 1;

10
BlacksmithWorkshop/BlacksmithListImplement/Models/Order.cs
View File

@ -19,7 +19,8 @@ namespace BlacksmithWorkshopListImplement.Models
public int ManufactureId { get; private set; }
public string ManufactureName { get; private set; } = string.Empty;
public int ClientId { get; private set; }
public int Count { get; private set; }
public int? ImplementerId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; set; } = DateTime.Now;
@ -36,7 +37,8 @@ namespace BlacksmithWorkshopListImplement.Models
ManufactureId = model.ManufactureId,
ManufactureName = model.ManufactureName,
ClientId = model.ClientId,
Count = model.Count,
ImplementerId = model.ImplementerId,
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
DateCreate = model.DateCreate,
@ -52,13 +54,15 @@ namespace BlacksmithWorkshopListImplement.Models
}
Status = model.Status;
DateImplement = model.DateImplement;
}
ImplementerId = model.ImplementerId;
}
public OrderViewModel GetViewModel => new()
{
Id = Id,
ManufactureId = ManufactureId,
ManufactureName = ManufactureName,
ClientId = ClientId,
ImplementerId = ImplementerId,
Count = Count,
Sum = Sum,
Status = Status,

6
BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/BlacksmithWorkshopDatabaseImplement.csproj
View File

@ -7,9 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj
View File

@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup>

4
BlacksmithWorkshop/BlacksmithWorkshopView/BlacksmithWorkshopView.csproj
View File

@ -9,12 +9,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
<PackageReference Include="ReportViewerCore.WinForms" Version="15.1.17" />
</ItemGroup>