зафиксировать
This commit is contained in:
parent
028fe4a232
commit
b494621750
@ -20,144 +20,151 @@
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
labelName = new Label();
|
||||
labelCount = new Label();
|
||||
labelSum = new Label();
|
||||
TextBoxCount = new TextBox();
|
||||
ComboBoxManufacture = new ComboBox();
|
||||
TextBoxSum = new TextBox();
|
||||
buttonCancel = new Button();
|
||||
buttonSave = new Button();
|
||||
labelClient = new Label();
|
||||
ComboBoxClient = new ComboBox();
|
||||
SuspendLayout();
|
||||
//
|
||||
// labelName
|
||||
//
|
||||
labelName.AutoSize = true;
|
||||
labelName.Location = new Point(22, 17);
|
||||
labelName.Name = "labelName";
|
||||
labelName.Size = new Size(56, 15);
|
||||
labelName.TabIndex = 0;
|
||||
labelName.Text = "Изделие:";
|
||||
//
|
||||
// labelCount
|
||||
//
|
||||
labelCount.AutoSize = true;
|
||||
labelCount.Location = new Point(22, 46);
|
||||
labelCount.Name = "labelCount";
|
||||
labelCount.Size = new Size(75, 15);
|
||||
labelCount.TabIndex = 1;
|
||||
labelCount.Text = "Количество:";
|
||||
//
|
||||
// labelSum
|
||||
//
|
||||
labelSum.AutoSize = true;
|
||||
labelSum.Location = new Point(22, 104);
|
||||
labelSum.Name = "labelSum";
|
||||
labelSum.Size = new Size(48, 15);
|
||||
labelSum.TabIndex = 2;
|
||||
labelSum.Text = "Сумма:";
|
||||
//
|
||||
// TextBoxCount
|
||||
//
|
||||
TextBoxCount.Location = new Point(125, 43);
|
||||
TextBoxCount.Name = "TextBoxCount";
|
||||
TextBoxCount.Size = new Size(214, 23);
|
||||
TextBoxCount.TabIndex = 3;
|
||||
TextBoxCount.TextChanged += TextBoxCount_TextChanged;
|
||||
//
|
||||
// ComboBoxManufacture
|
||||
//
|
||||
ComboBoxManufacture.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
ComboBoxManufacture.FormattingEnabled = true;
|
||||
ComboBoxManufacture.Location = new Point(125, 14);
|
||||
ComboBoxManufacture.Name = "ComboBoxManufacture";
|
||||
ComboBoxManufacture.Size = new Size(214, 23);
|
||||
ComboBoxManufacture.TabIndex = 4;
|
||||
ComboBoxManufacture.SelectedIndexChanged += ComboBoxManufacture_SelectedIndexChanged;
|
||||
//
|
||||
// TextBoxSum
|
||||
//
|
||||
TextBoxSum.Location = new Point(125, 101);
|
||||
TextBoxSum.Name = "TextBoxSum";
|
||||
TextBoxSum.ReadOnly = true;
|
||||
TextBoxSum.Size = new Size(214, 23);
|
||||
TextBoxSum.TabIndex = 5;
|
||||
TextBoxSum.TextChanged += TextBoxSum_TextChanged;
|
||||
//
|
||||
// buttonCancel
|
||||
//
|
||||
buttonCancel.Location = new Point(262, 130);
|
||||
buttonCancel.Name = "buttonCancel";
|
||||
buttonCancel.Size = new Size(77, 24);
|
||||
buttonCancel.TabIndex = 6;
|
||||
buttonCancel.Text = "Отмена";
|
||||
buttonCancel.UseVisualStyleBackColor = true;
|
||||
buttonCancel.Click += CancelButton_Click;
|
||||
//
|
||||
// buttonSave
|
||||
//
|
||||
buttonSave.Location = new Point(179, 130);
|
||||
buttonSave.Name = "buttonSave";
|
||||
buttonSave.Size = new Size(77, 24);
|
||||
buttonSave.TabIndex = 7;
|
||||
buttonSave.Text = "Сохранить";
|
||||
buttonSave.UseVisualStyleBackColor = true;
|
||||
buttonSave.Click += SaveButton_Click;
|
||||
//
|
||||
// labelClient
|
||||
//
|
||||
labelClient.AutoSize = true;
|
||||
labelClient.Location = new Point(22, 75);
|
||||
labelClient.Name = "labelClient";
|
||||
labelClient.Size = new Size(49, 15);
|
||||
labelClient.TabIndex = 8;
|
||||
labelClient.Text = "Клиент:";
|
||||
//
|
||||
// ComboBoxClient
|
||||
//
|
||||
ComboBoxClient.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
ComboBoxClient.FormattingEnabled = true;
|
||||
ComboBoxClient.Location = new Point(125, 72);
|
||||
ComboBoxClient.Name = "ComboBoxClient";
|
||||
ComboBoxClient.Size = new Size(214, 23);
|
||||
ComboBoxClient.TabIndex = 9;
|
||||
//
|
||||
// FormCreateOrder
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(349, 166);
|
||||
Controls.Add(ComboBoxClient);
|
||||
Controls.Add(labelClient);
|
||||
Controls.Add(buttonSave);
|
||||
Controls.Add(buttonCancel);
|
||||
Controls.Add(TextBoxSum);
|
||||
Controls.Add(ComboBoxManufacture);
|
||||
Controls.Add(TextBoxCount);
|
||||
Controls.Add(labelSum);
|
||||
Controls.Add(labelCount);
|
||||
Controls.Add(labelName);
|
||||
Name = "FormCreateOrder";
|
||||
StartPosition = FormStartPosition.CenterParent;
|
||||
Text = "Заказ";
|
||||
Load += FormCreateOrder_Load;
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
labelName = new Label();
|
||||
labelCount = new Label();
|
||||
labelSum = new Label();
|
||||
TextBoxCount = new TextBox();
|
||||
ComboBoxManufacture = new ComboBox();
|
||||
TextBoxSum = new TextBox();
|
||||
buttonCancel = new Button();
|
||||
buttonSave = new Button();
|
||||
labelClient = new Label();
|
||||
ComboBoxClient = new ComboBox();
|
||||
SuspendLayout();
|
||||
//
|
||||
// labelName
|
||||
//
|
||||
labelName.AutoSize = true;
|
||||
labelName.Location = new Point(25, 23);
|
||||
labelName.Name = "labelName";
|
||||
labelName.Size = new Size(71, 20);
|
||||
labelName.TabIndex = 0;
|
||||
labelName.Text = "Изделие:";
|
||||
//
|
||||
// labelCount
|
||||
//
|
||||
labelCount.AutoSize = true;
|
||||
labelCount.Location = new Point(25, 61);
|
||||
labelCount.Name = "labelCount";
|
||||
labelCount.Size = new Size(93, 20);
|
||||
labelCount.TabIndex = 1;
|
||||
labelCount.Text = "Количество:";
|
||||
//
|
||||
// labelSum
|
||||
//
|
||||
labelSum.AutoSize = true;
|
||||
labelSum.Location = new Point(25, 139);
|
||||
labelSum.Name = "labelSum";
|
||||
labelSum.Size = new Size(58, 20);
|
||||
labelSum.TabIndex = 2;
|
||||
labelSum.Text = "Сумма:";
|
||||
//
|
||||
// TextBoxCount
|
||||
//
|
||||
TextBoxCount.Location = new Point(143, 57);
|
||||
TextBoxCount.Margin = new Padding(3, 4, 3, 4);
|
||||
TextBoxCount.Name = "TextBoxCount";
|
||||
TextBoxCount.Size = new Size(244, 27);
|
||||
TextBoxCount.TabIndex = 3;
|
||||
TextBoxCount.TextChanged += TextBoxCount_TextChanged;
|
||||
//
|
||||
// ComboBoxManufacture
|
||||
//
|
||||
ComboBoxManufacture.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
ComboBoxManufacture.FormattingEnabled = true;
|
||||
ComboBoxManufacture.Location = new Point(143, 19);
|
||||
ComboBoxManufacture.Margin = new Padding(3, 4, 3, 4);
|
||||
ComboBoxManufacture.Name = "ComboBoxManufacture";
|
||||
ComboBoxManufacture.Size = new Size(244, 28);
|
||||
ComboBoxManufacture.TabIndex = 4;
|
||||
ComboBoxManufacture.SelectedIndexChanged += ComboBoxManufacture_SelectedIndexChanged;
|
||||
//
|
||||
// TextBoxSum
|
||||
//
|
||||
TextBoxSum.Location = new Point(143, 135);
|
||||
TextBoxSum.Margin = new Padding(3, 4, 3, 4);
|
||||
TextBoxSum.Name = "TextBoxSum";
|
||||
TextBoxSum.ReadOnly = true;
|
||||
TextBoxSum.Size = new Size(244, 27);
|
||||
TextBoxSum.TabIndex = 5;
|
||||
TextBoxSum.TextChanged += TextBoxSum_TextChanged;
|
||||
//
|
||||
// buttonCancel
|
||||
//
|
||||
buttonCancel.Location = new Point(299, 173);
|
||||
buttonCancel.Margin = new Padding(3, 4, 3, 4);
|
||||
buttonCancel.Name = "buttonCancel";
|
||||
buttonCancel.Size = new Size(88, 32);
|
||||
buttonCancel.TabIndex = 6;
|
||||
buttonCancel.Text = "Отмена";
|
||||
buttonCancel.UseVisualStyleBackColor = true;
|
||||
buttonCancel.Click += CancelButton_Click;
|
||||
//
|
||||
// buttonSave
|
||||
//
|
||||
buttonSave.Location = new Point(200, 173);
|
||||
buttonSave.Margin = new Padding(3, 4, 3, 4);
|
||||
buttonSave.Name = "buttonSave";
|
||||
buttonSave.Size = new Size(93, 32);
|
||||
buttonSave.TabIndex = 7;
|
||||
buttonSave.Text = "Сохранить";
|
||||
buttonSave.UseVisualStyleBackColor = true;
|
||||
buttonSave.Click += SaveButton_Click;
|
||||
//
|
||||
// labelClient
|
||||
//
|
||||
labelClient.AutoSize = true;
|
||||
labelClient.Location = new Point(25, 100);
|
||||
labelClient.Name = "labelClient";
|
||||
labelClient.Size = new Size(61, 20);
|
||||
labelClient.TabIndex = 8;
|
||||
labelClient.Text = "Клиент:";
|
||||
//
|
||||
// ComboBoxClient
|
||||
//
|
||||
ComboBoxClient.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
ComboBoxClient.FormattingEnabled = true;
|
||||
ComboBoxClient.Location = new Point(143, 96);
|
||||
ComboBoxClient.Margin = new Padding(3, 4, 3, 4);
|
||||
ComboBoxClient.Name = "ComboBoxClient";
|
||||
ComboBoxClient.Size = new Size(244, 28);
|
||||
ComboBoxClient.TabIndex = 9;
|
||||
//
|
||||
// FormCreateOrder
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(399, 221);
|
||||
Controls.Add(ComboBoxClient);
|
||||
Controls.Add(labelClient);
|
||||
Controls.Add(buttonSave);
|
||||
Controls.Add(buttonCancel);
|
||||
Controls.Add(TextBoxSum);
|
||||
Controls.Add(ComboBoxManufacture);
|
||||
Controls.Add(TextBoxCount);
|
||||
Controls.Add(labelSum);
|
||||
Controls.Add(labelCount);
|
||||
Controls.Add(labelName);
|
||||
Margin = new Padding(3, 4, 3, 4);
|
||||
Name = "FormCreateOrder";
|
||||
StartPosition = FormStartPosition.CenterParent;
|
||||
Text = "Заказ";
|
||||
Load += FormCreateOrder_Load;
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
private Label labelName;
|
||||
private Label labelName;
|
||||
private Label labelCount;
|
||||
private Label labelSum;
|
||||
private TextBox TextBoxCount;
|
||||
|
||||
@ -61,6 +61,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
|
||||
try
|
||||
{
|
||||
_logger.LogDebug("DoWork. Worker {Id} try get order { Order}", implementer.Id, order.Id);
|
||||
|
||||
// пытаемся назначить заказ на исполнителя
|
||||
_orderLogic.TakeOrderInWork(new OrderBindingModel
|
||||
{
|
||||
@ -70,6 +71,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
|
||||
// делаем работу
|
||||
Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
|
||||
_logger.LogDebug("DoWork. Worker {Id} finish order { Order}", implementer.Id, order.Id);
|
||||
|
||||
_orderLogic.FinishOrder(new OrderBindingModel
|
||||
{
|
||||
Id = order.Id
|
||||
|
||||
@ -6,5 +6,5 @@
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"IPAddress": "http://localhost:5230"
|
||||
"IPAddress": "http://localhost:5230/"
|
||||
}
|
||||
@ -15,7 +15,7 @@ namespace BlacksmithWorkshopDatabaseImplement
|
||||
{
|
||||
if (optionsBuilder.IsConfigured == false)
|
||||
{
|
||||
optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=BlacksmithWorkshopDataBase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
|
||||
optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=BlacksmithWorkshopDataBase6;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
|
||||
}
|
||||
base.OnConfiguring(optionsBuilder);
|
||||
}
|
||||
|
||||
@ -21,10 +21,6 @@
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Controllers\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\BlacksmithWorkshopBusinessLogic\BlacksmithWorkshopBusinessLogic.csproj" />
|
||||
<ProjectReference Include="..\BlacksmithWorkshopDatabaseImplement\BlacksmithWorkshopDatabaseImplement.csproj" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user