устранение конфликтов 4 да сколько можно уже
This commit is contained in:
parent
233495f2aa
commit
9cf5678d12
@ -34,11 +34,12 @@
|
||||
this.manufacturesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.clientsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.implementersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.storesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.doWorkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.reportComponentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.reportManufactureComponentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.reportOrdersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.doWorkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.dataGridView = new System.Windows.Forms.DataGridView();
|
||||
this.buttonCreateOrder = new System.Windows.Forms.Button();
|
||||
this.buttonIssuedOrder = new System.Windows.Forms.Button();
|
||||
@ -49,6 +50,8 @@
|
||||
this.reportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.reportStoresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.reportManufacturesInStoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.button1 = new System.Windows.Forms.Button();
|
||||
this.button2 = new System.Windows.Forms.Button();
|
||||
this.menuStrip.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
@ -71,7 +74,8 @@
|
||||
this.componentsToolStripMenuItem,
|
||||
this.manufacturesToolStripMenuItem,
|
||||
this.clientsToolStripMenuItem,
|
||||
this.implementersToolStripMenuItem});
|
||||
this.implementersToolStripMenuItem,
|
||||
this.storesToolStripMenuItem});
|
||||
this.refbooksToolStripMenuItem.Name = "refbooksToolStripMenuItem";
|
||||
this.refbooksToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
|
||||
this.refbooksToolStripMenuItem.Text = "Справочники";
|
||||
@ -90,7 +94,7 @@
|
||||
this.manufacturesToolStripMenuItem.Text = "Изделия";
|
||||
this.manufacturesToolStripMenuItem.Click += new System.EventHandler(this.ManufacturesToolStripMenuItem_Click);
|
||||
//
|
||||
// storesToolStripMenuItem
|
||||
// clientsToolStripMenuItem
|
||||
//
|
||||
this.clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
|
||||
this.clientsToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
@ -104,18 +108,24 @@
|
||||
this.implementersToolStripMenuItem.Text = "Исполнители";
|
||||
this.implementersToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click);
|
||||
//
|
||||
// storesToolStripMenuItem
|
||||
//
|
||||
this.storesToolStripMenuItem.Name = "storesToolStripMenuItem";
|
||||
this.storesToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.storesToolStripMenuItem.Text = "Магазины";
|
||||
this.storesToolStripMenuItem.Click += new System.EventHandler(this.StoresToolStripMenuItem_Click);
|
||||
//
|
||||
// reportsToolStripMenuItem
|
||||
//
|
||||
this.reportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.reportComponentsToolStripMenuItem,
|
||||
this.reportManufactureComponentsToolStripMenuItem,
|
||||
this.reportOrdersToolStripMenuItem,
|
||||
this.reportStoresToolStripMenuItem,
|
||||
this.reportManufacturesInStoreToolStripMenuItem,
|
||||
this.reportGroupOrdersToolStripMenuItem});
|
||||
this.reportToolStripMenuItem.Name = "reportToolStripMenuItem";
|
||||
this.reportToolStripMenuItem.Size = new System.Drawing.Size(51, 20);
|
||||
this.reportToolStripMenuItem.Text = "Отчет";
|
||||
this.reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
|
||||
this.reportsToolStripMenuItem.Size = new System.Drawing.Size(12, 20);
|
||||
//
|
||||
// doWorkToolStripMenuItem
|
||||
//
|
||||
this.doWorkToolStripMenuItem.Name = "doWorkToolStripMenuItem";
|
||||
this.doWorkToolStripMenuItem.Size = new System.Drawing.Size(92, 20);
|
||||
this.doWorkToolStripMenuItem.Text = "Запуск работ";
|
||||
this.doWorkToolStripMenuItem.Click += new System.EventHandler(this.DoWorkToolStripMenuItem_Click);
|
||||
//
|
||||
// reportComponentsToolStripMenuItem
|
||||
//
|
||||
@ -138,13 +148,6 @@
|
||||
this.reportOrdersToolStripMenuItem.Text = "Список заказов";
|
||||
this.reportOrdersToolStripMenuItem.Click += new System.EventHandler(this.ReportOrdersToolStripMenuItem_Click);
|
||||
//
|
||||
// doWorkToolStripMenuItem
|
||||
//
|
||||
this.doWorkToolStripMenuItem.Name = "doWorkToolStripMenuItem";
|
||||
this.doWorkToolStripMenuItem.Size = new System.Drawing.Size(92, 20);
|
||||
this.doWorkToolStripMenuItem.Text = "Запуск работ";
|
||||
this.doWorkToolStripMenuItem.Click += new System.EventHandler(this.DoWorkToolStripMenuItem_Click);
|
||||
//
|
||||
// dataGridView
|
||||
//
|
||||
this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
|
||||
@ -216,11 +219,58 @@
|
||||
this.reportGroupOrdersToolStripMenuItem.Text = "Заказы по датам";
|
||||
this.reportGroupOrdersToolStripMenuItem.Click += new System.EventHandler(this.ReportGroupOrdersToolStripMenuItem_Click);
|
||||
//
|
||||
// reportToolStripMenuItem
|
||||
//
|
||||
this.reportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.reportComponentsToolStripMenuItem,
|
||||
this.reportManufactureComponentsToolStripMenuItem,
|
||||
this.reportOrdersToolStripMenuItem,
|
||||
this.reportStoresToolStripMenuItem,
|
||||
this.reportManufacturesInStoreToolStripMenuItem,
|
||||
this.reportGroupOrdersToolStripMenuItem});
|
||||
this.reportToolStripMenuItem.Name = "reportToolStripMenuItem";
|
||||
this.reportToolStripMenuItem.Size = new System.Drawing.Size(51, 20);
|
||||
this.reportToolStripMenuItem.Text = "Отчет";
|
||||
//
|
||||
// reportStoresToolStripMenuItem
|
||||
//
|
||||
this.reportStoresToolStripMenuItem.Name = "reportStoresToolStripMenuItem";
|
||||
this.reportStoresToolStripMenuItem.Size = new System.Drawing.Size(218, 22);
|
||||
//
|
||||
// reportManufacturesInStoreToolStripMenuItem
|
||||
//
|
||||
this.reportManufacturesInStoreToolStripMenuItem.Name = "reportManufacturesInStoreToolStripMenuItem";
|
||||
this.reportManufacturesInStoreToolStripMenuItem.Size = new System.Drawing.Size(218, 22);
|
||||
//
|
||||
// button1
|
||||
//
|
||||
this.button1.Location = new System.Drawing.Point(1500, 143);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.RightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||
this.button1.Size = new System.Drawing.Size(283, 23);
|
||||
this.button1.TabIndex = 2;
|
||||
this.button1.Text = "Продать изделие";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
this.button1.Click += new System.EventHandler(this.ButtonSellManufacture_Click);
|
||||
//
|
||||
// button2
|
||||
//
|
||||
this.button2.Location = new System.Drawing.Point(1500, 114);
|
||||
this.button2.Name = "button2";
|
||||
this.button2.RightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||
this.button2.Size = new System.Drawing.Size(283, 23);
|
||||
this.button2.TabIndex = 2;
|
||||
this.button2.Text = "Пополнить магазин";
|
||||
this.button2.UseVisualStyleBackColor = true;
|
||||
this.button2.Click += new System.EventHandler(this.ButtonFillStore_Click);
|
||||
//
|
||||
// FormMain
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(1795, 504);
|
||||
this.Controls.Add(this.button2);
|
||||
this.Controls.Add(this.button1);
|
||||
this.Controls.Add(this.buttonRef);
|
||||
this.Controls.Add(this.buttonIssuedOrder);
|
||||
this.Controls.Add(this.buttonCreateOrder);
|
||||
@ -261,5 +311,8 @@
|
||||
private ToolStripMenuItem reportStoresToolStripMenuItem;
|
||||
private ToolStripMenuItem reportManufacturesInStoreToolStripMenuItem;
|
||||
private ToolStripMenuItem reportGroupOrdersToolStripMenuItem;
|
||||
private ToolStripMenuItem storesToolStripMenuItem;
|
||||
private Button button1;
|
||||
private Button button2;
|
||||
}
|
||||
}
|
||||
@ -229,5 +229,13 @@ namespace BlacksmithWorkshopView
|
||||
form.ShowDialog();
|
||||
}
|
||||
}
|
||||
private void StoresToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var service = Program.ServiceProvider?.GetService(typeof(FormStores));
|
||||
if (service is FormStores form)
|
||||
{
|
||||
form.ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -63,6 +63,10 @@ namespace BlacksmithWorkshopView
|
||||
services.AddTransient<FormClients>();
|
||||
services.AddTransient<FormImplementer>();
|
||||
services.AddTransient<FormImplementers>();
|
||||
services.AddTransient<FormStores>();
|
||||
services.AddTransient<FormStore>();
|
||||
services.AddTransient<FormSellManufacture>();
|
||||
services.AddTransient<FormFillStore>();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user