Исправления после слияния

This commit is contained in:
ujijrujijr 2024-06-14 15:02:43 +04:00
parent 3d4c6c7e9a
commit 1f48e676f2
3 changed files with 5 additions and 5 deletions

View File

@ -124,7 +124,7 @@
// menuStrip1
//
menuStrip1.ImageScalingSize = new Size(20, 20);
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem });
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчётыToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(1169, 28);
@ -133,7 +133,7 @@
//
// справочникиToolStripMenuItem
//
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, текстилиToolStripMenuItem });
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, текстилиToolStripMenuItem, магазиныToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
справочникиToolStripMenuItem.Size = new Size(117, 24);
справочникиToolStripMenuItem.Text = "Справочники";

View File

@ -20,7 +20,7 @@ namespace GarmentFactoryView
private readonly ILogger _logger;
private readonly IOrderLogic _orderLogic;
private readonly IReportLogic _reportLogic;
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
{
InitializeComponent();
_logger = logger;

View File

@ -8,7 +8,7 @@ using GarmentFactoryView;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
using GarmentFactoryBusinessLogic;
namespace GarmentFactory
{
@ -64,7 +64,7 @@ namespace GarmentFactory
services.AddTransient<FormShops>();
services.AddTransient<FormAddTextile>();
services.AddTransient<FormSellTextile>();
}
services.AddTransient<FormReportTextileComponents>();
services.AddTransient<FormReportOrders>();
}