diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs
index db2e6fc..7fa1d39 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs
@@ -1,33 +1,33 @@
namespace BlacksmithWorkshop
{
- partial class FormReportManufactureWorkPieces
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
+ partial class FormReportManufactureWorkPieces
+ {
+ ///
+ /// 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);
- }
+ ///
+ /// 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
+ #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()
- {
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
dataGridView = new DataGridView();
buttonSaveToExcel = new Button();
ColumnManufacture = new DataGridViewTextBoxColumn();
@@ -35,9 +35,9 @@
ColumnCount = new DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
- //
+ //
// dataGridView
- //
+ //
dataGridView.AllowUserToAddRows = false;
dataGridView.AllowUserToDeleteRows = false;
dataGridView.AllowUserToOrderColumns = true;
@@ -56,9 +56,9 @@
dataGridView.RowHeadersWidth = 51;
dataGridView.Size = new Size(704, 680);
dataGridView.TabIndex = 0;
- //
+ //
// buttonSaveToExcel
- //
+ //
buttonSaveToExcel.Location = new Point(16, 18);
buttonSaveToExcel.Margin = new Padding(4, 5, 4, 5);
buttonSaveToExcel.Name = "buttonSaveToExcel";
@@ -67,33 +67,33 @@
buttonSaveToExcel.Text = "Сохранить в Excel";
buttonSaveToExcel.UseVisualStyleBackColor = true;
buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
- //
+ //
// ColumnManufacture
- //
+ //
ColumnManufacture.HeaderText = "Изделие";
ColumnManufacture.MinimumWidth = 6;
ColumnManufacture.Name = "ColumnManufacture";
ColumnManufacture.ReadOnly = true;
ColumnManufacture.Width = 200;
- //
+ //
// ColumnWorkPiece
- //
+ //
ColumnWorkPiece.HeaderText = "Заготовка";
ColumnWorkPiece.MinimumWidth = 6;
ColumnWorkPiece.Name = "ColumnWorkPiece";
ColumnWorkPiece.ReadOnly = true;
ColumnWorkPiece.Width = 200;
- //
- // ColumnCount
- //
+ //
+ // ColumnCount
+ //
ColumnCount.HeaderText = "Количество";
ColumnCount.MinimumWidth = 6;
ColumnCount.Name = "ColumnCount";
ColumnCount.ReadOnly = true;
ColumnCount.Width = 125;
- //
- // FormReportManufactureWorkPieces
- //
+ //
+ // FormReportManufactureWorkPieces
+ //
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(704, 743);
@@ -105,14 +105,16 @@
Load += FormReportManufactureWorkPieces_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
- }
+ }
- #endregion
+ #endregion
private DataGridView dataGridView;
- private Button buttonSaveToExcel;
- private DataGridViewTextBoxColumn ColumnManufacture;
+ private Button buttonSaveToExcel;
+ private DataGridView dataGridView;
+ private DataGridViewTextBoxColumn ColumWorkPiece;
+ private DataGridViewTextBoxColumn ColumnManufacture;
private DataGridViewTextBoxColumn ColumnWorkPiece;
- private DataGridViewTextBoxColumn ColumnCount;
- }
+ private DataGridViewTextBoxColumn ColumnCount;
+ }
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs
index d2d809a..0001b09 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs
@@ -13,82 +13,82 @@ using System.Windows.Forms;
namespace BlacksmithWorkshop
{
- public partial class FormReportManufactureWorkPieces : Form
- {
- private readonly ILogger _logger;
+ public partial class FormReportManufactureWorkPieces : Form
+ {
+ private readonly ILogger _logger;
- private readonly IReportLogic _logic;
+ private readonly IReportLogic _logic;
- public FormReportManufactureWorkPieces(ILogger logger, IReportLogic logic)
- {
- InitializeComponent();
+ public FormReportManufactureWorkPieces(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
- _logger = logger;
- _logic = logic;
- }
+ _logger = logger;
+ _logic = logic;
+ }
- private void FormReportManufactureWorkPieces_Load(object sender, EventArgs e)
- {
- try
- {
- var dict = _logic.GetManufactureWorkPiece();
+ private void FormReportManufactureWorkPieces_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetManufactureWorkPiece();
- if (dict != null)
- {
- dataGridView.Rows.Clear();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
- foreach (var elem in dict)
- {
- dataGridView.Rows.Add(new object[] { elem.ManufactureName, "", "" });
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.ManufactureName, "", "" });
- foreach (var listElem in elem.WorkPieces)
- {
- dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
- }
+ foreach (var listElem in elem.WorkPieces)
+ {
+ dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+ }
- dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
- dataGridView.Rows.Add(Array.Empty