ElEgEv/PIbd-21_Eliseev_E.E._BlacksmithWorkshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Уже почти всё работает. Но этот отчёт на форме...

Browse Source
This commit is contained in:
Programmist73 2023-03-19 13:22:53 +04:00
parent 400b9350cd
commit 7b682adb00
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
View File

@ -49,6 +49,7 @@ namespace BlacksmithWorkshop
{
dataGridView.DataSource = list;
dataGridView.Columns["ManufactureId"].Visible = false;
dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка заказов");
@ -187,7 +188,7 @@ namespace BlacksmithWorkshop
if (dialog.ShowDialog() == DialogResult.OK)
{
_reportLogic.SaveWorkPiecesToWordFile(new ReportBindingModel
_reportLogic.SaveManufacturesToWordFile(new ReportBindingModel
{
FileName = dialog.FileName
});

6
BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs
View File

@ -41,7 +41,7 @@ namespace BlacksmithWorkshop
{
dataGridView.Rows.Add(new object[] { elem.ManufactureName, "", "" });
foreach (var listElem in elem.Manufactures)
foreach (var listElem in elem.WorkPieces)
{
dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
}
@ -51,11 +51,11 @@ namespace BlacksmithWorkshop
}
}
_logger.LogInformation("Загрузка списка изделий по компонентам");
_logger.LogInformation("Загрузка списка изделий по заготовкам");
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки списка изделий по компонентам");
_logger.LogError(ex, "Ошибка загрузки списка изделий по заготовкам");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}

3
BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs
View File

@ -68,7 +68,8 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
Sum = Sum,
Status = Status,
DateCreate = DateCreate,
DateImplement = DateImplement
DateImplement = DateImplement,
ManufactureName = Manufacture.ManufactureName
};
}
}