промежуточный
This commit is contained in:
parent
5b6aa053b6
commit
8d1763bee7
@ -26,4 +26,18 @@ public class Equipage
|
|||||||
EquipageDate = DateTime.Now
|
EquipageDate = DateTime.Now
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Equipage CreateOperation(TempRoutesEquipage tempRoutesEquipage,
|
||||||
|
IEnumerable<RoutesEqipage> routesEqipage)
|
||||||
|
{
|
||||||
|
return new Equipage
|
||||||
|
{
|
||||||
|
Id = tempRoutesEquipage.Id,
|
||||||
|
CarId = tempRoutesEquipage.CarId,
|
||||||
|
DriverId = tempRoutesEquipage.DriverId,
|
||||||
|
ShiftId = tempRoutesEquipage.ShiftId,
|
||||||
|
RoutesEqipage = routesEqipage,
|
||||||
|
EquipageDate = tempRoutesEquipage.EquipageDate
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ public class RoutesEqipage
|
|||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
public int Id { get; private set; }
|
||||||
|
|
||||||
public int RouteID { get; private set; }
|
public int RouteId { get; private set; }
|
||||||
|
|
||||||
public int Count { get; private set; }
|
public int Count { get; private set; }
|
||||||
|
|
||||||
@ -13,7 +13,7 @@ public class RoutesEqipage
|
|||||||
return new RoutesEqipage
|
return new RoutesEqipage
|
||||||
{
|
{
|
||||||
Id = id,
|
Id = id,
|
||||||
RouteID = routeId,
|
RouteId = routeId,
|
||||||
Count = count
|
Count = count
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
18
FuelAccounting/FuelAccounting/Entities/TempRoutesEquipage.cs
Normal file
18
FuelAccounting/FuelAccounting/Entities/TempRoutesEquipage.cs
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
namespace FuelAccounting.Entities;
|
||||||
|
|
||||||
|
public class TempRoutesEquipage
|
||||||
|
{
|
||||||
|
public int Id { get; private set; }
|
||||||
|
|
||||||
|
public int CarId { get; private set; }
|
||||||
|
|
||||||
|
public int DriverId { get; private set; }
|
||||||
|
|
||||||
|
public int ShiftId { get; private set; }
|
||||||
|
|
||||||
|
public int RouteId { get; private set; }
|
||||||
|
|
||||||
|
public int Count { get; private set; }
|
||||||
|
|
||||||
|
public DateTime EquipageDate { get; private set; }
|
||||||
|
}
|
@ -38,6 +38,8 @@
|
|||||||
выездToolStripMenuItem = new ToolStripMenuItem();
|
выездToolStripMenuItem = new ToolStripMenuItem();
|
||||||
заправкаToolStripMenuItem = new ToolStripMenuItem();
|
заправкаToolStripMenuItem = new ToolStripMenuItem();
|
||||||
отчетыToolStripMenuItem = new ToolStripMenuItem();
|
отчетыToolStripMenuItem = new ToolStripMenuItem();
|
||||||
|
directoryReportToolStripMenuItem = new ToolStripMenuItem();
|
||||||
|
CarSummaryToolStripMenuItem = new ToolStripMenuItem();
|
||||||
menuStrip.SuspendLayout();
|
menuStrip.SuspendLayout();
|
||||||
SuspendLayout();
|
SuspendLayout();
|
||||||
//
|
//
|
||||||
@ -60,28 +62,28 @@
|
|||||||
// автомобилиToolStripMenuItem
|
// автомобилиToolStripMenuItem
|
||||||
//
|
//
|
||||||
автомобилиToolStripMenuItem.Name = "автомобилиToolStripMenuItem";
|
автомобилиToolStripMenuItem.Name = "автомобилиToolStripMenuItem";
|
||||||
автомобилиToolStripMenuItem.Size = new Size(180, 22);
|
автомобилиToolStripMenuItem.Size = new Size(144, 22);
|
||||||
автомобилиToolStripMenuItem.Text = "Автомобили";
|
автомобилиToolStripMenuItem.Text = "Автомобили";
|
||||||
автомобилиToolStripMenuItem.Click += CarsToolStripMenuItem_Click;
|
автомобилиToolStripMenuItem.Click += CarsToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// водителиToolStripMenuItem
|
// водителиToolStripMenuItem
|
||||||
//
|
//
|
||||||
водителиToolStripMenuItem.Name = "водителиToolStripMenuItem";
|
водителиToolStripMenuItem.Name = "водителиToolStripMenuItem";
|
||||||
водителиToolStripMenuItem.Size = new Size(180, 22);
|
водителиToolStripMenuItem.Size = new Size(144, 22);
|
||||||
водителиToolStripMenuItem.Text = "Водители";
|
водителиToolStripMenuItem.Text = "Водители";
|
||||||
водителиToolStripMenuItem.Click += DriversToolStripMenuItem_Click;
|
водителиToolStripMenuItem.Click += DriversToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// сменыToolStripMenuItem
|
// сменыToolStripMenuItem
|
||||||
//
|
//
|
||||||
сменыToolStripMenuItem.Name = "сменыToolStripMenuItem";
|
сменыToolStripMenuItem.Name = "сменыToolStripMenuItem";
|
||||||
сменыToolStripMenuItem.Size = new Size(180, 22);
|
сменыToolStripMenuItem.Size = new Size(144, 22);
|
||||||
сменыToolStripMenuItem.Text = "Смены";
|
сменыToolStripMenuItem.Text = "Смены";
|
||||||
сменыToolStripMenuItem.Click += ShiftsToolStripMenuItem_Click;
|
сменыToolStripMenuItem.Click += ShiftsToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// маршрутыToolStripMenuItem
|
// маршрутыToolStripMenuItem
|
||||||
//
|
//
|
||||||
маршрутыToolStripMenuItem.Name = "маршрутыToolStripMenuItem";
|
маршрутыToolStripMenuItem.Name = "маршрутыToolStripMenuItem";
|
||||||
маршрутыToolStripMenuItem.Size = new Size(180, 22);
|
маршрутыToolStripMenuItem.Size = new Size(144, 22);
|
||||||
маршрутыToolStripMenuItem.Text = "Маршруты";
|
маршрутыToolStripMenuItem.Text = "Маршруты";
|
||||||
маршрутыToolStripMenuItem.Click += RoutesToolStripMenuItem_Click;
|
маршрутыToolStripMenuItem.Click += RoutesToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
@ -95,23 +97,40 @@
|
|||||||
// выездToolStripMenuItem
|
// выездToolStripMenuItem
|
||||||
//
|
//
|
||||||
выездToolStripMenuItem.Name = "выездToolStripMenuItem";
|
выездToolStripMenuItem.Name = "выездToolStripMenuItem";
|
||||||
выездToolStripMenuItem.Size = new Size(180, 22);
|
выездToolStripMenuItem.Size = new Size(125, 22);
|
||||||
выездToolStripMenuItem.Text = "Выезд";
|
выездToolStripMenuItem.Text = "Выезд";
|
||||||
выездToolStripMenuItem.Click += EquipageToolStripMenuItem_Click;
|
выездToolStripMenuItem.Click += EquipageToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// заправкаToolStripMenuItem
|
// заправкаToolStripMenuItem
|
||||||
//
|
//
|
||||||
заправкаToolStripMenuItem.Name = "заправкаToolStripMenuItem";
|
заправкаToolStripMenuItem.Name = "заправкаToolStripMenuItem";
|
||||||
заправкаToolStripMenuItem.Size = new Size(180, 22);
|
заправкаToolStripMenuItem.Size = new Size(125, 22);
|
||||||
заправкаToolStripMenuItem.Text = "Заправка";
|
заправкаToolStripMenuItem.Text = "Заправка";
|
||||||
заправкаToolStripMenuItem.Click += RefuelingToolStripMenuItem_Click;
|
заправкаToolStripMenuItem.Click += RefuelingToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// отчетыToolStripMenuItem
|
// отчетыToolStripMenuItem
|
||||||
//
|
//
|
||||||
|
отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { directoryReportToolStripMenuItem, CarSummaryToolStripMenuItem });
|
||||||
отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
|
отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
|
||||||
отчетыToolStripMenuItem.Size = new Size(60, 20);
|
отчетыToolStripMenuItem.Size = new Size(60, 20);
|
||||||
отчетыToolStripMenuItem.Text = "Отчеты";
|
отчетыToolStripMenuItem.Text = "Отчеты";
|
||||||
//
|
//
|
||||||
|
// directoryReportToolStripMenuItem
|
||||||
|
//
|
||||||
|
directoryReportToolStripMenuItem.Name = "directoryReportToolStripMenuItem";
|
||||||
|
directoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W;
|
||||||
|
directoryReportToolStripMenuItem.Size = new Size(280, 22);
|
||||||
|
directoryReportToolStripMenuItem.Text = "Документ со справочниками";
|
||||||
|
directoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// CarSummaryToolStripMenuItem
|
||||||
|
//
|
||||||
|
CarSummaryToolStripMenuItem.Name = "CarSummaryToolStripMenuItem";
|
||||||
|
CarSummaryToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E;
|
||||||
|
CarSummaryToolStripMenuItem.Size = new Size(280, 22);
|
||||||
|
CarSummaryToolStripMenuItem.Text = "Сводка по автомобилям";
|
||||||
|
CarSummaryToolStripMenuItem.Click += CarSummaryToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
// FormFuelAccounting
|
// FormFuelAccounting
|
||||||
//
|
//
|
||||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||||
@ -142,5 +161,7 @@
|
|||||||
private ToolStripMenuItem выездToolStripMenuItem;
|
private ToolStripMenuItem выездToolStripMenuItem;
|
||||||
private ToolStripMenuItem заправкаToolStripMenuItem;
|
private ToolStripMenuItem заправкаToolStripMenuItem;
|
||||||
private ToolStripMenuItem отчетыToolStripMenuItem;
|
private ToolStripMenuItem отчетыToolStripMenuItem;
|
||||||
|
private ToolStripMenuItem directoryReportToolStripMenuItem;
|
||||||
|
private ToolStripMenuItem CarSummaryToolStripMenuItem;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -106,5 +106,31 @@ namespace FuelAccounting
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void DirectoryReportToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_container.Resolve<FormDirectoryReport>().ShowDialog();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(ex.Message, "Ошибка при загрузке",
|
||||||
|
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CarSummaryToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_container.Resolve<FormCarReport>().ShowDialog();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(ex.Message, "Ошибка при загрузке",
|
||||||
|
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
164
FuelAccounting/FuelAccounting/Forms/FormCarReport.Designer.cs
generated
Normal file
164
FuelAccounting/FuelAccounting/Forms/FormCarReport.Designer.cs
generated
Normal file
@ -0,0 +1,164 @@
|
|||||||
|
namespace FuelAccounting.Forms
|
||||||
|
{
|
||||||
|
partial class FormCarReport
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
dateTimePickerBegin = new DateTimePicker();
|
||||||
|
textBoxFilePath = new TextBox();
|
||||||
|
label1 = new Label();
|
||||||
|
buttonFilePath = new Button();
|
||||||
|
label2 = new Label();
|
||||||
|
comboBoxCar = new ComboBox();
|
||||||
|
label3 = new Label();
|
||||||
|
label4 = new Label();
|
||||||
|
dateTimePickerEnd = new DateTimePicker();
|
||||||
|
buttonBuild = new Button();
|
||||||
|
SuspendLayout();
|
||||||
|
//
|
||||||
|
// dateTimePickerBegin
|
||||||
|
//
|
||||||
|
dateTimePickerBegin.Location = new Point(129, 119);
|
||||||
|
dateTimePickerBegin.Name = "dateTimePickerBegin";
|
||||||
|
dateTimePickerBegin.Size = new Size(207, 23);
|
||||||
|
dateTimePickerBegin.TabIndex = 0;
|
||||||
|
//
|
||||||
|
// textBoxFilePath
|
||||||
|
//
|
||||||
|
textBoxFilePath.Location = new Point(129, 26);
|
||||||
|
textBoxFilePath.Name = "textBoxFilePath";
|
||||||
|
textBoxFilePath.ReadOnly = true;
|
||||||
|
textBoxFilePath.Size = new Size(175, 23);
|
||||||
|
textBoxFilePath.TabIndex = 1;
|
||||||
|
//
|
||||||
|
// label1
|
||||||
|
//
|
||||||
|
label1.AutoSize = true;
|
||||||
|
label1.Location = new Point(21, 29);
|
||||||
|
label1.Name = "label1";
|
||||||
|
label1.Size = new Size(90, 15);
|
||||||
|
label1.TabIndex = 2;
|
||||||
|
label1.Text = "Путь до файла:";
|
||||||
|
//
|
||||||
|
// buttonFilePath
|
||||||
|
//
|
||||||
|
buttonFilePath.Location = new Point(310, 26);
|
||||||
|
buttonFilePath.Name = "buttonFilePath";
|
||||||
|
buttonFilePath.Size = new Size(26, 23);
|
||||||
|
buttonFilePath.TabIndex = 3;
|
||||||
|
buttonFilePath.Text = "...";
|
||||||
|
buttonFilePath.UseVisualStyleBackColor = true;
|
||||||
|
buttonFilePath.Click += ButtonFilePath_Click;
|
||||||
|
//
|
||||||
|
// label2
|
||||||
|
//
|
||||||
|
label2.AutoSize = true;
|
||||||
|
label2.Location = new Point(21, 75);
|
||||||
|
label2.Name = "label2";
|
||||||
|
label2.Size = new Size(79, 15);
|
||||||
|
label2.TabIndex = 4;
|
||||||
|
label2.Text = "Автомобиль:";
|
||||||
|
//
|
||||||
|
// comboBoxCar
|
||||||
|
//
|
||||||
|
comboBoxCar.FormattingEnabled = true;
|
||||||
|
comboBoxCar.Location = new Point(129, 72);
|
||||||
|
comboBoxCar.Name = "comboBoxCar";
|
||||||
|
comboBoxCar.Size = new Size(175, 23);
|
||||||
|
comboBoxCar.TabIndex = 5;
|
||||||
|
//
|
||||||
|
// label3
|
||||||
|
//
|
||||||
|
label3.AutoSize = true;
|
||||||
|
label3.Location = new Point(21, 125);
|
||||||
|
label3.Name = "label3";
|
||||||
|
label3.Size = new Size(77, 15);
|
||||||
|
label3.TabIndex = 6;
|
||||||
|
label3.Text = "Дата начала:";
|
||||||
|
//
|
||||||
|
// label4
|
||||||
|
//
|
||||||
|
label4.AutoSize = true;
|
||||||
|
label4.Location = new Point(21, 169);
|
||||||
|
label4.Name = "label4";
|
||||||
|
label4.Size = new Size(71, 15);
|
||||||
|
label4.TabIndex = 7;
|
||||||
|
label4.Text = "Дата конца:";
|
||||||
|
//
|
||||||
|
// dateTimePickerEnd
|
||||||
|
//
|
||||||
|
dateTimePickerEnd.Location = new Point(129, 169);
|
||||||
|
dateTimePickerEnd.Name = "dateTimePickerEnd";
|
||||||
|
dateTimePickerEnd.Size = new Size(207, 23);
|
||||||
|
dateTimePickerEnd.TabIndex = 8;
|
||||||
|
//
|
||||||
|
// buttonBuild
|
||||||
|
//
|
||||||
|
buttonBuild.Location = new Point(21, 208);
|
||||||
|
buttonBuild.Name = "buttonBuild";
|
||||||
|
buttonBuild.Size = new Size(315, 32);
|
||||||
|
buttonBuild.TabIndex = 9;
|
||||||
|
buttonBuild.Text = "Сформировать";
|
||||||
|
buttonBuild.UseVisualStyleBackColor = true;
|
||||||
|
buttonBuild.Click += ButtonBuild_Click;
|
||||||
|
//
|
||||||
|
// FormCarReport
|
||||||
|
//
|
||||||
|
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||||
|
AutoScaleMode = AutoScaleMode.Font;
|
||||||
|
ClientSize = new Size(358, 252);
|
||||||
|
Controls.Add(buttonBuild);
|
||||||
|
Controls.Add(dateTimePickerEnd);
|
||||||
|
Controls.Add(label4);
|
||||||
|
Controls.Add(label3);
|
||||||
|
Controls.Add(comboBoxCar);
|
||||||
|
Controls.Add(label2);
|
||||||
|
Controls.Add(buttonFilePath);
|
||||||
|
Controls.Add(label1);
|
||||||
|
Controls.Add(textBoxFilePath);
|
||||||
|
Controls.Add(dateTimePickerBegin);
|
||||||
|
Name = "FormCarReport";
|
||||||
|
StartPosition = FormStartPosition.CenterScreen;
|
||||||
|
Text = "Отчет до пройденным километрам";
|
||||||
|
ResumeLayout(false);
|
||||||
|
PerformLayout();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private DateTimePicker dateTimePickerBegin;
|
||||||
|
private TextBox textBoxFilePath;
|
||||||
|
private Label label1;
|
||||||
|
private Button buttonFilePath;
|
||||||
|
private Label label2;
|
||||||
|
private ComboBox comboBoxCar;
|
||||||
|
private Label label3;
|
||||||
|
private Label label4;
|
||||||
|
private DateTimePicker dateTimePickerEnd;
|
||||||
|
private Button buttonBuild;
|
||||||
|
}
|
||||||
|
}
|
82
FuelAccounting/FuelAccounting/Forms/FormCarReport.cs
Normal file
82
FuelAccounting/FuelAccounting/Forms/FormCarReport.cs
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
using FuelAccounting.Reports;
|
||||||
|
using FuelAccounting.Repositories;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using Unity;
|
||||||
|
|
||||||
|
namespace FuelAccounting.Forms
|
||||||
|
{
|
||||||
|
public partial class FormCarReport : Form
|
||||||
|
{
|
||||||
|
private readonly IUnityContainer _container;
|
||||||
|
|
||||||
|
public FormCarReport(IUnityContainer container, ICarsRepository carsRepository)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
_container = container ?? throw new ArgumentNullException(nameof(container));
|
||||||
|
|
||||||
|
comboBoxCar.DataSource = carsRepository.ReadCars();
|
||||||
|
comboBoxCar.DisplayMember = "Model";
|
||||||
|
comboBoxCar.ValueMember = "Id";
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ButtonFilePath_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
var sfd = new SaveFileDialog()
|
||||||
|
{
|
||||||
|
Filter = "Excel Files | *.xlsx"
|
||||||
|
};
|
||||||
|
|
||||||
|
if (sfd.ShowDialog() != DialogResult.OK)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
textBoxFilePath.Text = sfd.FileName;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ButtonBuild_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(textBoxFilePath.Text))
|
||||||
|
{
|
||||||
|
throw new Exception("Отсутствует имя файла или отчета");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (comboBoxCar.SelectedIndex < 0)
|
||||||
|
{
|
||||||
|
throw new Exception("Не выбран автомобиль");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dateTimePickerBegin.Value >= dateTimePickerEnd.Value)
|
||||||
|
{
|
||||||
|
throw new Exception("Дата начала должна быть раньше даты окончания");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_container.Resolve<TableReport>().CreateTable(textBoxFilePath.Text,
|
||||||
|
(int)comboBoxCar.SelectedValue!, dateTimePickerBegin.Value, dateTimePickerEnd.Value))
|
||||||
|
{
|
||||||
|
MessageBox.Show("Документ сформирован", "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MessageBox.Show("Возникли ошибки при формировании документа (подробноти в логах)",
|
||||||
|
"Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(ex.Message, "Ошибка при создании отчета", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
120
FuelAccounting/FuelAccounting/Forms/FormCarReport.resx
Normal file
120
FuelAccounting/FuelAccounting/Forms/FormCarReport.resx
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
</root>
|
113
FuelAccounting/FuelAccounting/Forms/FormDirectoryReport.Designer.cs
generated
Normal file
113
FuelAccounting/FuelAccounting/Forms/FormDirectoryReport.Designer.cs
generated
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
namespace FuelAccounting.Forms
|
||||||
|
{
|
||||||
|
partial class FormDirectoryReport
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
checkBoxCars = new CheckBox();
|
||||||
|
checkBoxDrivers = new CheckBox();
|
||||||
|
checkBoxShifts = new CheckBox();
|
||||||
|
checkBoxRoutes = new CheckBox();
|
||||||
|
buttonBuild = new Button();
|
||||||
|
SuspendLayout();
|
||||||
|
//
|
||||||
|
// checkBoxCars
|
||||||
|
//
|
||||||
|
checkBoxCars.AutoSize = true;
|
||||||
|
checkBoxCars.Location = new Point(12, 12);
|
||||||
|
checkBoxCars.Name = "checkBoxCars";
|
||||||
|
checkBoxCars.Size = new Size(96, 19);
|
||||||
|
checkBoxCars.TabIndex = 0;
|
||||||
|
checkBoxCars.Text = "Автомобили";
|
||||||
|
checkBoxCars.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// checkBoxDrivers
|
||||||
|
//
|
||||||
|
checkBoxDrivers.AutoSize = true;
|
||||||
|
checkBoxDrivers.Location = new Point(12, 57);
|
||||||
|
checkBoxDrivers.Name = "checkBoxDrivers";
|
||||||
|
checkBoxDrivers.Size = new Size(78, 19);
|
||||||
|
checkBoxDrivers.TabIndex = 1;
|
||||||
|
checkBoxDrivers.Text = "Водители";
|
||||||
|
checkBoxDrivers.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// checkBoxShifts
|
||||||
|
//
|
||||||
|
checkBoxShifts.AutoSize = true;
|
||||||
|
checkBoxShifts.Location = new Point(12, 101);
|
||||||
|
checkBoxShifts.Name = "checkBoxShifts";
|
||||||
|
checkBoxShifts.Size = new Size(65, 19);
|
||||||
|
checkBoxShifts.TabIndex = 2;
|
||||||
|
checkBoxShifts.Text = "Смены";
|
||||||
|
checkBoxShifts.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// checkBoxRoutes
|
||||||
|
//
|
||||||
|
checkBoxRoutes.AutoSize = true;
|
||||||
|
checkBoxRoutes.Location = new Point(12, 149);
|
||||||
|
checkBoxRoutes.Name = "checkBoxRoutes";
|
||||||
|
checkBoxRoutes.Size = new Size(88, 19);
|
||||||
|
checkBoxRoutes.TabIndex = 3;
|
||||||
|
checkBoxRoutes.Text = "Маршруты";
|
||||||
|
checkBoxRoutes.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// buttonBuild
|
||||||
|
//
|
||||||
|
buttonBuild.Location = new Point(154, 12);
|
||||||
|
buttonBuild.Name = "buttonBuild";
|
||||||
|
buttonBuild.Size = new Size(172, 156);
|
||||||
|
buttonBuild.TabIndex = 4;
|
||||||
|
buttonBuild.Text = "Сформировать";
|
||||||
|
buttonBuild.UseVisualStyleBackColor = true;
|
||||||
|
buttonBuild.Click += ButtonBuild_Click;
|
||||||
|
//
|
||||||
|
// FormDirectoryReport
|
||||||
|
//
|
||||||
|
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||||
|
AutoScaleMode = AutoScaleMode.Font;
|
||||||
|
ClientSize = new Size(338, 184);
|
||||||
|
Controls.Add(buttonBuild);
|
||||||
|
Controls.Add(checkBoxRoutes);
|
||||||
|
Controls.Add(checkBoxShifts);
|
||||||
|
Controls.Add(checkBoxDrivers);
|
||||||
|
Controls.Add(checkBoxCars);
|
||||||
|
Name = "FormDirectoryReport";
|
||||||
|
StartPosition = FormStartPosition.CenterScreen;
|
||||||
|
Text = "Выгрузка справочников";
|
||||||
|
ResumeLayout(false);
|
||||||
|
PerformLayout();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private CheckBox checkBoxCars;
|
||||||
|
private CheckBox checkBoxDrivers;
|
||||||
|
private CheckBox checkBoxShifts;
|
||||||
|
private CheckBox checkBoxRoutes;
|
||||||
|
private Button buttonBuild;
|
||||||
|
}
|
||||||
|
}
|
60
FuelAccounting/FuelAccounting/Forms/FormDirectoryReport.cs
Normal file
60
FuelAccounting/FuelAccounting/Forms/FormDirectoryReport.cs
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
using FuelAccounting.Reports;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using Unity;
|
||||||
|
|
||||||
|
namespace FuelAccounting.Forms;
|
||||||
|
|
||||||
|
public partial class FormDirectoryReport : Form
|
||||||
|
{
|
||||||
|
private readonly IUnityContainer _container;
|
||||||
|
|
||||||
|
public FormDirectoryReport(IUnityContainer container)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
_container = container ?? throw new ArgumentNullException(nameof(container));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ButtonBuild_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!checkBoxCars.Checked && !checkBoxDrivers.Checked && !checkBoxRoutes.Checked && !checkBoxShifts.Checked)
|
||||||
|
{
|
||||||
|
throw new Exception("Не выбран ни один справочник для выгрузки");
|
||||||
|
}
|
||||||
|
|
||||||
|
var sfd = new SaveFileDialog()
|
||||||
|
{
|
||||||
|
Filter = "Docx Files | *.docx"
|
||||||
|
};
|
||||||
|
|
||||||
|
if (sfd.ShowDialog() != DialogResult.OK)
|
||||||
|
{
|
||||||
|
throw new Exception("Не выбран файл для отчета");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_container.Resolve<DocReport>().CreateDoc(sfd.FileName, checkBoxCars.Checked,
|
||||||
|
checkBoxDrivers.Checked, checkBoxRoutes.Checked, checkBoxShifts.Checked))
|
||||||
|
{
|
||||||
|
MessageBox.Show("Документ сформирован", "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MessageBox.Show("Возникли ошибки при формировании документа (подробности в логах)", "Формирование документа",
|
||||||
|
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(ex.Message, "Ошибка при создании отчета", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
120
FuelAccounting/FuelAccounting/Forms/FormDirectoryReport.resx
Normal file
120
FuelAccounting/FuelAccounting/Forms/FormDirectoryReport.resx
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
</root>
|
@ -82,7 +82,8 @@ namespace FuelAccounting.Forms
|
|||||||
Convert.ToInt32(row.Cells["ColumnCount"].Value)));
|
Convert.ToInt32(row.Cells["ColumnCount"].Value)));
|
||||||
}
|
}
|
||||||
|
|
||||||
return list;
|
return list.GroupBy(x => x.RouteId, x => x.Count, (id, counts) =>
|
||||||
|
RoutesEqipage.CreateElement(0, id, counts.Sum())).ToList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Dapper" Version="2.1.35" />
|
<PackageReference Include="Dapper" Version="2.1.35" />
|
||||||
|
<PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
|
||||||
|
110
FuelAccounting/FuelAccounting/Reports/DocReport.cs
Normal file
110
FuelAccounting/FuelAccounting/Reports/DocReport.cs
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
using FuelAccounting.Repositories;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace FuelAccounting.Reports;
|
||||||
|
|
||||||
|
internal class DocReport
|
||||||
|
{
|
||||||
|
private readonly ICarsRepository _carsRepository;
|
||||||
|
private readonly IDriversRepository _driversRepository;
|
||||||
|
private readonly IShiftRepository _shiftRepository;
|
||||||
|
private readonly IRouteRepository _routeRepository;
|
||||||
|
|
||||||
|
private readonly ILogger<DocReport> _logger;
|
||||||
|
|
||||||
|
public DocReport (ICarsRepository carsRepository, IDriversRepository driversRepository,
|
||||||
|
IShiftRepository shiftRepository, IRouteRepository routeRepository, ILogger<DocReport> logger)
|
||||||
|
{
|
||||||
|
_carsRepository = carsRepository ??
|
||||||
|
throw new ArgumentNullException(nameof(carsRepository));
|
||||||
|
_driversRepository = driversRepository ??
|
||||||
|
throw new ArgumentNullException(nameof(driversRepository));
|
||||||
|
_shiftRepository = shiftRepository ??
|
||||||
|
throw new ArgumentNullException(nameof(shiftRepository));
|
||||||
|
_routeRepository = routeRepository ??
|
||||||
|
throw new ArgumentNullException(nameof(routeRepository));
|
||||||
|
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CreateDoc(string filePath, bool includeCars, bool includeDrivers, bool includeShift, bool includeRoute)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var builder = new WordBuilder(filePath).AddHeader("Документ со справочниками");
|
||||||
|
|
||||||
|
if (includeCars)
|
||||||
|
{
|
||||||
|
builder.AddParagraph("Автомобили").AddTable([2400, 1200, 1200], GetCars());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (includeDrivers)
|
||||||
|
{
|
||||||
|
builder.AddParagraph("Водители").AddTable([2400, 2400, 1200], GetDrivers());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (includeShift)
|
||||||
|
{
|
||||||
|
builder.AddParagraph("Смены").AddTable([1200, 2400], GetShift());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (includeRoute)
|
||||||
|
{
|
||||||
|
builder.AddParagraph("Маршруты").AddTable([2400], GetRoute());
|
||||||
|
}
|
||||||
|
|
||||||
|
builder.Build();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Ошибка при формировании документа");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<string[]> GetCars()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
["Модель", "Категория", "Id Водителя"],
|
||||||
|
.. _carsRepository
|
||||||
|
.ReadCars()
|
||||||
|
.Select(x => new string[] {x.Model, x.Category.ToString(), x.DriverID.ToString()}),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<string[]> GetDrivers()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
["Имя", "Фамилия", "Категория прав"],
|
||||||
|
.. _driversRepository
|
||||||
|
.ReadDrivers()
|
||||||
|
.Select(x => new string[] {x.FirstName, x.LastName, x.DriverLicenceCategory.ToString()}),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<string[]> GetShift()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
["Количество часов", "Описание"],
|
||||||
|
.. _shiftRepository
|
||||||
|
.ReadShifts()
|
||||||
|
.Select(x => new string[] {x.AmountOfHours.ToString(), x.Description}),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<string[]> GetRoute()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
["Описание"],
|
||||||
|
.. _routeRepository
|
||||||
|
.ReadRoutes()
|
||||||
|
.Select(x => new string[] {x.Description}),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
330
FuelAccounting/FuelAccounting/Reports/ExcelBuilder.cs
Normal file
330
FuelAccounting/FuelAccounting/Reports/ExcelBuilder.cs
Normal file
@ -0,0 +1,330 @@
|
|||||||
|
using DocumentFormat.OpenXml;
|
||||||
|
using DocumentFormat.OpenXml.Packaging;
|
||||||
|
using DocumentFormat.OpenXml.Spreadsheet;
|
||||||
|
|
||||||
|
namespace FuelAccounting.Reports;
|
||||||
|
|
||||||
|
internal class ExcelBuilder
|
||||||
|
{
|
||||||
|
private readonly string _filePath;
|
||||||
|
|
||||||
|
private readonly SheetData _sheetData;
|
||||||
|
|
||||||
|
private readonly MergeCells _mergeCells;
|
||||||
|
|
||||||
|
private readonly Columns _columns;
|
||||||
|
|
||||||
|
private uint _rowIndex = 0;
|
||||||
|
|
||||||
|
public ExcelBuilder(string filePath)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(filePath))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(filePath));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (File.Exists(filePath))
|
||||||
|
{
|
||||||
|
File.Delete(filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
_filePath = filePath;
|
||||||
|
_sheetData = new SheetData();
|
||||||
|
_mergeCells = new MergeCells();
|
||||||
|
_columns = new Columns();
|
||||||
|
_rowIndex = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ExcelBuilder AddHeader(string header, int startIndex, int count)
|
||||||
|
{
|
||||||
|
CreateCell(startIndex, _rowIndex, header, StyleIndex.BoldTextWithoutBorder);
|
||||||
|
for (int i = startIndex + 1; i < startIndex + count; i++)
|
||||||
|
{
|
||||||
|
CreateCell(i, _rowIndex, "", StyleIndex.SimpleTextWithoutBorder);
|
||||||
|
}
|
||||||
|
|
||||||
|
_mergeCells.Append(new MergeCell()
|
||||||
|
{
|
||||||
|
Reference =
|
||||||
|
new StringValue($"{GetExcelColumnName(startIndex)}{_rowIndex}:{GetExcelColumnName(startIndex + count - 1)}{_rowIndex}")
|
||||||
|
});
|
||||||
|
|
||||||
|
_rowIndex++;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ExcelBuilder AddParagraph(string text, int columnIndex)
|
||||||
|
{
|
||||||
|
CreateCell(columnIndex, _rowIndex++, text, StyleIndex.SimpleTextWithoutBorder);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ExcelBuilder AddTable(int[] columnsWidths, List<string[]> data)
|
||||||
|
{
|
||||||
|
if (columnsWidths == null || columnsWidths.Length == 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(columnsWidths));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data == null || data.Count == 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.Any(x => x.Length != columnsWidths.Length))
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("widths.Length != data.Length");
|
||||||
|
}
|
||||||
|
|
||||||
|
uint counter = 1;
|
||||||
|
int coef = 2;
|
||||||
|
_columns.Append(columnsWidths.Select(x => new Column
|
||||||
|
{
|
||||||
|
Min = counter,
|
||||||
|
Max = counter++,
|
||||||
|
Width = x * coef,
|
||||||
|
CustomWidth = true
|
||||||
|
}));
|
||||||
|
|
||||||
|
for (var j = 0; j < data.First().Length; ++j)
|
||||||
|
{
|
||||||
|
CreateCell(j, _rowIndex, data.First()[j], StyleIndex.BoldTextWithBorder);
|
||||||
|
}
|
||||||
|
|
||||||
|
_rowIndex++;
|
||||||
|
for (var i = 1; i < data.Count -1; ++i)
|
||||||
|
{
|
||||||
|
for (var j = 0; j < data[i].Length; ++j)
|
||||||
|
{
|
||||||
|
CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithBorder);
|
||||||
|
}
|
||||||
|
|
||||||
|
_rowIndex++;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var j = 0; j < data.Last().Length; ++j)
|
||||||
|
{
|
||||||
|
CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.BoldTextWithBorder);
|
||||||
|
}
|
||||||
|
|
||||||
|
_rowIndex++;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Build()
|
||||||
|
{
|
||||||
|
using var spreadsheetDocument = SpreadsheetDocument.Create(_filePath, SpreadsheetDocumentType.Workbook);
|
||||||
|
var workbookpart = spreadsheetDocument.AddWorkbookPart();
|
||||||
|
GenerateStyle(workbookpart);
|
||||||
|
workbookpart.Workbook = new Workbook();
|
||||||
|
var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
|
||||||
|
worksheetPart.Worksheet = new Worksheet();
|
||||||
|
if (_columns.HasChildren)
|
||||||
|
{
|
||||||
|
worksheetPart.Worksheet.Append(_columns);
|
||||||
|
}
|
||||||
|
|
||||||
|
worksheetPart.Worksheet.Append(_sheetData);
|
||||||
|
var sheets = spreadsheetDocument.WorkbookPart!.Workbook.AppendChild(new Sheets());
|
||||||
|
var sheet = new Sheet()
|
||||||
|
{
|
||||||
|
Id = spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
|
||||||
|
SheetId = 1,
|
||||||
|
Name = "Лист 1"
|
||||||
|
};
|
||||||
|
|
||||||
|
sheets.Append(sheet);
|
||||||
|
if (_mergeCells.HasChildren)
|
||||||
|
{
|
||||||
|
worksheetPart.Worksheet.InsertAfter(_mergeCells, worksheetPart.Worksheet.Elements<SheetData>().First());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void GenerateStyle(WorkbookPart workbookPart)
|
||||||
|
{
|
||||||
|
var workbookStylesPart = workbookPart.AddNewPart<WorkbookStylesPart>();
|
||||||
|
workbookStylesPart.Stylesheet = new Stylesheet();
|
||||||
|
|
||||||
|
var fonts = new Fonts()
|
||||||
|
{
|
||||||
|
Count = 2,
|
||||||
|
KnownFonts = BooleanValue.FromBoolean(true)
|
||||||
|
};
|
||||||
|
fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
|
||||||
|
{
|
||||||
|
FontSize = new FontSize() { Val = 11 },
|
||||||
|
FontName = new FontName() { Val = "Calibri" },
|
||||||
|
FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
|
||||||
|
FontScheme = new FontScheme()
|
||||||
|
{
|
||||||
|
Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
|
||||||
|
{
|
||||||
|
FontSize = new FontSize() { Val = 11 },
|
||||||
|
FontName = new FontName() { Val = "Calibri" },
|
||||||
|
FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
|
||||||
|
FontScheme = new FontScheme()
|
||||||
|
{
|
||||||
|
Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor)
|
||||||
|
},
|
||||||
|
Bold = new Bold() { Val = true }
|
||||||
|
});
|
||||||
|
workbookStylesPart.Stylesheet.Append(fonts);
|
||||||
|
|
||||||
|
// Default Fill
|
||||||
|
var fills = new Fills() { Count = 1 };
|
||||||
|
fills.Append(new Fill
|
||||||
|
{
|
||||||
|
PatternFill = new PatternFill()
|
||||||
|
{
|
||||||
|
PatternType = new EnumValue<PatternValues>(PatternValues.None)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
workbookStylesPart.Stylesheet.Append(fills);
|
||||||
|
|
||||||
|
// Default Border
|
||||||
|
var borders = new Borders() { Count = 2 };
|
||||||
|
borders.Append(new Border
|
||||||
|
{
|
||||||
|
LeftBorder = new LeftBorder(),
|
||||||
|
RightBorder = new RightBorder(),
|
||||||
|
TopBorder = new TopBorder(),
|
||||||
|
BottomBorder = new BottomBorder(),
|
||||||
|
DiagonalBorder = new DiagonalBorder()
|
||||||
|
});
|
||||||
|
borders.Append(new Border
|
||||||
|
{
|
||||||
|
LeftBorder = new LeftBorder() { Style = BorderStyleValues.Thin },
|
||||||
|
RightBorder = new RightBorder() { Style = BorderStyleValues.Thin },
|
||||||
|
TopBorder = new TopBorder() { Style = BorderStyleValues.Thin },
|
||||||
|
BottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin },
|
||||||
|
DiagonalBorder = new DiagonalBorder()
|
||||||
|
});
|
||||||
|
workbookStylesPart.Stylesheet.Append(borders);
|
||||||
|
|
||||||
|
// Default cell format and a date cell format
|
||||||
|
var cellFormats = new CellFormats() { Count = 4 };
|
||||||
|
cellFormats.Append(new CellFormat
|
||||||
|
{
|
||||||
|
NumberFormatId = 0,
|
||||||
|
FormatId = 0,
|
||||||
|
FontId = 0,
|
||||||
|
BorderId = 0,
|
||||||
|
FillId = 0,
|
||||||
|
Alignment = new Alignment()
|
||||||
|
{
|
||||||
|
Horizontal = HorizontalAlignmentValues.Left,
|
||||||
|
Vertical = VerticalAlignmentValues.Center,
|
||||||
|
WrapText = true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
cellFormats.Append(new CellFormat
|
||||||
|
{
|
||||||
|
NumberFormatId = 0,
|
||||||
|
FormatId = 0,
|
||||||
|
FontId = 0,
|
||||||
|
BorderId = 1,
|
||||||
|
FillId = 0,
|
||||||
|
Alignment = new Alignment()
|
||||||
|
{
|
||||||
|
Horizontal = HorizontalAlignmentValues.Right,
|
||||||
|
Vertical = VerticalAlignmentValues.Center,
|
||||||
|
WrapText = true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
cellFormats.Append(new CellFormat
|
||||||
|
{
|
||||||
|
NumberFormatId = 0,
|
||||||
|
FormatId = 0,
|
||||||
|
FontId = 1,
|
||||||
|
BorderId = 0,
|
||||||
|
FillId = 0,
|
||||||
|
Alignment = new Alignment()
|
||||||
|
{
|
||||||
|
Horizontal = HorizontalAlignmentValues.Center,
|
||||||
|
Vertical = VerticalAlignmentValues.Center,
|
||||||
|
WrapText = true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
cellFormats.Append(new CellFormat
|
||||||
|
{
|
||||||
|
NumberFormatId = 0,
|
||||||
|
FormatId = 0,
|
||||||
|
FontId = 1,
|
||||||
|
BorderId = 1,
|
||||||
|
FillId = 0,
|
||||||
|
Alignment = new Alignment()
|
||||||
|
{
|
||||||
|
Horizontal = HorizontalAlignmentValues.Center,
|
||||||
|
Vertical = VerticalAlignmentValues.Center,
|
||||||
|
WrapText = true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
workbookStylesPart.Stylesheet.Append(cellFormats);
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum StyleIndex
|
||||||
|
{
|
||||||
|
SimpleTextWithoutBorder = 0,
|
||||||
|
SimpleTextWithBorder = 1,
|
||||||
|
BoldTextWithoutBorder = 2,
|
||||||
|
BoldTextWithBorder = 3,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex)
|
||||||
|
{
|
||||||
|
var columnName = GetExcelColumnName(columnIndex);
|
||||||
|
var cellReference = columnName + rowIndex;
|
||||||
|
var row = _sheetData.Elements<Row>().FirstOrDefault(r => r.RowIndex! == rowIndex);
|
||||||
|
if (row == null)
|
||||||
|
{
|
||||||
|
row = new Row() { RowIndex = rowIndex };
|
||||||
|
_sheetData.Append(row);
|
||||||
|
}
|
||||||
|
|
||||||
|
var newCell = row.Elements <Cell>()
|
||||||
|
.FirstOrDefault(c => c.CellReference != null && c.CellReference.Value == columnName + rowIndex);
|
||||||
|
if (newCell == null)
|
||||||
|
{
|
||||||
|
Cell? refCell = null;
|
||||||
|
foreach (Cell cell in row.Elements<Cell>())
|
||||||
|
{
|
||||||
|
if (cell.CellReference?.Value != null && cell.CellReference.Value.Length == cellReference.Length)
|
||||||
|
{
|
||||||
|
if (string.Compare(cell.CellReference.Value, cellReference, true) > 0)
|
||||||
|
{
|
||||||
|
refCell = cell;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
newCell = new Cell() { CellReference = cellReference };
|
||||||
|
row.InsertBefore(newCell, refCell);
|
||||||
|
}
|
||||||
|
|
||||||
|
newCell.CellValue = new CellValue(text);
|
||||||
|
newCell.DataType = CellValues.String;
|
||||||
|
newCell.StyleIndex = (uint)styleIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetExcelColumnName(int columnNumber)
|
||||||
|
{
|
||||||
|
columnNumber += 1;
|
||||||
|
int dividend = columnNumber;
|
||||||
|
string columnName = string.Empty;
|
||||||
|
int modulo;
|
||||||
|
|
||||||
|
while (dividend > 0)
|
||||||
|
{
|
||||||
|
modulo = (dividend - 1) % 26;
|
||||||
|
columnName = Convert.ToChar(65 + modulo).ToString() + columnName;
|
||||||
|
dividend = (dividend - modulo) / 26;
|
||||||
|
}
|
||||||
|
|
||||||
|
return columnName;
|
||||||
|
}
|
||||||
|
}
|
102
FuelAccounting/FuelAccounting/Reports/TableReport.cs
Normal file
102
FuelAccounting/FuelAccounting/Reports/TableReport.cs
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
using FuelAccounting.Repositories;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
namespace FuelAccounting.Reports;
|
||||||
|
|
||||||
|
internal class TableReport
|
||||||
|
{
|
||||||
|
private readonly IEquipageRepository _equipageRepository;
|
||||||
|
private readonly IRefuelingRepository _refuelingRepository;
|
||||||
|
|
||||||
|
private readonly ILogger<TableReport> _logger;
|
||||||
|
|
||||||
|
internal static readonly string[] item = ["Автомобиль", "Водитель", "Литров заправлено", "Дата"];
|
||||||
|
|
||||||
|
public TableReport(IEquipageRepository equipageRepository,
|
||||||
|
IRefuelingRepository refuelingRepository, ILogger<TableReport> logger)
|
||||||
|
{
|
||||||
|
_equipageRepository = equipageRepository ??
|
||||||
|
throw new ArgumentNullException(nameof(equipageRepository));
|
||||||
|
_refuelingRepository = refuelingRepository ??
|
||||||
|
throw new ArgumentNullException(nameof(refuelingRepository));
|
||||||
|
_logger = logger ?? throw new ArgumentNullException(nameof(_logger));
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CreateTable(string filePath, int carId, DateTime startDate, DateTime endDate)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
new ExcelBuilder(filePath)
|
||||||
|
.AddHeader("Сводка по автомобилям", 0, 4)
|
||||||
|
.AddParagraph("За период", 0)
|
||||||
|
.AddTable([15, 15, 10, 15], GetData(carId, startDate, endDate))
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Ошибка при формировании документа");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<string[]> GetData(int carId, DateTime startDate, DateTime endDate)
|
||||||
|
{
|
||||||
|
// Получение данных об экипажах
|
||||||
|
var equipageData = _equipageRepository
|
||||||
|
.ReadEquipages()
|
||||||
|
.Where(x => x.EquipageDate >= startDate && x.EquipageDate <= endDate && x.CarId == carId)
|
||||||
|
.Select(x => new
|
||||||
|
{
|
||||||
|
CarId = x.CarId,
|
||||||
|
Driver = x.DriverId.ToString(),
|
||||||
|
Liters = 0.0, // Данные о заправке отсутствуют
|
||||||
|
Date = x.EquipageDate
|
||||||
|
});
|
||||||
|
|
||||||
|
// Получение данных о заправках
|
||||||
|
var refuelingData = _refuelingRepository
|
||||||
|
.ReadRefuelings()
|
||||||
|
.Where(x => x.RefuelingDate >= startDate && x.RefuelingDate <= endDate && x.CarId == carId)
|
||||||
|
.Select(x => new
|
||||||
|
{
|
||||||
|
x.CarId,
|
||||||
|
Driver = string.Empty, // Данные о водителе отсутствуют
|
||||||
|
Liters = (double)x.LitersSpent,
|
||||||
|
Date = x.RefuelingDate
|
||||||
|
});
|
||||||
|
|
||||||
|
// Объединение данных об экипажах и заправках
|
||||||
|
var mergedData = equipageData
|
||||||
|
.Union(refuelingData)
|
||||||
|
.GroupBy(x => new { x.CarId, x.Date }) // Группировка по дате и машине
|
||||||
|
.Select(g => new
|
||||||
|
{
|
||||||
|
g.Key.CarId,
|
||||||
|
Driver = string.Join(", ", g.Select(x => x.Driver).Where(d => !string.IsNullOrEmpty(d))),
|
||||||
|
Liters = g.Sum(x => x.Liters),
|
||||||
|
g.Key.Date
|
||||||
|
})
|
||||||
|
.OrderBy(x => x.Date);
|
||||||
|
|
||||||
|
// Формирование строк данных
|
||||||
|
return new List<string[]> { item }
|
||||||
|
.Union(
|
||||||
|
mergedData.Select(x => new string[]
|
||||||
|
{
|
||||||
|
x.CarId.ToString(),
|
||||||
|
x.Driver,
|
||||||
|
x.Liters.ToString("F2"), // Форматирование до 2-х знаков после запятой
|
||||||
|
x.Date.ToString("dd.MM.yyyy") // Форматирование даты
|
||||||
|
}))
|
||||||
|
.Union(
|
||||||
|
new[]
|
||||||
|
{
|
||||||
|
new string[] { "Всего", string.Empty, mergedData.Sum(x => x.Liters).ToString("F2"), string.Empty }
|
||||||
|
})
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
106
FuelAccounting/FuelAccounting/Reports/WordBuilder.cs
Normal file
106
FuelAccounting/FuelAccounting/Reports/WordBuilder.cs
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
using DocumentFormat.OpenXml;
|
||||||
|
using DocumentFormat.OpenXml.Packaging;
|
||||||
|
using DocumentFormat.OpenXml.Wordprocessing;
|
||||||
|
|
||||||
|
namespace FuelAccounting.Reports;
|
||||||
|
|
||||||
|
internal class WordBuilder
|
||||||
|
{
|
||||||
|
private readonly string _filePath;
|
||||||
|
|
||||||
|
private readonly Document _document;
|
||||||
|
|
||||||
|
private readonly Body _body;
|
||||||
|
|
||||||
|
public WordBuilder(string filePath)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(filePath))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(filePath));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (File.Exists(filePath))
|
||||||
|
{
|
||||||
|
File.Delete(filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
_filePath = filePath;
|
||||||
|
_document = new Document();
|
||||||
|
_body = _document.AppendChild(new Body());
|
||||||
|
}
|
||||||
|
|
||||||
|
public WordBuilder AddHeader(string header)
|
||||||
|
{
|
||||||
|
var paragraph = _body.AppendChild(new Paragraph());
|
||||||
|
var run = paragraph.AppendChild(new Run());
|
||||||
|
var runProperties = run.AppendChild(new RunProperties());
|
||||||
|
runProperties.AppendChild(new Bold());
|
||||||
|
run.AppendChild(new Text(header));
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public WordBuilder AddParagraph(string text)
|
||||||
|
{
|
||||||
|
var paragraph = _body.AppendChild(new Paragraph());
|
||||||
|
var run = paragraph.AppendChild(new Run());
|
||||||
|
run.AppendChild(new Text(text));
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public WordBuilder AddTable(int[] widths, List<string[]> data)
|
||||||
|
{
|
||||||
|
if (widths == null || widths.Length == 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(widths));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data == null || data.Count == 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.Any(x => x.Length != widths.Length))
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("widths.Length != data.Length");
|
||||||
|
}
|
||||||
|
|
||||||
|
var table = new Table();
|
||||||
|
table.AppendChild(new TableProperties(
|
||||||
|
new TableBorders(
|
||||||
|
new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
|
||||||
|
new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
|
||||||
|
new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
|
||||||
|
new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
|
||||||
|
new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 },
|
||||||
|
new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 12 }
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
//Заголовок
|
||||||
|
var tr = new TableRow();
|
||||||
|
for (var j = 0; j < widths.Length; ++j)
|
||||||
|
{
|
||||||
|
tr.Append(new TableCell(
|
||||||
|
new TableCellProperties(new TableCellWidth() { Width = widths[j].ToString() }),
|
||||||
|
new Paragraph(new Run(new RunProperties(new Bold()), new Text(data.First()[j])))));
|
||||||
|
}
|
||||||
|
table.Append(tr);
|
||||||
|
|
||||||
|
//Данные
|
||||||
|
table.Append(data.Skip(1).Select(x =>
|
||||||
|
new TableRow(x.Select(y => new TableCell(new Paragraph(new Run(new Text(y))))))));
|
||||||
|
|
||||||
|
_body.Append(table);
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Build()
|
||||||
|
{
|
||||||
|
using var wordDocument = WordprocessingDocument.Create(_filePath, WordprocessingDocumentType.Document);
|
||||||
|
var mainPart = wordDocument.AddMainDocumentPart();
|
||||||
|
mainPart.Document = _document;
|
||||||
|
}
|
||||||
|
}
|
@ -41,7 +41,7 @@ INSERT INTO RoutesEquipage (equipage_id, route_id, count)
|
|||||||
VALUES (@EquipageId, @RouteId, @Count)";
|
VALUES (@EquipageId, @RouteId, @Count)";
|
||||||
foreach (var elem in equipage.RoutesEqipage)
|
foreach (var elem in equipage.RoutesEqipage)
|
||||||
{
|
{
|
||||||
connection.Execute(querySubInsert, new { EquipageId = equipageId, elem.RouteID, elem.Count }, transaction);
|
connection.Execute(querySubInsert, new { EquipageId = equipageId, elem.RouteId, elem.Count }, transaction);
|
||||||
}
|
}
|
||||||
|
|
||||||
transaction.Commit();
|
transaction.Commit();
|
||||||
@ -81,16 +81,15 @@ WHERE id = @id";
|
|||||||
{
|
{
|
||||||
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
|
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
|
||||||
var querySelect = @"
|
var querySelect = @"
|
||||||
SELECT
|
SELECT e.id, e.car_id AS CarId, e.driver_id AS DriverId, e.shift_id AS ShiftId,
|
||||||
id,
|
e.equipage_date AS EquipageDate, re.route_id AS RouteId, re.count AS Count
|
||||||
car_id AS CarId,
|
FROM Equipage e
|
||||||
driver_id AS DriverId,
|
INNER JOIN RoutesEquipage re ON re.equipage_id = e.id";
|
||||||
shift_id AS ShiftId,
|
var equipages = connection.Query<TempRoutesEquipage>(querySelect);
|
||||||
equipage_date AS EquipageDate
|
|
||||||
FROM Equipage";
|
|
||||||
var equipages = connection.Query<Equipage>(querySelect);
|
|
||||||
_logger.LogDebug("Найденные объекты: {json}", JsonConvert.SerializeObject(equipages));
|
_logger.LogDebug("Найденные объекты: {json}", JsonConvert.SerializeObject(equipages));
|
||||||
return equipages;
|
return equipages.GroupBy(x => x.Id, y => y,
|
||||||
|
(key, value) => Equipage.CreateOperation(value.First(),
|
||||||
|
value.Select(z => RoutesEqipage.CreateElement(0, z.RouteId, z.CarId)))).ToList();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -99,3 +98,14 @@ FROM Equipage";
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
|
||||||
|
SELECT
|
||||||
|
id,
|
||||||
|
car_id AS CarId,
|
||||||
|
driver_id AS DriverId,
|
||||||
|
shift_id AS ShiftId,
|
||||||
|
equipage_date AS EquipageDate
|
||||||
|
FROM Equipage
|
||||||
|
|
||||||
|
*/
|
Loading…
x
Reference in New Issue
Block a user