From f4cf5bf2bae0d343ba560c669d1cdb1c68398630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=9F=D1=83=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=D0=BD?= Date: Mon, 20 Feb 2023 19:36:57 +0400 Subject: [PATCH] fix --- .../FormComponents.Designer.cs | 1 + .../PrecastConcretePlant/FormMain.Designer.cs | 20 +++++++++---------- .../PrecastConcretePlant/FormMain.cs | 6 +++--- .../FormViewReinforced.Designer.cs | 1 + .../FormViewReinforced.cs | 1 + .../OrderLogic.cs | 2 -- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormComponents.Designer.cs b/PrecastConcretePlant/PrecastConcretePlant/FormComponents.Designer.cs index 293e0fe..cbc6613 100644 --- a/PrecastConcretePlant/PrecastConcretePlant/FormComponents.Designer.cs +++ b/PrecastConcretePlant/PrecastConcretePlant/FormComponents.Designer.cs @@ -104,6 +104,7 @@ this.Controls.Add(this.dataGridView); this.Name = "FormComponents"; this.Text = "FormComponents"; + this.Load += new System.EventHandler(this.FormComponents_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs b/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs index a090765..a2e34f9 100644 --- a/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs +++ b/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs @@ -45,7 +45,7 @@ // buttonRef // this.buttonRef.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRef.Location = new System.Drawing.Point(610, 294); + this.buttonRef.Location = new System.Drawing.Point(823, 294); this.buttonRef.Name = "buttonRef"; this.buttonRef.Size = new System.Drawing.Size(147, 32); this.buttonRef.TabIndex = 12; @@ -56,7 +56,7 @@ // buttonFinish // this.buttonFinish.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonFinish.Location = new System.Drawing.Point(610, 235); + this.buttonFinish.Location = new System.Drawing.Point(823, 235); this.buttonFinish.Name = "buttonFinish"; this.buttonFinish.Size = new System.Drawing.Size(147, 32); this.buttonFinish.TabIndex = 11; @@ -67,7 +67,7 @@ // buttonReady // this.buttonReady.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonReady.Location = new System.Drawing.Point(610, 177); + this.buttonReady.Location = new System.Drawing.Point(823, 177); this.buttonReady.Name = "buttonReady"; this.buttonReady.Size = new System.Drawing.Size(147, 32); this.buttonReady.TabIndex = 10; @@ -78,7 +78,7 @@ // buttonTakeOrderInWork // this.buttonTakeOrderInWork.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonTakeOrderInWork.Location = new System.Drawing.Point(610, 118); + this.buttonTakeOrderInWork.Location = new System.Drawing.Point(823, 118); this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; this.buttonTakeOrderInWork.Size = new System.Drawing.Size(147, 32); this.buttonTakeOrderInWork.TabIndex = 9; @@ -89,7 +89,7 @@ // buttonCreateOrder // this.buttonCreateOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonCreateOrder.Location = new System.Drawing.Point(610, 59); + this.buttonCreateOrder.Location = new System.Drawing.Point(823, 59); this.buttonCreateOrder.Name = "buttonCreateOrder"; this.buttonCreateOrder.Size = new System.Drawing.Size(147, 32); this.buttonCreateOrder.TabIndex = 8; @@ -106,7 +106,7 @@ this.dataGridView.Location = new System.Drawing.Point(12, 29); this.dataGridView.Name = "dataGridView"; this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(592, 348); + this.dataGridView.Size = new System.Drawing.Size(805, 348); this.dataGridView.TabIndex = 7; // // menuStrip1 @@ -115,7 +115,7 @@ this.справочникиToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(786, 24); + this.menuStrip1.Size = new System.Drawing.Size(999, 24); this.menuStrip1.TabIndex = 13; this.menuStrip1.Text = "menuStrip1"; // @@ -131,14 +131,14 @@ // reinforcedToolStripMenuItem // this.reinforcedToolStripMenuItem.Name = "reinforcedToolStripMenuItem"; - this.reinforcedToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.reinforcedToolStripMenuItem.Size = new System.Drawing.Size(145, 22); this.reinforcedToolStripMenuItem.Text = "Изделия"; this.reinforcedToolStripMenuItem.Click += new System.EventHandler(this.ReinforcedToolStripMenuItem_Click); // // componentToolStripMenuItem // this.componentToolStripMenuItem.Name = "componentToolStripMenuItem"; - this.componentToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.componentToolStripMenuItem.Size = new System.Drawing.Size(145, 22); this.componentToolStripMenuItem.Text = "Компоненты"; this.componentToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click); // @@ -146,7 +146,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(786, 389); + this.ClientSize = new System.Drawing.Size(999, 389); this.Controls.Add(this.menuStrip1); this.Controls.Add(this.buttonRef); this.Controls.Add(this.buttonFinish); diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs b/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs index 4f024b5..6961b10 100644 --- a/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs +++ b/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs @@ -29,7 +29,8 @@ namespace PrecastConcretePlantView if (list != null) { dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["Id"].HeaderText = "Номер заказа"; + dataGridView.Columns["ReinforcedId"].Visible = false; dataGridView.Columns["ReinforcedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } @@ -105,8 +106,7 @@ namespace PrecastConcretePlantView { var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { - Id = id, - Status = orderStatus + Id = id }); if (!operationResult) { diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.Designer.cs b/PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.Designer.cs index 83bed6f..7b4f17b 100644 --- a/PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.Designer.cs +++ b/PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.Designer.cs @@ -104,6 +104,7 @@ this.Controls.Add(this.dataGridView); this.Name = "FormViewReinforced"; this.Text = "FormViewReinforced"; + this.Load += new System.EventHandler(this.FormViewReinforced_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.cs b/PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.cs index 48d7799..29a50ab 100644 --- a/PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.cs +++ b/PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.cs @@ -28,6 +28,7 @@ namespace PrecastConcretePlantView { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["ReinforcedComponents"].Visible = false; dataGridView.Columns["ReinforcedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs index c4e598a..b40d4ad 100644 --- a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs +++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs @@ -95,8 +95,6 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic nameof(vmodel)); } model.Status = orderStatus; - model.Status = orderStatus; - model.DateCreate = vmodel.DateCreate; model.ReinforcedId = vmodel.ReinforcedId; model.Sum = vmodel.Sum; model.Count = vmodel.Count;