Pavel/ISEbd-21_Putilin_P.A._PrecastConcretePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Павел Путилин 2023-02-20 19:36:57 +04:00
parent 6a3efca511
commit f4cf5bf2ba
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PrecastConcretePlant/PrecastConcretePlant/FormComponents.Designer.cs generated
View File

@ -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);

20
PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs generated
View File

@ -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);

6
PrecastConcretePlant/PrecastConcretePlant/FormMain.cs
View File

@ -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)
{

1
PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.Designer.cs generated
View File

@ -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);

1
PrecastConcretePlant/PrecastConcretePlant/FormViewReinforced.cs
View File

@ -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;
}

2
PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs
View File

@ -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;