Sell form + sell operation fix

Confectionery/Confectionery/FormMain.Designer.cs

@@ -33,13 +33,14 @@
             this.ингредиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.пополнениеМагазинаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.dataGridView = new System.Windows.Forms.DataGridView();
             this.buttonCreateOrder = new System.Windows.Forms.Button();
             this.buttonTakeOrderInWork = new System.Windows.Forms.Button();
             this.buttonOrderReady = new System.Windows.Forms.Button();
             this.buttonIssuedOrder = new System.Windows.Forms.Button();
             this.buttonRef = new System.Windows.Forms.Button();
-            this.пополнениеМагазинаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списаниеToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
@@ -49,7 +50,8 @@
             this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.справочникиToolStripMenuItem,
-            this.пополнениеМагазинаToolStripMenuItem});
+            this.пополнениеМагазинаToolStripMenuItem,
+            this.списаниеToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
             this.menuStrip1.Size = new System.Drawing.Size(1238, 28);
@@ -87,6 +89,13 @@
             this.магазиныToolStripMenuItem.Text = "Магазины";
             this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
             // 
+            // пополнениеМагазинаToolStripMenuItem
+            // 
+            this.пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
+            this.пополнениеМагазинаToolStripMenuItem.Size = new System.Drawing.Size(182, 24);
+            this.пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина";
+            this.пополнениеМагазинаToolStripMenuItem.Click += new System.EventHandler(this.пополнениеМагазинаToolStripMenuItem_Click);
+            // 
             // dataGridView
             // 
             this.dataGridView.BackgroundColor = System.Drawing.Color.White;
@@ -150,12 +159,12 @@
             this.buttonRef.UseVisualStyleBackColor = true;
             this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
             // 
-            // пополнениеМагазинаToolStripMenuItem
+            // списаниеToolStripMenuItem
             // 
-            this.пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
+            this.списаниеToolStripMenuItem.Name = "списаниеToolStripMenuItem";
-            this.пополнениеМагазинаToolStripMenuItem.Size = new System.Drawing.Size(182, 24);
+            this.списаниеToolStripMenuItem.Size = new System.Drawing.Size(91, 24);
-            this.пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина";
+            this.списаниеToolStripMenuItem.Text = "Списание";
-            this.пополнениеМагазинаToolStripMenuItem.Click += new System.EventHandler(this.пополнениеМагазинаToolStripMenuItem_Click);
+            this.списаниеToolStripMenuItem.Click += new System.EventHandler(this.списаниеToolStripMenuItem_Click);
             // 
             // FormMain
             // 
@@ -195,5 +204,6 @@
         private Button buttonRef;
         private ToolStripMenuItem магазиныToolStripMenuItem;
         private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem;
+        private ToolStripMenuItem списаниеToolStripMenuItem;
     }
 }

Confectionery/Confectionery/FormMain.cs

@@ -170,5 +170,14 @@ namespace Confectionery
                 form.ShowDialog();
             }
         }
+
+        private void списаниеToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSell));
+            if (service is FormSell form)
+            {
+                form.ShowDialog();
+            }
+        }
     }
 }

Confectionery/Confectionery/FormSell.Designer.cs

