Glliza/PIbd-24_Galtsova_E.I_ShoeStore
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ЭТО ПОБЕДА

Browse Source
This commit is contained in:
Glliza 2024-12-23 17:55:39 +04:00
parent ddc9b358cc
commit 387952f66a
17 changed files with 138 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ShoeStore/Entities/Employee.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -9,7 +10,9 @@ namespace ShoeStore.Entities;
public class Employee
{
public int Id { get; private set; }
[DisplayName("Дата")]
public DateTime Date { get; private set; }
[DisplayName("Номер склада")]
public int NumberStorage { get; private set; }
public static Employee CreateEntity(int id, DateTime date,int numberStorage)
{

4
ShoeStore/Entities/Product.cs
View File

@ -1,6 +1,7 @@
using ShoeStore.Entities.Enums;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -11,8 +12,11 @@ namespace ShoeStore.Entities;
public class Product
{
public int Id { get; private set; }
[DisplayName("Название обуви")]
public string NameOfShoes { get; private set; }
[DisplayName("Компания производителя")]
public ManufacturingCompany ManufacturingCompany { get; private set; }
[DisplayName("Цена")]
public int Price { get; private set; }
public static Product CreateEntity(int id, string nameOfShoes, ManufacturingCompany manufacturingCompany, int price)
{

1
ShoeStore/Entities/ProductSale.cs
View File

@ -11,6 +11,7 @@ public class ProductSale
public int ProductId { get; private set; }
public int SaleId { get; private set; }
public int SalesNumber { get; private set; }
public string ProductName { get; private set; }
public static ProductSale CreateOperation(int productId, int saleId, int salesNumber)
{

9
ShoeStore/Entities/Receipt.cs
View File

@ -1,6 +1,7 @@
using ShoeStore.Entities.Enums;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -10,10 +11,16 @@ namespace ShoeStore.Entities;
public class Receipt
{
public int Id { get; private set; }
[DisplayName("Тип обуви")]
public ProductType ProductType { get; private set; }
[DisplayName("Дата поступления")]
public DateTime DateOfReceipt { get; private set; }
public int NumberOfPairsReceived { get; private set; }
[DisplayName("Количество")]
public int NumberOfPairsReceived { get; private set; }
[Browsable(false)]
public int ProductId { get; private set; }
[DisplayName("Продукт")]
public string ProductName { get; private set; }
public static Receipt CreateOperation(int id,ProductType productType, DateTime date,int numberOfPairsReceived, int productId)
{

18
ShoeStore/Entities/Sale.cs
View File

@ -2,6 +2,7 @@
using ShoeStore.Entities.Enums;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -13,13 +14,20 @@ namespace ShoeStore.Entities;
public class Sale
{
public int Id { get; private set; }
[DisplayName("Дата продажи")]
public DateTime DateOfSale { get; private set; }
[Browsable(false)]
public IEnumerable<ProductSale> Product
{
get;
private set;
} = [];
[DisplayName("Продукты")]
public string Products => Product != null ?
string.Join(", ", Product.Select(x => $"{x.ProductName}, {x.SalesNumber}")) : string.Empty;
public static Sale CreateOperation(int id, DateTime date, IEnumerable<ProductSale> product)
{
return new Sale
@ -30,14 +38,12 @@ public class Sale
};
}
public static Sale CreateOperation(TempProductSale tempProductSale, IEnumerable<ProductSale> products)
public void SetProductSales (IEnumerable<ProductSale> products)
{
return new Sale
if (products != null && products.Any())
{
Id = tempProductSale.Id,
DateOfSale = tempProductSale.DateOfSale,
Product = products
};
Product = products;
}
}
}

4
ShoeStore/Entities/Storage.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -9,8 +10,11 @@ namespace ShoeStore.Entities;
public class Storage
{
public int Id { get; private set; }
[DisplayName("Размер")]
public int Size { get; private set; }
[DisplayName("Количество на складе")]
public int QuantityInStock { get; private set; }
[DisplayName("Номер склада")]
public int NumberStorage { get; private set; }
public static Storage CreateEntity(int id, int size, int quantityInStock, int numberStorage)
{

15
ShoeStore/Entities/TempProductSale.cs
View File

@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ShoeStore.Entities;
public class TempProductSale
{
public int Id { get; private set; }
public DateTime DateOfSale { get; private set; }
public int ProductId { get; private set; }
public int SalesNumber { get; private set; }
}

7
ShoeStore/Forms/FormEmployees.cs
View File

@ -86,7 +86,12 @@ public partial class FormEmployees : Form
MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void LoadList() => dataGridViewData.DataSource = _employeeRepository.ReadEmployees();
private void LoadList()
{
dataGridViewData.DataSource = _employeeRepository.ReadEmployees();
dataGridViewData.Columns["Id"].Visible = false;
}
private bool TryGetIdentifierFromSelectedRow(out int id)
{
id = 0;

7
ShoeStore/Forms/FormProducts.cs
View File

@ -83,7 +83,12 @@ namespace ShoeStore.Forms
MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void LoadList() => dataGridViewProduct.DataSource = _productRepository.ReadProducts();
private void LoadList()
{
dataGridViewProduct.DataSource = _productRepository.ReadProducts();
dataGridViewProduct.Columns["Id"].Visible = false;
}
private bool TryGetIdentifierFromSelectedRow(out int id)
{
id = 0;

6
ShoeStore/Forms/FormReceipts.cs
View File

@ -38,7 +38,11 @@ public partial class FormReceipts : Form
}
}
private void LoadList() => dataGridView1.DataSource = _receiptRepository.ReadReceipts();
private void LoadList()
{
dataGridView1.DataSource = _receiptRepository.ReadReceipts();
dataGridView1.Columns["Id"].Visible = false;
}
private void FormReceipts_Load(object sender, EventArgs e)
{

7
ShoeStore/Forms/FormSales.cs
View File

@ -51,7 +51,12 @@ namespace ShoeStore.Froms
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void LoadList() => dataGridView1.DataSource = _saleRepository.ReadSales();
private void LoadList()
{
dataGridView1.DataSource = _saleRepository.ReadSales();
dataGridView1.Columns["Id"].Visible = false;
//dataGridView1.Columns["Date"].DefaultCellStyle.Format = "dd MMMM yyyy hh:mm";
}
private void buttonDel_Click(object sender, EventArgs e)
{

6
ShoeStore/Forms/FormStorages.cs
View File

@ -12,7 +12,11 @@ namespace ShoeStore.Forms
private readonly IStorageRepository _storageRepository;
private void LoadList() => dataGridViewStorages.DataSource = _storageRepository.ReadStorages();
private void LoadList()
{
dataGridViewStorages.DataSource = _storageRepository.ReadStorages();
dataGridViewStorages.Columns["Id"].Visible = false;
}
public FormStorages(IUnityContainer container, IStorageRepository storageRepository)

6
ShoeStore/Reports/ChartReport.cs
View File

@ -23,7 +23,7 @@ public class ChartReport
{
new PdfBuilder(filePath)
.AddHeader("Количество поступивших товаров")
.AddPieChart("Товары", GetData(dateTime))
.AddPieChart($"Товары на {dateTime: dd MMMM yyyy}", GetData(dateTime))
.Build();
return true;
}
@ -39,8 +39,8 @@ public class ChartReport
return _receiptRepository
.ReadReceipts()
.Where(x => x.DateOfReceipt.Date == dateTime.Date)
.GroupBy(x => x.ProductId, (key, group) => new { ID = key, Count = group.Sum(y => y.NumberOfPairsReceived) })
.Select(x => (x.ID.ToString(), (double)x.Count))
.GroupBy(x => x.ProductName, (key, group) => new { Name = key, Count = group.Sum(y => y.NumberOfPairsReceived) })
.Select(x => (x.Name, (double)x.Count))
.ToList();
}
}

8
ShoeStore/Reports/TableReport.cs
View File

@ -29,7 +29,7 @@ internal class TableReport
try {
new ExcelBuilder(filePath)
.AddHeader("Сводка по движению товара", 0, 4)
.AddParagraph("за период", 0)
.AddParagraph($"За период c {startDate:dd.MM.yyyy} по {endDate: dd.MM.yyyy}", 0)
.AddTable([10, 10, 15, 15], GetData(startDate, endDate))
.Build();
return true;
@ -46,18 +46,18 @@ internal class TableReport
var data = _saleRepository
.ReadSales()
.Where(x => x.DateOfSale >= startDate && x.DateOfSale <= endDate && x.Product.Any(y => y.SaleId == x.Id))
.Select(x => new { x.Product.First(y => y.SaleId == x.Id).ProductId, Date = x.DateOfSale, CountIn = (int?)null, CountOut = (int?)x.Product.FirstOrDefault(y => y.SaleId == x.Id)?.SalesNumber })
.Select(x => new { x.Product.First(y => y.SaleId == x.Id).ProductName, Date = x.DateOfSale, CountIn = (int?)null, CountOut = (int?)x.Product.FirstOrDefault(y => y.SaleId == x.Id)?.SalesNumber })
.Union(
_receiptRepository
.ReadReceipts()
.Where(x => x.DateOfReceipt >= startDate && x.DateOfReceipt <= endDate)
.Select(x => new { x.ProductId, Date = x.DateOfReceipt, CountIn = (int?)x.NumberOfPairsReceived, CountOut = (int?)null }))
.Select(x => new { x.ProductName, Date = x.DateOfReceipt, CountIn = (int?)x.NumberOfPairsReceived, CountOut = (int?)null }))
.OrderBy(x => x.Date);
return
new List<string[]>() { item }
.Union(
data
.Select(x => new string[] { x.ProductId.ToString(), x.Date.ToString(), x.CountIn?.ToString() ?? string.Empty, x.CountOut?.ToString() ?? string.Empty }))
.Select(x => new string[] { x.ProductName, x.Date.ToString(), x.CountIn?.ToString() ?? string.Empty, x.CountOut?.ToString() ?? string.Empty }))
.Union([["Всего", "", data.Sum(x => x.CountIn ?? 0).ToString(), data.Sum(x => x.CountOut ?? 0).ToString()]])
.ToList();

33
ShoeStore/Repositories/Implementations/QueryBuilder.cs Normal file
View File

@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ShoeStore.Repositories.Implementations;
public class QueryBuilder
{
private readonly StringBuilder _builder;
public QueryBuilder()
{
_builder = new();
}
public QueryBuilder AddCondition(string condition)
{
if (_builder.Length > 0)
{
_builder.Append(" AND ");
}
_builder.Append(condition);
return this;
}
public string Build()
{
if (_builder.Length == 0)
{
return string.Empty;
}
return $"WHERE {_builder}";
}
}

4
ShoeStore/Repositories/Implementations/ReceiptRepository.cs
View File

@ -50,7 +50,9 @@ public class ReceiptRepository : IReceiptRepository
try
{
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = "SELECT * FROM Receipt";
var querySelect = @"SELECT r.*, p.NameOfShoes as ProductName
FROM Receipt r
INNER JOIN Product p ON p.Id = r.ProductId";
var receipt = connection.Query<Receipt>(querySelect);
_logger.LogDebug("Полученные объекты: {json}",
JsonConvert.SerializeObject(receipt));

43
ShoeStore/Repositories/Implementations/SaleRepository.cs
View File

@ -84,17 +84,44 @@ public class SaleRepository : ISaleRepository
_logger.LogInformation("Получение всех объектов");
try
{
var builder = new QueryBuilder();
if (dateForm.HasValue)
{
builder.AddCondition("s.DateOfSale >= @dateForm");
}
if (dateTo.HasValue)
{
builder.AddCondition("s.DateOfSale <= @dateTo");
}
using var connection = new
NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @"SELECT s.*, ps.ProductId, ps.SalesNumber
var querySelect = @$"SELECT s.*, ps.ProductId, ps.SaleId, ps.SalesNumber, p.NameOfShoes as ProductName
FROM Sale s
INNER JOIN ProductSale ps ON ps.SaleId = s.Id";
var sale = connection.Query<TempProductSale>(querySelect);
_logger.LogDebug("Полученные объекты: {json}",
JsonConvert.SerializeObject(sale));
return sale.GroupBy(x => x.Id, y => y,
(key, value) => Sale.CreateOperation(value.First(),
value.Select(z => ProductSale.CreateOperation( z.ProductId, z.Id, z.SalesNumber)))).ToList();
INNER JOIN ProductSale ps ON ps.SaleId = s.Id
INNER JOIN Product p ON p.Id = ps.ProductId
{builder.Build()}";
var productDict = new Dictionary<int, List<ProductSale>>();
var sales = connection.Query<Sale, ProductSale, Sale>(querySelect,
(sale, ProductSales) =>
{
if (!productDict.TryGetValue(sale.Id, out var pr))
{
pr = [];
productDict.Add(sale.Id, pr);
}
pr.Add(ProductSales);
return sale;
}, splitOn: "ProductId", param: new { dateForm, dateTo});
_logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(sales));
return productDict.Select(x =>
{
var pr = sales.First(y => y.Id == x.Key);
pr.SetProductSales(x.Value);
return pr;
}).ToArray();
}
catch (Exception ex)
{