diff --git a/FishFactory/FishFactoryBusinessLogic/BusinessLogics/ReportLogic.cs b/FishFactory/FishFactoryBusinessLogic/BusinessLogics/ReportLogic.cs
new file mode 100644
index 0000000..ad8399f
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -0,0 +1,130 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperModels;
+using FishFactoryBusinessLogic.OfficePackage;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+
+namespace FishFactoryBusinessLogic.BusinessLogics
+{
+ public class ReportLogic : IReportLogic
+ {
+ private readonly IComponentStorage _ComponentStorage;
+
+ private readonly ICannedStorage _cannedStorage;
+
+ private readonly IOrderStorage _orderStorage;
+
+ private readonly AbstractSaveToExcel _saveToExcel;
+
+ private readonly AbstractSaveToWord _saveToWord;
+
+ private readonly AbstractSaveToPdf _saveToPdf;
+
+ public ReportLogic(ICannedStorage productStorage, IComponentStorage ComponentStorage, IOrderStorage orderStorage,
+ AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+ {
+ _cannedStorage = productStorage;
+ _ComponentStorage = ComponentStorage;
+ _orderStorage = orderStorage;
+
+ _saveToExcel = saveToExcel;
+ _saveToWord = saveToWord;
+ _saveToPdf = saveToPdf;
+ }
+
+ ///
+ /// Получение списка ингредиентов с указанием, в каких консервах используются
+ ///
+ ///
+ public List GetCannedComponent()
+ {
+ var cannedList = _cannedStorage.GetFullList();
+
+ var list = new List();
+
+ foreach (var canned in cannedList)
+ {
+ var record = new ReportCannedComponentViewModel
+ {
+ CannedName = canned.CannedName,
+ Components = new List>(),
+ TotalCount = 0
+ };
+ foreach (var component in canned.CannedComponents)
+ {
+ record.Components.Add(new Tuple(component.Value.Item1.ComponentName, component.Value.Item2));
+ record.TotalCount += component.Value.Item2;
+ }
+
+ list.Add(record);
+ }
+
+ return list;
+ }
+
+ ///
+ /// Получение списка заказов за определенный период
+ ///
+ ///
+ ///
+ public List GetOrders(ReportBindingModel model)
+ {
+ return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo })
+ .Select(x => new ReportOrdersViewModel
+ {
+ Id = x.Id,
+ DateCreate = x.DateCreate,
+ CannedName = x.CannedName,
+ OrderStatus = x.Status.ToString(),
+ Sum = x.Sum
+ })
+ .ToList();
+ }
+
+ ///
+ /// Сохранение консерв в файл-Word
+ ///
+ ///
+ public void SaveListCannedToWordFile(ReportBindingModel model)
+ {
+ _saveToWord.CreateDoc(new WordInfo
+ {
+ FileName = model.FileName,
+ Title = "Список консерв",
+ ListCanned = _cannedStorage.GetFullList()
+ });
+ }
+
+ ///
+ /// Сохранение ингредиентов с указаеним консерв в файл-Excel
+ ///
+ ///
+ public void SaveCannedComponentToExcelFile(ReportBindingModel model)
+ {
+ _saveToExcel.CreateReport(new ExcelInfo
+ {
+ FileName = model.FileName,
+ Title = "Список консерв",
+ CannedComponents = GetCannedComponent()
+ });
+ }
+
+ ///
+ /// Сохранение заказов в файл-Pdf
+ ///
+ ///
+ public void SaveOrdersToPdfFile(ReportBindingModel model)
+ {
+ _saveToPdf.CreateDoc(new PdfInfo
+ {
+ FileName = model.FileName,
+ Title = "Список заказов",
+ DateFrom = model.DateFrom!.Value,
+ DateTo = model.DateTo!.Value,
+ Orders = GetOrders(model)
+ });
+ }
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/FishFactoryBusinessLogic.csproj b/FishFactory/FishFactoryBusinessLogic/FishFactoryBusinessLogic.csproj
index bc03b1a..76111d2 100644
--- a/FishFactory/FishFactoryBusinessLogic/FishFactoryBusinessLogic.csproj
+++ b/FishFactory/FishFactoryBusinessLogic/FishFactoryBusinessLogic.csproj
@@ -7,7 +7,9 @@
+
+
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
new file mode 100644
index 0000000..a5a6076
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -0,0 +1,107 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+using FishFactoryBusinessLogic.OfficePackage.HelperModels;
+
+namespace FishFactoryBusinessLogic.OfficePackage
+{
+ public abstract class AbstractSaveToExcel
+ {
+ ///
+ /// Создание отчета
+ ///
+ ///
+ public void CreateReport(ExcelInfo info)
+ {
+ CreateExcel(info);
+
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = 1,
+ Text = info.Title,
+ StyleInfo = ExcelStyleInfoType.Title
+ });
+
+ MergeCells(new ExcelMergeParameters
+ {
+ CellFromName = "A1",
+ CellToName = "C1"
+ });
+
+ uint rowIndex = 2;
+ foreach (var pc in info.CannedComponents)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = rowIndex,
+ Text = pc.CannedName,
+ StyleInfo = ExcelStyleInfoType.Text
+ });
+ rowIndex++;
+
+ foreach (var (Component, Count) in pc.Components)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "B",
+ RowIndex = rowIndex,
+ Text = Component,
+ StyleInfo = ExcelStyleInfoType.TextWithBroder
+ });
+
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "C",
+ RowIndex = rowIndex,
+ Text = Count.ToString(),
+ StyleInfo = ExcelStyleInfoType.TextWithBroder
+ });
+
+ rowIndex++;
+ }
+
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = rowIndex,
+ Text = "Итого",
+ StyleInfo = ExcelStyleInfoType.Text
+ });
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "C",
+ RowIndex = rowIndex,
+ Text = pc.TotalCount.ToString(),
+ StyleInfo = ExcelStyleInfoType.Text
+ });
+ rowIndex++;
+ }
+
+ SaveExcel(info);
+ }
+
+ ///
+ /// Создание excel-файла
+ ///
+ ///
+ protected abstract void CreateExcel(ExcelInfo info);
+
+ ///
+ /// Добавляем новую ячейку в лист
+ ///
+ ///
+ protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+
+ ///
+ /// Объединение ячеек
+ ///
+ ///
+ protected abstract void MergeCells(ExcelMergeParameters excelParams);
+
+ ///
+ /// Сохранение файла
+ ///
+ ///
+ protected abstract void SaveExcel(ExcelInfo info);
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
new file mode 100644
index 0000000..e1b88b7
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -0,0 +1,69 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+using FishFactoryBusinessLogic.OfficePackage.HelperModels;
+
+namespace FishFactoryBusinessLogic.OfficePackage
+{
+ public abstract class AbstractSaveToPdf
+ {
+ public void CreateDoc(PdfInfo info)
+ {
+ CreatePdf(info);
+ CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+ CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+
+ CreateTable(new List { "2cm", "3cm", "6cm", "3cm", "3cm" });
+
+ CreateRow(new PdfRowParameters
+ {
+ Texts = new List { "Номер", "Дата заказа", "Консерва", "Статус заказа", "Сумма" },
+ Style = "NormalTitle",
+ ParagraphAlignment = PdfParagraphAlignmentType.Center
+ });
+
+ foreach (var order in info.Orders)
+ {
+ CreateRow(new PdfRowParameters
+ {
+ Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.CannedName, order.OrderStatus, order.Sum.ToString() },
+ Style = "Normal",
+ ParagraphAlignment = PdfParagraphAlignmentType.Left
+ });
+ }
+ CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth });
+
+ SavePdf(info);
+ }
+
+ ///
+ /// Создание doc-файла
+ ///
+ ///
+ protected abstract void CreatePdf(PdfInfo info);
+
+ ///
+ /// Создание параграфа с текстом
+ ///
+ ///
+ ///
+ protected abstract void CreateParagraph(PdfParagraph paragraph);
+
+ ///
+ /// Создание таблицы
+ ///
+ ///
+ ///
+ protected abstract void CreateTable(List columns);
+
+ ///
+ /// Создание и заполнение строки
+ ///
+ ///
+ protected abstract void CreateRow(PdfRowParameters rowParameters);
+
+ ///
+ /// Сохранение файла
+ ///
+ ///
+ protected abstract void SavePdf(PdfInfo info);
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs
new file mode 100644
index 0000000..7c29659
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -0,0 +1,60 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+using FishFactoryBusinessLogic.OfficePackage.HelperModels;
+
+namespace FishFactoryBusinessLogic.OfficePackage
+{
+ public abstract class AbstractSaveToWord
+ {
+ public void CreateDoc(WordInfo info)
+ {
+ CreateWord(info);
+
+ CreateParagraph(new WordParagraph
+ {
+ Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
+ TextProperties = new WordTextProperties
+ {
+ Size = "24",
+ JustificationType = WordJustificationType.Center
+ }
+ });
+
+ foreach (var canned in info.ListCanned)
+ {
+ CreateParagraph(new WordParagraph
+ {
+ Texts = new List<(string, WordTextProperties)> {
+ (canned.CannedName+' ', new WordTextProperties { Size = "24", Bold = true }),
+ (canned.Price.ToString(), new WordTextProperties { Size = "24" })
+ },
+ TextProperties = new WordTextProperties
+ {
+ Size = "24",
+ JustificationType = WordJustificationType.Both
+ }
+ });
+ }
+
+ SaveWord(info);
+ }
+
+ ///
+ /// Создание doc-файла
+ ///
+ ///
+ protected abstract void CreateWord(WordInfo info);
+
+ ///
+ /// Создание абзаца с текстом
+ ///
+ ///
+ ///
+ protected abstract void CreateParagraph(WordParagraph paragraph);
+
+ ///
+ /// Сохранение файла
+ ///
+ ///
+ protected abstract void SaveWord(WordInfo info);
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
new file mode 100644
index 0000000..3562a77
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
@@ -0,0 +1,9 @@
+namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum ExcelStyleInfoType
+ {
+ Title,
+ Text,
+ TextWithBroder
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
new file mode 100644
index 0000000..1138f29
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
@@ -0,0 +1,9 @@
+namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum PdfParagraphAlignmentType
+ {
+ Center,
+ Left,
+ Rigth
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
new file mode 100644
index 0000000..4634339
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
@@ -0,0 +1,8 @@
+namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum WordJustificationType
+ {
+ Center,
+ Both
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
new file mode 100644
index 0000000..d462511
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
@@ -0,0 +1,13 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelCellParameters
+ {
+ public string ColumnName { get; set; } = string.Empty;
+ public uint RowIndex { get; set; }
+ public string Text { get; set; } = string.Empty;
+ public string CellReference => $"{ColumnName}{RowIndex}";
+ public ExcelStyleInfoType StyleInfo { get; set; }
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
new file mode 100644
index 0000000..d0f81e9
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
@@ -0,0 +1,11 @@
+using FishFactoryContracts.ViewModels;
+
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public List CannedComponents { get; set; } = new();
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
new file mode 100644
index 0000000..f907356
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
@@ -0,0 +1,9 @@
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelMergeParameters
+ {
+ public string CellFromName { get; set; } = string.Empty;
+ public string CellToName { get; set; } = string.Empty;
+ public string Merge => $"{CellFromName}:{CellToName}";
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
new file mode 100644
index 0000000..1cbd12e
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
@@ -0,0 +1,13 @@
+using FishFactoryContracts.ViewModels;
+
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public DateTime DateFrom { get; set; }
+ public DateTime DateTo { get; set; }
+ public List Orders { get; set; } = new();
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
new file mode 100644
index 0000000..a2dd5b9
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
@@ -0,0 +1,11 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfParagraph
+ {
+ public string Text { get; set; } = string.Empty;
+ public string Style { get; set; } = string.Empty;
+ public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
new file mode 100644
index 0000000..945ea2c
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
@@ -0,0 +1,11 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfRowParameters
+ {
+ public List Texts { get; set; } = new();
+ public string Style { get; set; } = string.Empty;
+ public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
new file mode 100644
index 0000000..d555396
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -0,0 +1,11 @@
+using FishFactoryContracts.ViewModels;
+
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public List ListCanned { get; set; } = new();
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
new file mode 100644
index 0000000..e1270b2
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
@@ -0,0 +1,9 @@
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordParagraph
+ {
+ public List<(string, WordTextProperties)> Texts { get; set; } = new();
+
+ public WordTextProperties? TextProperties { get; set; }
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
new file mode 100644
index 0000000..8ede79f
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
@@ -0,0 +1,11 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+
+namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordTextProperties
+ {
+ public string Size { get; set; } = string.Empty;
+ public bool Bold { get; set; }
+ public WordJustificationType JustificationType { get; set; }
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
new file mode 100644
index 0000000..ce689dc
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -0,0 +1,292 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+using FishFactoryBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace FishFactoryBusinessLogic.OfficePackage.Implements
+{
+ public class SaveToExcel : AbstractSaveToExcel
+ {
+ private SpreadsheetDocument? _spreadsheetDocument;
+
+ private SharedStringTablePart? _shareStringPart;
+
+ private Worksheet? _worksheet;
+
+ ///
+ /// Настройка стилей для файла
+ ///
+ ///
+ private static void CreateStyles(WorkbookPart workbookpart)
+ {
+ var sp = workbookpart.AddNewPart();
+ sp.Stylesheet = new Stylesheet();
+
+ var fonts = new Fonts() { Count = 2U, KnownFonts = true };
+
+ var fontUsual = new Font();
+ fontUsual.Append(new FontSize() { Val = 12D });
+ fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+ fontUsual.Append(new FontName() { Val = "Times New Roman" });
+ fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
+ fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+ var fontTitle = new Font();
+ fontTitle.Append(new Bold());
+ fontTitle.Append(new FontSize() { Val = 14D });
+ fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+ fontTitle.Append(new FontName() { Val = "Times New Roman" });
+ fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
+ fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+ fonts.Append(fontUsual);
+ fonts.Append(fontTitle);
+
+ var fills = new Fills() { Count = 2U };
+
+ var fill1 = new Fill();
+ fill1.Append(new PatternFill() { PatternType = PatternValues.None });
+
+ var fill2 = new Fill();
+ fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
+
+ fills.Append(fill1);
+ fills.Append(fill2);
+
+ var borders = new Borders() { Count = 2U };
+
+ var borderNoBorder = new Border();
+ borderNoBorder.Append(new LeftBorder());
+ borderNoBorder.Append(new RightBorder());
+ borderNoBorder.Append(new TopBorder());
+ borderNoBorder.Append(new BottomBorder());
+ borderNoBorder.Append(new DiagonalBorder());
+
+ var borderThin = new Border();
+
+ var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
+ leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+ var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
+ rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+ var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
+ topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+ var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
+ bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+ borderThin.Append(leftBorder);
+ borderThin.Append(rightBorder);
+ borderThin.Append(topBorder);
+ borderThin.Append(bottomBorder);
+ borderThin.Append(new DiagonalBorder());
+
+ borders.Append(borderNoBorder);
+ borders.Append(borderThin);
+
+ var cellStyleFormats = new CellStyleFormats() { Count = 1U };
+ var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U };
+
+ cellStyleFormats.Append(cellFormatStyle);
+
+ var cellFormats = new CellFormats() { Count = 3U };
+ var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true };
+ var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true };
+ var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true };
+
+ cellFormats.Append(cellFormatFont);
+ cellFormats.Append(cellFormatFontAndBorder);
+ cellFormats.Append(cellFormatTitle);
+
+ var cellStyles = new CellStyles() { Count = 1U };
+
+ cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U });
+
+ var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
+
+ var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" };
+
+ var stylesheetExtensionList = new StylesheetExtensionList();
+
+ var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" };
+ stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+ stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" });
+
+ var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" };
+ stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
+ stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" });
+
+ stylesheetExtensionList.Append(stylesheetExtension1);
+ stylesheetExtensionList.Append(stylesheetExtension2);
+
+ sp.Stylesheet.Append(fonts);
+ sp.Stylesheet.Append(fills);
+ sp.Stylesheet.Append(borders);
+ sp.Stylesheet.Append(cellStyleFormats);
+ sp.Stylesheet.Append(cellFormats);
+ sp.Stylesheet.Append(cellStyles);
+ sp.Stylesheet.Append(differentialFormats);
+ sp.Stylesheet.Append(tableStyles);
+ sp.Stylesheet.Append(stylesheetExtensionList);
+ }
+
+ ///
+ /// Получение номера стиля из типа
+ ///
+ ///
+ ///
+ private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
+ {
+ return styleInfo switch
+ {
+ ExcelStyleInfoType.Title => 2U,
+ ExcelStyleInfoType.TextWithBroder => 1U,
+ ExcelStyleInfoType.Text => 0U,
+ _ => 0U,
+ };
+ }
+
+ protected override void CreateExcel(ExcelInfo info)
+ {
+ _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
+ // Создаем книгу (в ней хранятся листы)
+ var workbookpart = _spreadsheetDocument.AddWorkbookPart();
+ workbookpart.Workbook = new Workbook();
+
+ CreateStyles(workbookpart);
+
+ // Получаем/создаем хранилище текстов для книги
+ _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any()
+ ? _spreadsheetDocument.WorkbookPart.GetPartsOfType().First()
+ : _spreadsheetDocument.WorkbookPart.AddNewPart();
+
+ // Создаем SharedStringTable, если его нет
+ if (_shareStringPart.SharedStringTable == null)
+ {
+ _shareStringPart.SharedStringTable = new SharedStringTable();
+ }
+
+ // Создаем лист в книгу
+ var worksheetPart = workbookpart.AddNewPart();
+ worksheetPart.Worksheet = new Worksheet(new SheetData());
+
+ // Добавляем лист в книгу
+ var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+ var sheet = new Sheet()
+ {
+ Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+ SheetId = 1,
+ Name = "Лист"
+ };
+ sheets.Append(sheet);
+
+ _worksheet = worksheetPart.Worksheet;
+ }
+
+ protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
+ {
+ if (_worksheet == null || _shareStringPart == null)
+ {
+ return;
+ }
+ var sheetData = _worksheet.GetFirstChild();
+ if (sheetData == null)
+ {
+ return;
+ }
+
+ // Ищем строку, либо добавляем ее
+ Row row;
+ if (sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
+ {
+ row = sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).First();
+ }
+ else
+ {
+ row = new Row() { RowIndex = excelParams.RowIndex };
+ sheetData.Append(row);
+ }
+
+ // Ищем нужную ячейку
+ Cell cell;
+ if (row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
+ {
+ cell = row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
+ }
+ else
+ {
+ // Все ячейки должны быть последовательно друг за другом расположены
+ // нужно определить, после какой вставлять
+ Cell? refCell = null;
+ foreach (Cell rowCell in row.Elements())
+ {
+ if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
+ {
+ refCell = rowCell;
+ break;
+ }
+ }
+
+ var newCell = new Cell() { CellReference = excelParams.CellReference };
+ row.InsertBefore(newCell, refCell);
+
+ cell = newCell;
+ }
+
+ // вставляем новый текст
+ _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
+ _shareStringPart.SharedStringTable.Save();
+
+ cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements().Count() - 1).ToString());
+ cell.DataType = new EnumValue(CellValues.SharedString);
+ cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
+ }
+
+ protected override void MergeCells(ExcelMergeParameters excelParams)
+ {
+ if (_worksheet == null)
+ {
+ return;
+ }
+ MergeCells mergeCells;
+
+ if (_worksheet.Elements().Any())
+ {
+ mergeCells = _worksheet.Elements().First();
+ }
+ else
+ {
+ mergeCells = new MergeCells();
+
+ if (_worksheet.Elements().Any())
+ {
+ _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First());
+ }
+ else
+ {
+ _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First());
+ }
+ }
+
+ var mergeCell = new MergeCell()
+ {
+ Reference = new StringValue(excelParams.Merge)
+ };
+ mergeCells.Append(mergeCell);
+ }
+
+ protected override void SaveExcel(ExcelInfo info)
+ {
+ if (_spreadsheetDocument == null)
+ {
+ return;
+ }
+ _spreadsheetDocument.WorkbookPart!.Workbook.Save();
+ _spreadsheetDocument.Close();
+ }
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
new file mode 100644
index 0000000..bf11ca8
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -0,0 +1,114 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+using FishFactoryBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.Rendering;
+
+namespace FishFactoryBusinessLogic.OfficePackage.Implements
+{
+ public class SaveToPdf : AbstractSaveToPdf
+ {
+ private Document? _document;
+
+ private Section? _section;
+
+ private Table? _table;
+
+ private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
+ {
+ return type switch
+ {
+ PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
+ PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
+ PdfParagraphAlignmentType.Rigth => ParagraphAlignment.Right,
+ _ => ParagraphAlignment.Justify,
+ };
+ }
+
+ ///
+ /// Создание стилей для документа
+ ///
+ ///
+ private static void DefineStyles(Document document)
+ {
+ var style = document.Styles["Normal"];
+ style.Font.Name = "Times New Roman";
+ style.Font.Size = 14;
+
+ style = document.Styles.AddStyle("NormalTitle", "Normal");
+ style.Font.Bold = true;
+ }
+
+ protected override void CreatePdf(PdfInfo info)
+ {
+ _document = new Document();
+ DefineStyles(_document);
+
+ _section = _document.AddSection();
+ }
+
+ protected override void CreateParagraph(PdfParagraph pdfParagraph)
+ {
+ if (_section == null)
+ {
+ return;
+ }
+ var paragraph = _section.AddParagraph(pdfParagraph.Text);
+ paragraph.Format.SpaceAfter = "1cm";
+ paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
+ paragraph.Style = pdfParagraph.Style;
+ }
+
+ protected override void CreateTable(List columns)
+ {
+ if (_document == null)
+ {
+ return;
+ }
+ _table = _document.LastSection.AddTable();
+
+ foreach (var elem in columns)
+ {
+ _table.AddColumn(elem);
+ }
+ }
+
+ protected override void CreateRow(PdfRowParameters rowParameters)
+ {
+ if (_table == null)
+ {
+ return;
+ }
+ var row = _table.AddRow();
+ for (int i = 0; i < rowParameters.Texts.Count; ++i)
+ {
+ row.Cells[i].AddParagraph(rowParameters.Texts[i]);
+
+ if (!string.IsNullOrEmpty(rowParameters.Style))
+ {
+ row.Cells[i].Style = rowParameters.Style;
+ }
+
+ Unit borderWidth = 0.5;
+
+ row.Cells[i].Borders.Left.Width = borderWidth;
+ row.Cells[i].Borders.Right.Width = borderWidth;
+ row.Cells[i].Borders.Top.Width = borderWidth;
+ row.Cells[i].Borders.Bottom.Width = borderWidth;
+
+ row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
+ row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
+ }
+ }
+
+ protected override void SavePdf(PdfInfo info)
+ {
+ var renderer = new PdfDocumentRenderer(true)
+ {
+ Document = _document
+ };
+ renderer.RenderDocument();
+ renderer.PdfDocument.Save(info.FileName);
+ }
+ }
+}
diff --git a/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs
new file mode 100644
index 0000000..2825bb6
--- /dev/null
+++ b/FishFactory/FishFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -0,0 +1,135 @@
+using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
+using FishFactoryBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace FishFactoryBusinessLogic.OfficePackage.Implements
+{
+ public class SaveToWord : AbstractSaveToWord
+ {
+ private WordprocessingDocument? _wordDocument;
+
+ private Body? _docBody;
+
+ ///
+ /// Получение типа выравнивания
+ ///
+ ///
+ ///
+ private static JustificationValues GetJustificationValues(WordJustificationType type)
+ {
+ return type switch
+ {
+ WordJustificationType.Both => JustificationValues.Both,
+ WordJustificationType.Center => JustificationValues.Center,
+ _ => JustificationValues.Left,
+ };
+ }
+
+ ///
+ /// Настройки страницы
+ ///
+ ///
+ private static SectionProperties CreateSectionProperties()
+ {
+ var properties = new SectionProperties();
+
+ var pageSize = new PageSize
+ {
+ Orient = PageOrientationValues.Portrait
+ };
+
+ properties.AppendChild(pageSize);
+
+ return properties;
+ }
+
+ ///
+ /// Задание форматирования для абзаца
+ ///
+ ///
+ ///
+ private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
+ {
+ if (paragraphProperties == null)
+ {
+ return null;
+ }
+
+ var properties = new ParagraphProperties();
+
+ properties.AppendChild(new Justification()
+ {
+ Val = GetJustificationValues(paragraphProperties.JustificationType)
+ });
+
+ properties.AppendChild(new SpacingBetweenLines
+ {
+ LineRule = LineSpacingRuleValues.Auto
+ });
+
+ properties.AppendChild(new Indentation());
+
+ var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
+ if (!string.IsNullOrEmpty(paragraphProperties.Size))
+ {
+ paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
+ }
+ properties.AppendChild(paragraphMarkRunProperties);
+
+ return properties;
+ }
+
+ protected override void CreateWord(WordInfo info)
+ {
+ _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
+ MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
+ mainPart.Document = new Document();
+ _docBody = mainPart.Document.AppendChild(new Body());
+ }
+
+ protected override void CreateParagraph(WordParagraph paragraph)
+ {
+ if (_docBody == null || paragraph == null)
+ {
+ return;
+ }
+ var docParagraph = new Paragraph();
+
+ docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
+
+ foreach (var run in paragraph.Texts)
+ {
+ var docRun = new Run();
+
+ var properties = new RunProperties();
+ properties.AppendChild(new FontSize { Val = run.Item2.Size });
+ if (run.Item2.Bold)
+ {
+ properties.AppendChild(new Bold());
+ }
+ docRun.AppendChild(properties);
+
+ docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
+
+ docParagraph.AppendChild(docRun);
+ }
+
+ _docBody.AppendChild(docParagraph);
+ }
+
+ protected override void SaveWord(WordInfo info)
+ {
+ if (_docBody == null || _wordDocument == null)
+ {
+ return;
+ }
+ _docBody.AppendChild(CreateSectionProperties());
+
+ _wordDocument.MainDocumentPart!.Document.Save();
+
+ _wordDocument.Close();
+ }
+ }
+}
diff --git a/FishFactory/FishFactoryContracts/BindingModels/ReportBindingModel.cs b/FishFactory/FishFactoryContracts/BindingModels/ReportBindingModel.cs
new file mode 100644
index 0000000..3091d8a
--- /dev/null
+++ b/FishFactory/FishFactoryContracts/BindingModels/ReportBindingModel.cs
@@ -0,0 +1,9 @@
+namespace FishFactoryContracts.BindingModels
+{
+ public class ReportBindingModel
+ {
+ public string FileName { get; set; } = string.Empty;
+ public DateTime? DateFrom { get; set; }
+ public DateTime? DateTo { get; set; }
+ }
+}
diff --git a/FishFactory/FishFactoryContracts/BusinessLogicsContracts/IReportLogic.cs b/FishFactory/FishFactoryContracts/BusinessLogicsContracts/IReportLogic.cs
new file mode 100644
index 0000000..b62f1c0
--- /dev/null
+++ b/FishFactory/FishFactoryContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -0,0 +1,39 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+
+namespace FishFactoryContracts.BusinessLogicsContracts
+{
+ public interface IReportLogic
+ {
+ ///
+ /// Получение списка индгредиентов с указанием, в каких консервы используются
+ ///
+ ///
+ List GetCannedComponent();
+
+ ///
+ /// Получение списка заказов за определенный период
+ ///
+ ///
+ ///
+ List GetOrders(ReportBindingModel model);
+
+ ///
+ /// Сохранение индгредиентов в файл-Word
+ ///
+ ///
+ void SaveListCannedToWordFile(ReportBindingModel model);
+
+ ///
+ /// Сохранение индгредиентов с указаеним консерв в файл-Excel
+ ///
+ ///
+ void SaveCannedComponentToExcelFile(ReportBindingModel model);
+
+ ///
+ /// Сохранение заказов в файл-Pdf
+ ///
+ ///
+ void SaveOrdersToPdfFile(ReportBindingModel model);
+ }
+}
diff --git a/FishFactory/FishFactoryContracts/SearchModels/OrderSearchModel.cs b/FishFactory/FishFactoryContracts/SearchModels/OrderSearchModel.cs
index 4d57da6..9dd966b 100644
--- a/FishFactory/FishFactoryContracts/SearchModels/OrderSearchModel.cs
+++ b/FishFactory/FishFactoryContracts/SearchModels/OrderSearchModel.cs
@@ -3,5 +3,7 @@
public class OrderSearchModel
{
public int? Id { get; set; }
+ public DateTime? DateFrom { get; set; }
+ public DateTime? DateTo { get; set; }
}
}
diff --git a/FishFactory/FishFactoryContracts/ViewModels/ReportCannedComponentViewModel.cs b/FishFactory/FishFactoryContracts/ViewModels/ReportCannedComponentViewModel.cs
new file mode 100644
index 0000000..3d83aa3
--- /dev/null
+++ b/FishFactory/FishFactoryContracts/ViewModels/ReportCannedComponentViewModel.cs
@@ -0,0 +1,9 @@
+namespace FishFactoryContracts.ViewModels
+{
+ public class ReportCannedComponentViewModel
+ {
+ public string CannedName { get; set; } = string.Empty;
+ public int TotalCount { get; set; }
+ public List> Components { get; set; } = new();
+ }
+}
diff --git a/FishFactory/FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs b/FishFactory/FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs
new file mode 100644
index 0000000..c3aa980
--- /dev/null
+++ b/FishFactory/FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs
@@ -0,0 +1,11 @@
+namespace FishFactoryContracts.ViewModels
+{
+ public class ReportOrdersViewModel
+ {
+ public int Id { get; set; }
+ public DateTime DateCreate { get; set; }
+ public string CannedName { get; set; } = string.Empty;
+ public string OrderStatus { get; set; } = string.Empty;
+ public double Sum { get; set; }
+ }
+}
diff --git a/FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs b/FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs
index 08ab4ca..ae83a2f 100644
--- a/FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs
+++ b/FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs
@@ -39,11 +39,19 @@ namespace FishFactoryDatabaseImplement.Implements
public List GetFilteredList(OrderSearchModel model)
{
- if (!model.Id.HasValue)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue)
{
return new();
}
using var context = new FishFactoryDatabase();
+ if (model.DateFrom.HasValue)
+ {
+ return context.Orders
+ .Include(x => x.Canned)
+ .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
return context.Orders
.Include(x => x.Canned)
.Where(x => x.Id == model.Id)
diff --git a/FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.csproj b/FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.csproj
index b2c107f..39f5797 100644
--- a/FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.csproj
+++ b/FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.csproj
@@ -6,6 +6,10 @@
enable
+
+
+
+
diff --git a/FishFactory/FishFactoryFileImplement/Implements/OrderStorage.cs b/FishFactory/FishFactoryFileImplement/Implements/OrderStorage.cs
index 799c101..606e58a 100644
--- a/FishFactory/FishFactoryFileImplement/Implements/OrderStorage.cs
+++ b/FishFactory/FishFactoryFileImplement/Implements/OrderStorage.cs
@@ -21,10 +21,17 @@ namespace FishFactoryFileImplement.Implements
public List GetFilteredList(OrderSearchModel model)
{
- if (!model.Id.HasValue)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue)
{
return new();
}
+ if (model.DateFrom.HasValue)
+ {
+ return source.Orders
+ .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+ .Select(x => GetViewModel(x))
+ .ToList();
+ }
return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList();
}
diff --git a/FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj b/FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj
index b2c107f..39f5797 100644
--- a/FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj
+++ b/FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj
@@ -6,6 +6,10 @@
enable
+
+
+
+
diff --git a/FishFactory/FishFactoryListImplement/Implements/ComponentStorage.cs b/FishFactory/FishFactoryListImplement/Implements/ComponentStorage.cs
index 54318f6..f016132 100644
--- a/FishFactory/FishFactoryListImplement/Implements/ComponentStorage.cs
+++ b/FishFactory/FishFactoryListImplement/Implements/ComponentStorage.cs
@@ -69,13 +69,13 @@ namespace FishFactoryListImplement.Implements
model.Id = component.Id + 1;
}
}
- var newIngredient = Component.Create(model);
- if (newIngredient == null)
+ var newComponent = Component.Create(model);
+ if (newComponent == null)
{
return null;
}
- _source.Components.Add(newIngredient);
- return newIngredient.GetViewModel;
+ _source.Components.Add(newComponent);
+ return newComponent.GetViewModel;
}
public ComponentViewModel? Update(ComponentBindingModel model)
diff --git a/FishFactory/FishFactoryListImplement/Implements/OrderStorage.cs b/FishFactory/FishFactoryListImplement/Implements/OrderStorage.cs
index f122fdc..eb8a628 100644
--- a/FishFactory/FishFactoryListImplement/Implements/OrderStorage.cs
+++ b/FishFactory/FishFactoryListImplement/Implements/OrderStorage.cs
@@ -26,15 +26,25 @@ namespace FishFactoryListImplement.Implements
public List GetFilteredList(OrderSearchModel model)
{
var result = new List();
- if (!model.Id.HasValue)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue)
{
return result;
}
+ if (model.DateFrom.HasValue)
+ {
+ foreach (var order in _source.Orders)
+ {
+ if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
+ {
+ result.Add(GetViewModel(order));
+ }
+ }
+ }
foreach (var order in _source.Orders)
{
if (order.Id == model.Id)
{
- result.Add(order.GetViewModel);
+ result.Add(GetViewModel(order));
}
}
return result;
@@ -56,6 +66,20 @@ namespace FishFactoryListImplement.Implements
return null;
}
+ private OrderViewModel GetViewModel(Order order)
+ {
+ var viewModel = order.GetViewModel;
+ foreach (var canned in _source.ListCanned)
+ {
+ if (canned.Id == order.CannedId)
+ {
+ viewModel.CannedName = canned.CannedName;
+ break;
+ }
+ }
+ return viewModel;
+ }
+
public OrderViewModel? Insert(OrderBindingModel model)
{
model.Id = 1;
diff --git a/FishFactory/FishFactoryView/FishFactoryView.csproj b/FishFactory/FishFactoryView/FishFactoryView.csproj
index 474d6e3..1c2d55e 100644
--- a/FishFactory/FishFactoryView/FishFactoryView.csproj
+++ b/FishFactory/FishFactoryView/FishFactoryView.csproj
@@ -17,6 +17,7 @@
+
@@ -27,4 +28,10 @@
+
+
+ Always
+
+
+
\ No newline at end of file
diff --git a/FishFactory/FishFactoryView/FormMain.Designer.cs b/FishFactory/FishFactoryView/FormMain.Designer.cs
index e9783f1..5f06f87 100644
--- a/FishFactory/FishFactoryView/FormMain.Designer.cs
+++ b/FishFactory/FishFactoryView/FormMain.Designer.cs
@@ -32,6 +32,10 @@
this.reference_booksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ComponentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cannedToolStripMenuItem = 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.buttonUpdate = new System.Windows.Forms.Button();
this.buttonSetToFinish = new System.Windows.Forms.Button();
this.buttonSetToDone = new System.Windows.Forms.Button();
@@ -45,7 +49,8 @@
// menuStrip
//
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.reference_booksToolStripMenuItem});
+ this.reference_booksToolStripMenuItem,
+ this.отчетыToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
this.menuStrip.Size = new System.Drawing.Size(975, 24);
@@ -61,7 +66,7 @@
this.reference_booksToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
this.reference_booksToolStripMenuItem.Text = "Справочники";
//
- // ComponentsингредиентыToolStripMenuItem
+ // ComponentsToolStripMenuItem
//
this.ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem";
this.ComponentsToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
@@ -75,6 +80,37 @@
this.cannedToolStripMenuItem.Text = "Консервы";
this.cannedToolStripMenuItem.Click += new System.EventHandler(this.CannedToolStripMenuItem_Click);
//
+ // отчетыToolStripMenuItem
+ //
+ this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.списокИнгредиентовToolStripMenuItem,
+ this.ингредиентыПоКонсервамToolStripMenuItem,
+ this.списокЗаказовToolStripMenuItem});
+ this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+ this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
+ this.отчетыToolStripMenuItem.Text = "Отчеты";
+ //
+ // списокИнгредиентовToolStripMenuItem
+ //
+ this.списокИнгредиентовToolStripMenuItem.Name = "списокИнгредиентовToolStripMenuItem";
+ this.списокИнгредиентовToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.списокИнгредиентовToolStripMenuItem.Text = "Список консерв";
+ this.списокИнгредиентовToolStripMenuItem.Click += new System.EventHandler(this.CannedListToolStripMenuItem_Click);
+ //
+ // ингредиентыПоКонсервамToolStripMenuItem
+ //
+ this.ингредиентыПоКонсервамToolStripMenuItem.Name = "ингредиентыПоКонсервамToolStripMenuItem";
+ this.ингредиентыПоКонсервамToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.ингредиентыПоКонсервамToolStripMenuItem.Text = "Консервы с ингредиентами";
+ this.ингредиентыПоКонсервамToolStripMenuItem.Click += new System.EventHandler(this.CannedComponentToolStripMenuItem_Click);
+ //
+ // списокЗаказовToolStripMenuItem
+ //
+ this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
+ this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
+ this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
+ this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
+ //
// buttonUpdate
//
this.buttonUpdate.Location = new System.Drawing.Point(780, 314);
@@ -178,5 +214,9 @@
private Button buttonSetToWork;
private Button buttonCreateOrder;
private DataGridView dataGridView;
+ private ToolStripMenuItem отчетыToolStripMenuItem;
+ private ToolStripMenuItem списокИнгредиентовToolStripMenuItem;
+ private ToolStripMenuItem ингредиентыПоКонсервамToolStripMenuItem;
+ private ToolStripMenuItem списокЗаказовToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/FishFactory/FishFactoryView/FormMain.cs b/FishFactory/FishFactoryView/FormMain.cs
index 04867dc..cf7f729 100644
--- a/FishFactory/FishFactoryView/FormMain.cs
+++ b/FishFactory/FishFactoryView/FormMain.cs
@@ -2,7 +2,7 @@
using FishFactoryContracts.BindingModels;
using FishFactoryContracts.BusinessLogicsContracts;
using FishFactoryDataModels.Enums;
-using System.Windows.Forms;
+using FishFactoryBusinessLogic.BusinessLogics;
namespace FishFactoryView
{
@@ -10,11 +10,13 @@ namespace FishFactoryView
{
private readonly ILogger _logger;
private readonly IOrderLogic _orderLogic;
- public FormMain(ILogger logger, IOrderLogic orderLogic)
+ private readonly IReportLogic _reportLogic;
+ public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic)
{
InitializeComponent();
_logger = logger;
_orderLogic = orderLogic;
+ _reportLogic = reportLogic;
}
private void FormMain_Load(object sender, EventArgs e)
{
@@ -162,5 +164,33 @@ namespace FishFactoryView
{
LoadData();
}
+
+ private void CannedListToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ _reportLogic.SaveListCannedToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ }
+
+ private void CannedComponentToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportCannedComponents));
+ if (service is FormReportCannedComponents form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+ if (service is FormReportOrders form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
diff --git a/FishFactory/FishFactoryView/FormReportCannedComponents.Designer.cs b/FishFactory/FishFactoryView/FormReportCannedComponents.Designer.cs
new file mode 100644
index 0000000..30b8389
--- /dev/null
+++ b/FishFactory/FishFactoryView/FormReportCannedComponents.Designer.cs
@@ -0,0 +1,117 @@
+namespace FishFactoryView
+{
+ partial class FormReportCannedComponents
+ {
+ ///
+ /// 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()
+ {
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.buttonSaveToExcel = new System.Windows.Forms.Button();
+ this.ColumnCanned = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // dataGridView
+ //
+ this.dataGridView.AllowUserToAddRows = false;
+ this.dataGridView.AllowUserToDeleteRows = false;
+ this.dataGridView.AllowUserToOrderColumns = true;
+ this.dataGridView.AllowUserToResizeColumns = false;
+ this.dataGridView.AllowUserToResizeRows = false;
+ this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.ColumnCanned,
+ this.ColumnComponent,
+ this.ColumnCount});
+ this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.dataGridView.Location = new System.Drawing.Point(0, 47);
+ this.dataGridView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.dataGridView.MultiSelect = false;
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.ReadOnly = true;
+ this.dataGridView.RowHeadersVisible = false;
+ this.dataGridView.Size = new System.Drawing.Size(616, 510);
+ this.dataGridView.TabIndex = 0;
+ //
+ // buttonSaveToExcel
+ //
+ this.buttonSaveToExcel.Location = new System.Drawing.Point(14, 14);
+ this.buttonSaveToExcel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+ this.buttonSaveToExcel.Size = new System.Drawing.Size(186, 27);
+ this.buttonSaveToExcel.TabIndex = 1;
+ this.buttonSaveToExcel.Text = "Сохранить в Excel";
+ this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+ this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
+ //
+ // ColumnCaned
+ //
+ this.ColumnCanned.HeaderText = "Консерва";
+ this.ColumnCanned.Name = "ColumnCanned";
+ this.ColumnCanned.ReadOnly = true;
+ this.ColumnCanned.Width = 200;
+ //
+ // ColumnComponent
+ //
+ this.ColumnComponent.HeaderText = "Ингредиент";
+ this.ColumnComponent.Name = "ColumnComponent";
+ this.ColumnComponent.ReadOnly = true;
+ this.ColumnComponent.Width = 200;
+ //
+ // ColumnCount
+ //
+ this.ColumnCount.HeaderText = "Количество";
+ this.ColumnCount.Name = "ColumnCount";
+ this.ColumnCount.ReadOnly = true;
+ //
+ // FormReportCannedComponents
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(616, 557);
+ this.Controls.Add(this.buttonSaveToExcel);
+ this.Controls.Add(this.dataGridView);
+ this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.Name = "FormReportCannedComponents";
+ this.Text = "Ингредиенты по консервам";
+ this.Load += new System.EventHandler(this.FormReportCannedComponents_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.DataGridView dataGridView;
+ private System.Windows.Forms.Button buttonSaveToExcel;
+ private DataGridViewTextBoxColumn ColumnCanned;
+ private DataGridViewTextBoxColumn ColumnComponent;
+ private DataGridViewTextBoxColumn ColumnCount;
+ }
+}
\ No newline at end of file
diff --git a/FishFactory/FishFactoryView/FormReportCannedComponents.cs b/FishFactory/FishFactoryView/FormReportCannedComponents.cs
new file mode 100644
index 0000000..db6954a
--- /dev/null
+++ b/FishFactory/FishFactoryView/FormReportCannedComponents.cs
@@ -0,0 +1,71 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System.Windows.Forms;
+
+namespace FishFactoryView
+{
+ public partial class FormReportCannedComponents : Form
+ {
+ private readonly ILogger _logger;
+
+ private readonly IReportLogic _logic;
+
+ public FormReportCannedComponents(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormReportCannedComponents_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetCannedComponent();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.CannedName, "", "" });
+ foreach (var listElem in elem.Components)
+ {
+ dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+ }
+ dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
+ dataGridView.Rows.Add(Array.Empty | | |