@@ -0,0 +1,120 @@
+namespace Confectionery
+{
+    partial class FormSell
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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()
+        {
+            this.comboBoxPastry = new System.Windows.Forms.ComboBox();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonCreate = new System.Windows.Forms.Button();
+            this.textBoxSum = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // comboBoxPastry
+            // 
+            this.comboBoxPastry.FormattingEnabled = true;
+            this.comboBoxPastry.Location = new System.Drawing.Point(129, 6);
+            this.comboBoxPastry.Name = "comboBoxPastry";
+            this.comboBoxPastry.Size = new System.Drawing.Size(219, 28);
+            this.comboBoxPastry.TabIndex = 22;
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(254, 92);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
+            this.buttonCancel.TabIndex = 21;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonCreate
+            // 
+            this.buttonCreate.Location = new System.Drawing.Point(142, 92);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(94, 29);
+            this.buttonCreate.TabIndex = 20;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
+            // 
+            // textBoxSum
+            // 
+            this.textBoxSum.Location = new System.Drawing.Point(129, 46);
+            this.textBoxSum.Name = "textBoxSum";
+            this.textBoxSum.Size = new System.Drawing.Size(219, 27);
+            this.textBoxSum.TabIndex = 19;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(12, 49);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(93, 20);
+            this.label3.TabIndex = 18;
+            this.label3.Text = "Количество:";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(12, 9);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(71, 20);
+            this.label2.TabIndex = 17;
+            this.label2.Text = "Изделие:";
+            // 
+            // FormSell
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(360, 129);
+            this.Controls.Add(this.comboBoxPastry);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.textBoxSum);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.label2);
+            this.Name = "FormSell";
+            this.Text = "Продажа";
+            this.Load += new System.EventHandler(this.FormSell_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private ComboBox comboBoxPastry;
+        private Button buttonCancel;
+        private Button buttonCreate;
+        private TextBox textBoxSum;
+        private Label label3;
+        private Label label2;
+    }
+}

Confectionery/Confectionery/FormSell.cs

@@ -0,0 +1,82 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BusinessLogicsContracts;
+using ConfectioneryContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Confectionery
+{
+    public partial class FormSell : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IPastryLogic _logicP;
+        private readonly IShopLogic _logicS;
+        private List<PastryViewModel>? _listPastry;
+        public FormSell(ILogger<FormSell> logger, IPastryLogic logicP, IShopLogic logicS)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicP = logicP;
+            _logicS = logicS;
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+        private void buttonCreate_Click(object sender, EventArgs e)
+        {
+            if (comboBoxPastry.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (String.IsNullOrEmpty(textBoxSum.Text))
+            {
+                MessageBox.Show("Заполните поле количество!", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            try
+            {
+                int count = Convert.ToInt32(textBoxSum.Text);
+                bool operationResult = _logicS.Sell(Convert.ToInt32(comboBoxPastry.SelectedValue), count);
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
+                }
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                DialogResult = DialogResult.OK;
+                Close();
+
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка создания поставки!");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void FormSell_Load(object sender, EventArgs e)
+        {
+            _logger.LogInformation("Загрузка изделий для поставки");
+            _listPastry = _logicP.ReadList(null);
+            if (_listPastry != null)
+            {
+                comboBoxPastry.DisplayMember = "PastryName";
+                comboBoxPastry.ValueMember = "Id";
+                comboBoxPastry.DataSource = _listPastry;
+                comboBoxPastry.SelectedItem = null;
+            }
+        }
+    }
+}

Confectionery/Confectionery/FormSell.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Confectionery/Confectionery/Program.cs

@@ -53,6 +53,7 @@ namespace Confectionery
             services.AddTransient<FormShop>();
             services.AddTransient<FormShops>();
             services.AddTransient<FormDelivery>();
+            services.AddTransient<FormSell>();
         }
     }
 }

Confectionery/ConfectioneryBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -161,5 +161,10 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
             });
             return true;
         }
+
+        public bool Sell(int pastryId, int count)
+        {
+            return _shopStorage.Sell(pastryId, count);
+        }
     }
 }

Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -18,5 +18,6 @@ namespace ConfectioneryContracts.BusinessLogicsContracts
         bool Update(ShopBindingModel model);
         bool Delete(ShopBindingModel model);
         bool DeliverPastryToShop(ShopBindingModel shopModel, IPastryModel pastryModel, int count);
+        bool Sell(int pastryId, int count);
     }
 }

Confectionery/ConfectioneryFileImplements/Implements/ShopStorage.cs

@@ -150,8 +150,8 @@ namespace ConfectioneryFileImplement.Implements
                 }
                 else
                 {
-                    count = 0;
                     shop.Pastries[pastryId] -= count;
+                    count = 0;
                     shop.setShopPastriesNull();
                 }
                 if (count == 0)