vettaql/PIbd-24_Bochkareva_E.P._Atelier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

правки

Browse Source
This commit is contained in:
vettaql 2024-12-24 22:53:56 +04:00
parent 208f744ef5
commit 15410aec67
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Atelier/Atelier/Entities/FabricModel.cs
View File

@ -3,7 +3,7 @@
public int FabricId { get; private set; }
public int ModelId { get; private set; }
public int Count { get; private set; }
public string FabricName { get; private set; } = string.Empty;
public FabricType FabricName { get; private set; }
public static FabricModel CreateElement(int fabricId, int modelId, int count)
{
return new FabricModel

2
Atelier/Atelier/Entities/ModelOrder.cs
View File

@ -3,7 +3,7 @@
public int OrderId { get; private set; }
public int ModelId { get; private set; }
public int Count { get; private set; }
public string ModelName { get; private set; } = string.Empty;
public ModelType ModelName { get; private set; }
public static ModelOrder CreateElement(int orderId, int modelId, int count)
{
return new ModelOrder

6
Atelier/Atelier/Entities/Order.cs
View File

@ -13,13 +13,13 @@ public class Order
[DisplayName("Клиент")]
public string ClientName { get; private set; } = string.Empty;
[Browsable(false)]
public IEnumerable<ModelOrder> ModelOrder { get; private set; } = [];
[DisplayName("Модель")]
public string Model => ModelOrder != null ?
string.Join(", ", ModelOrder.Select(x => $"{x.ModelName} {x.Count}")) : string.Empty;
[Browsable(false)]
public IEnumerable<ModelOrder> ModelOrder { get; private set; } = [];
public static Order CreateOperation(int id,DateTime date, Status status, int clientId, IEnumerable<ModelOrder> modelOrder)
{
return new Order

2
Atelier/Atelier/Entities/Storage.cs
View File

@ -6,7 +6,7 @@ public class Storage
[Browsable(false)]
public int FabricId { get; private set; }
[DisplayName("Ткань")]
public string FabricName { get; private set; } = string.Empty;
public FabricType FabricName { get; private set; }
[DisplayName("Метраж")]
public double StockMetrage { get; private set; }

4
Atelier/Atelier/Reports/ChartReport.cs
View File

@ -42,8 +42,8 @@ namespace Atelier.Reports
var data = _storageRepository
.ReadStorage()
.Where(x => x.DateStorage.Date == dateTime.Date)
.GroupBy(x => x.FabricId, (key, group) => new { Id = key, Stock = group.Sum(x => x.StockMetrage) })
.Select(x => (x.Id.ToString(), (double)x.Stock))
.GroupBy(x => x.FabricName, (key, group) => new { Name = key, Stock = group.Sum(x => x.StockMetrage) })
.Select(x => (x.Name.ToString(), (double)x.Stock))
.ToList();
_logger.LogDebug("Raw data: {Data}", JsonSerializer.Serialize(data));

12
Atelier/Atelier/Repositories/Implementations/ModelRepository.cs
View File

@ -166,16 +166,24 @@ internal class ModelRepository : IModelRepository
var querySelect = @$"SELECT
m.*,
fm.FabricId,
fm.modelId,
fm.Count,
f.FabricType as FabricName
FROM Models m
INNER JOIN FabricModel fm on fm.ModelId = m.Id
LEFT JOIN Fabrics f ON f.Id = fm.FabricId;";
LEFT JOIN Fabrics f ON f.Id = fm.FabricId";
var models = connection.Query<Model>(querySelect).ToList();
foreach (var model in models)
{
var querySelectSub = @$"SELECT * FROM FabricModel fm WHERE ModelId = {model.Id}";
var querySelectSub = @$"SELECT
fm.FabricId,
fm.modelId,
fm.Count,
f.FabricType as FabricName
FROM FabricModel fm
LEFT JOIN Fabrics f ON f.Id = fm.FabricId
WHERE ModelId = {model.Id}";
var fabricModel = connection.Query<FabricModel>(querySelectSub).ToList();
model.CreateList(fabricModel);
_logger.LogDebug("Model ID: {ModelId}, FabricModels: {FabricModels}", model.Id, JsonConvert.SerializeObject(fabricModel));