2 Commits 88112a851a ... df7bab5e44

Auteur SHA1 Bericht Datum
  temamironovonline df7bab5e44 Merge branch 'master' of http://www.gogs.ngknn.ru:3000/temamironovonline/PP 2 jaren geleden
  temamironovonline d2e3475e15 ready prog 2 jaren geleden

BIN
Transportation.exe — ярлык.lnk


+ 4 - 0
Transportation/AddDriver.Designer.cs

@@ -267,6 +267,10 @@ namespace Transportation
             this.Controls.Add(this.label1);
             this.Controls.Add(this.SurnameDriverTB);
             this.Controls.Add(this.label2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(812, 383);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(812, 383);
             this.Name = "AddDriver";
             this.Text = "Добавление водителя";
             this.Load += new System.EventHandler(this.AddDriver_Load);

+ 5 - 1
Transportation/AddExecutor.Designer.cs

@@ -111,7 +111,7 @@ namespace Transportation
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(643, 152);
+            this.ClientSize = new System.Drawing.Size(643, 142);
             this.Controls.Add(this.AddBTN);
             this.Controls.Add(this.label4);
             this.Controls.Add(this.MidnameExecutorTB);
@@ -120,6 +120,10 @@ namespace Transportation
             this.Controls.Add(this.label1);
             this.Controls.Add(this.SurnameExecutorTB);
             this.Controls.Add(this.label2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(661, 189);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(661, 189);
             this.Name = "AddExecutor";
             this.Text = "Добавление исполнителя";
             this.ResumeLayout(false);

+ 5 - 1
Transportation/AddLogistician.Designer.cs

@@ -206,7 +206,7 @@ namespace Transportation
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 297);
+            this.ClientSize = new System.Drawing.Size(794, 293);
             this.Controls.Add(this.AddBTN);
             this.Controls.Add(this.TelephoneLogisticianMTB);
             this.Controls.Add(this.label11);
@@ -225,6 +225,10 @@ namespace Transportation
             this.Controls.Add(this.label1);
             this.Controls.Add(this.SurnameLogisticianTB);
             this.Controls.Add(this.label2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(812, 340);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(812, 340);
             this.Name = "AddLogistician";
             this.Text = "Добавление логиста";
             this.Load += new System.EventHandler(this.AddLogistician_Load);

+ 4 - 0
Transportation/AddRequest.Designer.cs

@@ -451,6 +451,10 @@ namespace Transportation
             this.Controls.Add(this.ExecutorsCB);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.label2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(1277, 574);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(1277, 574);
             this.Name = "AddRequest";
             this.Text = "Добавление заявки";
             this.Load += new System.EventHandler(this.AddRequest_Load);

+ 5 - 1
Transportation/AddVehicle.Designer.cs

@@ -290,7 +290,7 @@ namespace Transportation
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(509, 258);
+            this.ClientSize = new System.Drawing.Size(515, 260);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.label8);
@@ -311,6 +311,10 @@ namespace Transportation
             this.Controls.Add(this.ModelTB);
             this.Controls.Add(this.BrandTB);
             this.Controls.Add(this.ExecutorsCB);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(533, 307);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(533, 307);
             this.Name = "AddVehicle";
             this.Text = "Добавление автомобиля";
             this.Load += new System.EventHandler(this.AddVehicle_Load);

+ 26 - 22
Transportation/MainMenu.Designer.cs

@@ -95,7 +95,7 @@ namespace Transportation
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(899, 518);
+            this.tabControl1.Size = new System.Drawing.Size(1197, 627);
             this.tabControl1.TabIndex = 0;
             // 
             // VehiclesTP
@@ -106,7 +106,7 @@ namespace Transportation
             this.VehiclesTP.Location = new System.Drawing.Point(4, 25);
             this.VehiclesTP.Name = "VehiclesTP";
             this.VehiclesTP.Padding = new System.Windows.Forms.Padding(3);
-            this.VehiclesTP.Size = new System.Drawing.Size(891, 489);
+            this.VehiclesTP.Size = new System.Drawing.Size(1189, 598);
             this.VehiclesTP.TabIndex = 0;
             this.VehiclesTP.Text = "Автомобили";
             this.VehiclesTP.UseVisualStyleBackColor = true;
@@ -116,9 +116,9 @@ namespace Transportation
             this.SortingGB.Controls.Add(this.label1);
             this.SortingGB.Controls.Add(this.volume);
             this.SortingGB.Controls.Add(this.check);
-            this.SortingGB.Location = new System.Drawing.Point(718, 31);
+            this.SortingGB.Location = new System.Drawing.Point(1016, 31);
             this.SortingGB.Name = "SortingGB";
-            this.SortingGB.Size = new System.Drawing.Size(165, 455);
+            this.SortingGB.Size = new System.Drawing.Size(165, 564);
             this.SortingGB.TabIndex = 2;
             this.SortingGB.TabStop = false;
             this.SortingGB.Text = "Сортировка";
@@ -168,7 +168,7 @@ namespace Transportation
             this.VehiclesDGV.Name = "VehiclesDGV";
             this.VehiclesDGV.RowHeadersWidth = 51;
             this.VehiclesDGV.RowTemplate.Height = 24;
-            this.VehiclesDGV.Size = new System.Drawing.Size(709, 455);
+            this.VehiclesDGV.Size = new System.Drawing.Size(1007, 564);
             this.VehiclesDGV.TabIndex = 1;
             // 
             // menuStrip1
@@ -180,7 +180,7 @@ namespace Transportation
             this.DropVehicleTSMI});
             this.menuStrip1.Location = new System.Drawing.Point(3, 3);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(885, 28);
+            this.menuStrip1.Size = new System.Drawing.Size(1183, 28);
             this.menuStrip1.TabIndex = 0;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -212,7 +212,7 @@ namespace Transportation
             this.DriversTP.Location = new System.Drawing.Point(4, 25);
             this.DriversTP.Name = "DriversTP";
             this.DriversTP.Padding = new System.Windows.Forms.Padding(3);
-            this.DriversTP.Size = new System.Drawing.Size(891, 489);
+            this.DriversTP.Size = new System.Drawing.Size(1189, 598);
             this.DriversTP.TabIndex = 1;
             this.DriversTP.Text = "Водители";
             this.DriversTP.UseVisualStyleBackColor = true;
@@ -225,7 +225,7 @@ namespace Transportation
             this.DriversDGV.Name = "DriversDGV";
             this.DriversDGV.RowHeadersWidth = 51;
             this.DriversDGV.RowTemplate.Height = 24;
-            this.DriversDGV.Size = new System.Drawing.Size(885, 455);
+            this.DriversDGV.Size = new System.Drawing.Size(1183, 564);
             this.DriversDGV.TabIndex = 3;
             // 
             // menuStrip2
@@ -237,7 +237,7 @@ namespace Transportation
             this.DropDriverTSMI});
             this.menuStrip2.Location = new System.Drawing.Point(3, 3);
             this.menuStrip2.Name = "menuStrip2";
-            this.menuStrip2.Size = new System.Drawing.Size(885, 28);
+            this.menuStrip2.Size = new System.Drawing.Size(1183, 28);
             this.menuStrip2.TabIndex = 2;
             this.menuStrip2.Text = "menuStrip2";
             // 
@@ -268,7 +268,7 @@ namespace Transportation
             this.ExecutorsTP.Controls.Add(this.menuStrip3);
             this.ExecutorsTP.Location = new System.Drawing.Point(4, 25);
             this.ExecutorsTP.Name = "ExecutorsTP";
-            this.ExecutorsTP.Size = new System.Drawing.Size(891, 489);
+            this.ExecutorsTP.Size = new System.Drawing.Size(1189, 598);
             this.ExecutorsTP.TabIndex = 2;
             this.ExecutorsTP.Text = "Исполнители";
             this.ExecutorsTP.UseVisualStyleBackColor = true;
@@ -281,7 +281,7 @@ namespace Transportation
             this.ExecutorsDGV.Name = "ExecutorsDGV";
             this.ExecutorsDGV.RowHeadersWidth = 51;
             this.ExecutorsDGV.RowTemplate.Height = 24;
-            this.ExecutorsDGV.Size = new System.Drawing.Size(885, 461);
+            this.ExecutorsDGV.Size = new System.Drawing.Size(1186, 570);
             this.ExecutorsDGV.TabIndex = 5;
             // 
             // menuStrip3
@@ -293,7 +293,7 @@ namespace Transportation
             this.DropExecutorTSMI});
             this.menuStrip3.Location = new System.Drawing.Point(0, 0);
             this.menuStrip3.Name = "menuStrip3";
-            this.menuStrip3.Size = new System.Drawing.Size(891, 28);
+            this.menuStrip3.Size = new System.Drawing.Size(1189, 28);
             this.menuStrip3.TabIndex = 4;
             this.menuStrip3.Text = "menuStrip3";
             // 
@@ -324,7 +324,7 @@ namespace Transportation
             this.LogisticiansTP.Controls.Add(this.menuStrip4);
             this.LogisticiansTP.Location = new System.Drawing.Point(4, 25);
             this.LogisticiansTP.Name = "LogisticiansTP";
-            this.LogisticiansTP.Size = new System.Drawing.Size(891, 489);
+            this.LogisticiansTP.Size = new System.Drawing.Size(1189, 598);
             this.LogisticiansTP.TabIndex = 3;
             this.LogisticiansTP.Text = "Логисты";
             this.LogisticiansTP.UseVisualStyleBackColor = true;
@@ -337,7 +337,7 @@ namespace Transportation
             this.LogisticiansDGV.Name = "LogisticiansDGV";
             this.LogisticiansDGV.RowHeadersWidth = 51;
             this.LogisticiansDGV.RowTemplate.Height = 24;
-            this.LogisticiansDGV.Size = new System.Drawing.Size(885, 461);
+            this.LogisticiansDGV.Size = new System.Drawing.Size(1186, 570);
             this.LogisticiansDGV.TabIndex = 6;
             // 
             // menuStrip4
@@ -349,7 +349,7 @@ namespace Transportation
             this.DropLogisticianTSMI});
             this.menuStrip4.Location = new System.Drawing.Point(0, 0);
             this.menuStrip4.Name = "menuStrip4";
-            this.menuStrip4.Size = new System.Drawing.Size(891, 28);
+            this.menuStrip4.Size = new System.Drawing.Size(1189, 28);
             this.menuStrip4.TabIndex = 5;
             this.menuStrip4.Text = "menuStrip4";
             // 
@@ -380,7 +380,7 @@ namespace Transportation
             this.RequestsTP.Controls.Add(this.menuStrip5);
             this.RequestsTP.Location = new System.Drawing.Point(4, 25);
             this.RequestsTP.Name = "RequestsTP";
-            this.RequestsTP.Size = new System.Drawing.Size(891, 489);
+            this.RequestsTP.Size = new System.Drawing.Size(1189, 598);
             this.RequestsTP.TabIndex = 4;
             this.RequestsTP.Text = "Заявки";
             this.RequestsTP.UseVisualStyleBackColor = true;
@@ -393,7 +393,7 @@ namespace Transportation
             this.RequestsDGV.Name = "RequestsDGV";
             this.RequestsDGV.RowHeadersWidth = 51;
             this.RequestsDGV.RowTemplate.Height = 24;
-            this.RequestsDGV.Size = new System.Drawing.Size(885, 461);
+            this.RequestsDGV.Size = new System.Drawing.Size(1186, 570);
             this.RequestsDGV.TabIndex = 8;
             // 
             // menuStrip5
@@ -405,28 +405,28 @@ namespace Transportation
             this.DropRequestTSMI});
             this.menuStrip5.Location = new System.Drawing.Point(0, 0);
             this.menuStrip5.Name = "menuStrip5";
-            this.menuStrip5.Size = new System.Drawing.Size(891, 28);
+            this.menuStrip5.Size = new System.Drawing.Size(1189, 28);
             this.menuStrip5.TabIndex = 7;
             this.menuStrip5.Text = "menuStrip5";
             // 
             // AddRequestTSMI
             // 
             this.AddRequestTSMI.Name = "AddRequestTSMI";
-            this.AddRequestTSMI.Size = new System.Drawing.Size(90, 26);
+            this.AddRequestTSMI.Size = new System.Drawing.Size(90, 24);
             this.AddRequestTSMI.Text = "Добавить";
             this.AddRequestTSMI.Click += new System.EventHandler(this.AddRequestTSMI_Click);
             // 
             // UpdateRequestTSMI
             // 
             this.UpdateRequestTSMI.Name = "UpdateRequestTSMI";
-            this.UpdateRequestTSMI.Size = new System.Drawing.Size(92, 26);
+            this.UpdateRequestTSMI.Size = new System.Drawing.Size(92, 24);
             this.UpdateRequestTSMI.Text = "Изменить";
             this.UpdateRequestTSMI.Click += new System.EventHandler(this.UpdateRequestTSMI_Click);
             // 
             // DropRequestTSMI
             // 
             this.DropRequestTSMI.Name = "DropRequestTSMI";
-            this.DropRequestTSMI.Size = new System.Drawing.Size(79, 26);
+            this.DropRequestTSMI.Size = new System.Drawing.Size(79, 24);
             this.DropRequestTSMI.Text = "Удалить";
             this.DropRequestTSMI.Click += new System.EventHandler(this.DropRequestTSMI_Click);
             // 
@@ -434,8 +434,12 @@ namespace Transportation
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(899, 518);
+            this.ClientSize = new System.Drawing.Size(1197, 627);
             this.Controls.Add(this.tabControl1);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(1215, 674);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(1215, 674);
             this.Name = "MainMenu";
             this.Text = "Каравелла";
             this.Load += new System.EventHandler(this.Form1_Load);

+ 21 - 22
Transportation/MainMenu.cs

@@ -29,29 +29,30 @@ namespace Transportation
 
         private void Form1_Load(object sender, EventArgs e)
         {
+          
             dbhelper.openConnection(ref dbhelper.sqlConnection);
 
-            dataAdapter = new SqlDataAdapter("select * from Vehicles", dbhelper.sqlConnection);
+            dataAdapter = new SqlDataAdapter("select code_vehicle as 'Код автомобиля', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', brand_vehicle as 'Марка автомобиля', model_vehicle as 'Модель автомобиля', number_vehicle as 'Гос. номер автомобиля', name_category as 'Категория прицепа', volume_body as 'Тоннаж', length_body as 'Длина автомобиля', width_body as 'Ширина автомобиля', height_body as 'Высота автомобиля' from vehicles, executors, category_trailer where vehicles.code_executor = executors.code_executor and vehicles.code_category = category_trailer.code_category", dbhelper.sqlConnection);
             dataSet = new DataSet();
             dataAdapter.Fill(dataSet);
             VehiclesDGV.DataSource = dataSet.Tables[0];
 
-            dataAdapter = new SqlDataAdapter("select * from Drivers", dbhelper.sqlConnection);
+            dataAdapter = new SqlDataAdapter("select code_driver as 'Код водителя', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', surname_driver as 'Фамилия водителя', name_driver as 'Имя водителя', midname_driver as 'Отчество водителя', number_passport_driver as 'Серия-номер паспорта', place_passport_driver as 'Место выдачи паспорта', date_passport_driver as 'Дата выдачи паспорта', code_passport_driver as 'Код подразделения', number_driverlicense as 'Серия-номер вод. удостоверения', telephone_driver as 'Телефон водителя' from executors, drivers where drivers.code_executor = executors.code_executor", dbhelper.sqlConnection);
             dataSet = new DataSet();
             dataAdapter.Fill(dataSet);
             DriversDGV.DataSource = dataSet.Tables[0];
 
-            dataAdapter = new SqlDataAdapter("select * from Executors", dbhelper.sqlConnection);
+            dataAdapter = new SqlDataAdapter("select code_executor as 'Код исполнителя', surname_executor as 'Фамилия исполнителя', name_executor as 'Имя исполнителя', midname_executor as 'Отчество исполнителя' from Executors", dbhelper.sqlConnection);
             dataSet = new DataSet();
             dataAdapter.Fill(dataSet);
             ExecutorsDGV.DataSource = dataSet.Tables[0];
 
-            dataAdapter = new SqlDataAdapter("select * from Logisticians", dbhelper.sqlConnection);
+            dataAdapter = new SqlDataAdapter("select code_logistician as 'Код логиста', surname_logistician as 'Фамилия логиста', name_logistician as 'Имя логиста', midname_logistician as 'Отчество логиста', number_passport_logistician as 'Серия-номер паспорта', place_passport_logistician as 'Место выдачи паспорта', date_passport_logistician as 'Дата выдачи паспорта', code_passport_logistician as 'Код подразделения', telephone_logistician as 'Телефон логиста' from Logisticians", dbhelper.sqlConnection);
             dataSet = new DataSet();
             dataAdapter.Fill(dataSet);
             LogisticiansDGV.DataSource = dataSet.Tables[0];
 
-            dataAdapter = new SqlDataAdapter("select * from Requests", dbhelper.sqlConnection);
+            dataAdapter = new SqlDataAdapter("select code_request as 'Код заявки', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', (drivers.surname_driver + ' ' + drivers.name_driver + ' ' + drivers.midname_driver) as 'ФИО водителя', (vehicles.brand_vehicle + ' ' + vehicles.model_vehicle + ' ' + vehicles.number_vehicle) as 'Автомобиль', (logisticians.surname_logistician + ' ' + logisticians.name_logistician + ' ' + logisticians.midname_logistician) as 'ФИО логиста', date_loading as 'Дата загрузки', place_loading as 'Место загрузки', fullname_shipper as 'ФИО грузоотправителя', telephone_shipper as 'Телефон грузоотправителя', name_cargo as 'Наименования груза', transportation_conditions as 'Условия транспортировки', date_unloading as 'Дата разгрузки', place_unloading as 'Место разгрузки', fullname_consignee as 'ФИО грузополучателя', route_town_request as 'Маршрут (города)', route_mileage_request as 'Маршрут (километраж)', transportation_format as 'Формат транспортировки', payment_request as 'Оплата заявки', payment_conditions_request as 'Условия оплаты' from Requests, executors, drivers, vehicles, logisticians where requests.code_executor = executors.code_executor and requests.code_driver = drivers.code_driver and requests.code_vehicle = vehicles.code_vehicle and requests.code_logistician = logisticians.code_logistician", dbhelper.sqlConnection);
             dataSet = new DataSet();
             dataAdapter.Fill(dataSet);
             RequestsDGV.DataSource = dataSet.Tables[0];
@@ -64,7 +65,7 @@ namespace Transportation
 
             add.FormClosing += (obj, args) =>
               {
-                  dataAdapter = new SqlDataAdapter("select * from Vehicles", dbhelper.sqlConnection);
+                  dataAdapter = new SqlDataAdapter("select code_vehicle as 'Код автомобиля', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', brand_vehicle as 'Марка автомобиля', model_vehicle as 'Модель автомобиля', number_vehicle as 'Гос. номер автомобиля', name_category as 'Категория прицепа', volume_body as 'Тоннаж', length_body as 'Длина автомобиля', width_body as 'Ширина автомобиля', height_body as 'Высота автомобиля' from vehicles, executors, category_trailer where vehicles.code_executor = executors.code_executor and vehicles.code_category = category_trailer.code_category", dbhelper.sqlConnection);
                   dataSet = new DataSet();
                   dataAdapter.Fill(dataSet);
                   VehiclesDGV.DataSource = dataSet.Tables[0];
@@ -79,7 +80,7 @@ namespace Transportation
 
             update.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from Vehicles", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_vehicle as 'Код автомобиля', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', brand_vehicle as 'Марка автомобиля', model_vehicle as 'Модель автомобиля', number_vehicle as 'Гос. номер автомобиля', name_category as 'Категория прицепа', volume_body as 'Тоннаж', length_body as 'Длина автомобиля', width_body as 'Ширина автомобиля', height_body as 'Высота автомобиля' from vehicles, executors, category_trailer where vehicles.code_executor = executors.code_executor and vehicles.code_category = category_trailer.code_category", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 VehiclesDGV.DataSource = dataSet.Tables[0];
@@ -95,7 +96,7 @@ namespace Transportation
                 query = new SqlCommand($"delete from vehicles where code_vehicle like '{vehicleIndex}'", dbhelper.sqlConnection);
                 query.ExecuteNonQuery();
 
-                dataAdapter = new SqlDataAdapter("select * from Vehicles", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_vehicle as 'Код автомобиля', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', brand_vehicle as 'Марка автомобиля', model_vehicle as 'Модель автомобиля', number_vehicle as 'Гос. номер автомобиля', name_category as 'Категория прицепа', volume_body as 'Тоннаж', length_body as 'Длина автомобиля', width_body as 'Ширина автомобиля', height_body as 'Высота автомобиля' from vehicles, executors, category_trailer where vehicles.code_executor = executors.code_executor and vehicles.code_category = category_trailer.code_category", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 VehiclesDGV.DataSource = dataSet.Tables[0];
@@ -110,7 +111,7 @@ namespace Transportation
 
             add.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from Drivers", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_driver as 'Код водителя', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', surname_driver as 'Фамилия водителя', name_driver as 'Имя водителя', midname_driver as 'Отчество водителя', number_passport_driver as 'Серия-номер паспорта', place_passport_driver as 'Место выдачи паспорта', date_passport_driver as 'Дата выдачи паспорта', code_passport_driver as 'Код подразделения', number_driverlicense as 'Серия-номер вод. удостоверения', telephone_driver as 'Телефон водителя' from executors, drivers where drivers.code_executor = executors.code_executor", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 DriversDGV.DataSource = dataSet.Tables[0];
@@ -125,7 +126,7 @@ namespace Transportation
 
             update.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from Drivers", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_driver as 'Код водителя', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', surname_driver as 'Фамилия водителя', name_driver as 'Имя водителя', midname_driver as 'Отчество водителя', number_passport_driver as 'Серия-номер паспорта', place_passport_driver as 'Место выдачи паспорта', date_passport_driver as 'Дата выдачи паспорта', code_passport_driver as 'Код подразделения', number_driverlicense as 'Серия-номер вод. удостоверения', telephone_driver as 'Телефон водителя' from executors, drivers where drivers.code_executor = executors.code_executor", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 DriversDGV.DataSource = dataSet.Tables[0];
@@ -141,7 +142,7 @@ namespace Transportation
                 query = new SqlCommand($"delete from drivers where code_driver like '{driverIndex}'", dbhelper.sqlConnection);
                 query.ExecuteNonQuery();
 
-                dataAdapter = new SqlDataAdapter("select * from drivers", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_driver as 'Код водителя', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', surname_driver as 'Фамилия водителя', name_driver as 'Имя водителя', midname_driver as 'Отчество водителя', number_passport_driver as 'Серия-номер паспорта', place_passport_driver as 'Место выдачи паспорта', date_passport_driver as 'Дата выдачи паспорта', code_passport_driver as 'Код подразделения', number_driverlicense as 'Серия-номер вод. удостоверения', telephone_driver as 'Телефон водителя' from executors, drivers where drivers.code_executor = executors.code_executor", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 DriversDGV.DataSource = dataSet.Tables[0];
@@ -155,7 +156,7 @@ namespace Transportation
 
             add.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from Executors", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_executor as 'Код исполнителя', surname_executor as 'Фамилия исполнителя', name_executor as 'Имя исполнителя', midname_executor as 'Отчество исполнителя' from Executors", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 ExecutorsDGV.DataSource = dataSet.Tables[0];
@@ -170,7 +171,7 @@ namespace Transportation
 
             update.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from Executors", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_executor as 'Код исполнителя', surname_executor as 'Фамилия исполнителя', name_executor as 'Имя исполнителя', midname_executor as 'Отчество исполнителя' from Executors", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 ExecutorsDGV.DataSource = dataSet.Tables[0];
@@ -186,7 +187,7 @@ namespace Transportation
                 query = new SqlCommand($"delete from executors where code_executor like '{executorIndex}'", dbhelper.sqlConnection);
                 query.ExecuteNonQuery();
 
-                dataAdapter = new SqlDataAdapter("select * from executors", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_executor as 'Код исполнителя', surname_executor as 'Фамилия исполнителя', name_executor as 'Имя исполнителя', midname_executor as 'Отчество исполнителя' from Executors", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 ExecutorsDGV.DataSource = dataSet.Tables[0];
@@ -200,7 +201,7 @@ namespace Transportation
 
             add.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from Logisticians", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_logistician as 'Код логиста', surname_logistician as 'Фамилия логиста', name_logistician as 'Имя логиста', midname_logistician as 'Отчество логиста', number_passport_logistician as 'Серия-номер паспорта', place_passport_logistician as 'Место выдачи паспорта', date_passport_logistician as 'Дата выдачи паспорта', code_passport_logistician as 'Код подразделения', telephone_logistician as 'Телефон логиста' from Logisticians", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 LogisticiansDGV.DataSource = dataSet.Tables[0];
@@ -215,7 +216,7 @@ namespace Transportation
 
             update.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from Logisticians", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_logistician as 'Код логиста', surname_logistician as 'Фамилия логиста', name_logistician as 'Имя логиста', midname_logistician as 'Отчество логиста', number_passport_logistician as 'Серия-номер паспорта', place_passport_logistician as 'Место выдачи паспорта', date_passport_logistician as 'Дата выдачи паспорта', code_passport_logistician as 'Код подразделения', telephone_logistician as 'Телефон логиста' from Logisticians", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 LogisticiansDGV.DataSource = dataSet.Tables[0];
@@ -231,7 +232,7 @@ namespace Transportation
                 query = new SqlCommand($"delete from logisticians where code_logistician like '{logisticianIndex}'", dbhelper.sqlConnection);
                 query.ExecuteNonQuery();
 
-                dataAdapter = new SqlDataAdapter("select * from logisticians", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_logistician as 'Код логиста', surname_logistician as 'Фамилия логиста', name_logistician as 'Имя логиста', midname_logistician as 'Отчество логиста', number_passport_logistician as 'Серия-номер паспорта', place_passport_logistician as 'Место выдачи паспорта', date_passport_logistician as 'Дата выдачи паспорта', code_passport_logistician as 'Код подразделения', telephone_logistician as 'Телефон логиста' from Logisticians", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 LogisticiansDGV.DataSource = dataSet.Tables[0];
@@ -253,7 +254,7 @@ namespace Transportation
 
             add.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from Requests", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_request as 'Код заявки', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', (drivers.surname_driver + ' ' + drivers.name_driver + ' ' + drivers.midname_driver) as 'ФИО водителя', (vehicles.brand_vehicle + ' ' + vehicles.model_vehicle + ' ' + vehicles.number_vehicle) as 'Автомобиль', (logisticians.surname_logistician + ' ' + logisticians.name_logistician + ' ' + logisticians.midname_logistician) as 'ФИО логиста', date_loading as 'Дата загрузки', place_loading as 'Место загрузки', fullname_shipper as 'ФИО грузоотправителя', telephone_shipper as 'Телефон грузоотправителя', name_cargo as 'Наименования груза', transportation_conditions as 'Условия транспортировки', date_unloading as 'Дата разгрузки', place_unloading as 'Место разгрузки', fullname_consignee as 'ФИО грузополучателя', route_town_request as 'Маршрут (города)', route_mileage_request as 'Маршрут (километраж)', transportation_format as 'Формат транспортировки', payment_request as 'Оплата заявки', payment_conditions_request as 'Условия оплаты' from Requests, executors, drivers, vehicles, logisticians where requests.code_executor = executors.code_executor and requests.code_driver = drivers.code_driver and requests.code_vehicle = vehicles.code_vehicle and requests.code_logistician = logisticians.code_logistician", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 RequestsDGV.DataSource = dataSet.Tables[0];
@@ -269,7 +270,7 @@ namespace Transportation
 
             update.FormClosing += (obj, args) =>
             {
-                dataAdapter = new SqlDataAdapter("select * from requests", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_request as 'Код заявки', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', (drivers.surname_driver + ' ' + drivers.name_driver + ' ' + drivers.midname_driver) as 'ФИО водителя', (vehicles.brand_vehicle + ' ' + vehicles.model_vehicle + ' ' + vehicles.number_vehicle) as 'Автомобиль', (logisticians.surname_logistician + ' ' + logisticians.name_logistician + ' ' + logisticians.midname_logistician) as 'ФИО логиста', date_loading as 'Дата загрузки', place_loading as 'Место загрузки', fullname_shipper as 'ФИО грузоотправителя', telephone_shipper as 'Телефон грузоотправителя', name_cargo as 'Наименования груза', transportation_conditions as 'Условия транспортировки', date_unloading as 'Дата разгрузки', place_unloading as 'Место разгрузки', fullname_consignee as 'ФИО грузополучателя', route_town_request as 'Маршрут (города)', route_mileage_request as 'Маршрут (километраж)', transportation_format as 'Формат транспортировки', payment_request as 'Оплата заявки', payment_conditions_request as 'Условия оплаты' from Requests, executors, drivers, vehicles, logisticians where requests.code_executor = executors.code_executor and requests.code_driver = drivers.code_driver and requests.code_vehicle = vehicles.code_vehicle and requests.code_logistician = logisticians.code_logistician", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 RequestsDGV.DataSource = dataSet.Tables[0];
@@ -285,14 +286,12 @@ namespace Transportation
                 query = new SqlCommand($"delete from requests where code_request like '{requestIndex}'", dbhelper.sqlConnection);
                 query.ExecuteNonQuery();
 
-                dataAdapter = new SqlDataAdapter("select * from requests", dbhelper.sqlConnection);
+                dataAdapter = new SqlDataAdapter("select code_request as 'Код заявки', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', (drivers.surname_driver + ' ' + drivers.name_driver + ' ' + drivers.midname_driver) as 'ФИО водителя', (vehicles.brand_vehicle + ' ' + vehicles.model_vehicle + ' ' + vehicles.number_vehicle) as 'Автомобиль', (logisticians.surname_logistician + ' ' + logisticians.name_logistician + ' ' + logisticians.midname_logistician) as 'ФИО логиста', date_loading as 'Дата загрузки', place_loading as 'Место загрузки', fullname_shipper as 'ФИО грузоотправителя', telephone_shipper as 'Телефон грузоотправителя', name_cargo as 'Наименования груза', transportation_conditions as 'Условия транспортировки', date_unloading as 'Дата разгрузки', place_unloading as 'Место разгрузки', fullname_consignee as 'ФИО грузополучателя', route_town_request as 'Маршрут (города)', route_mileage_request as 'Маршрут (километраж)', transportation_format as 'Формат транспортировки', payment_request as 'Оплата заявки', payment_conditions_request as 'Условия оплаты' from Requests, executors, drivers, vehicles, logisticians where requests.code_executor = executors.code_executor and requests.code_driver = drivers.code_driver and requests.code_vehicle = vehicles.code_vehicle and requests.code_logistician = logisticians.code_logistician", dbhelper.sqlConnection);
                 dataSet = new DataSet();
                 dataAdapter.Fill(dataSet);
                 RequestsDGV.DataSource = dataSet.Tables[0];
             }
         }
-
-        
     }
     
 }

+ 0 - 9
Transportation/MainMenu.resx

@@ -132,13 +132,4 @@
   <metadata name="menuStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>557, 17</value>
   </metadata>
-  <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>152, 17</value>
-  </metadata>
-  <metadata name="menuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>287, 17</value>
-  </metadata>
-  <metadata name="menuStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>422, 17</value>
-  </metadata>
 </root>

+ 6 - 2
Transportation/SortingVehicle.Designer.cs

@@ -41,7 +41,7 @@ namespace Transportation
             this.VehiclesSortingDGV.Name = "VehiclesSortingDGV";
             this.VehiclesSortingDGV.RowHeadersWidth = 51;
             this.VehiclesSortingDGV.RowTemplate.Height = 24;
-            this.VehiclesSortingDGV.Size = new System.Drawing.Size(800, 450);
+            this.VehiclesSortingDGV.Size = new System.Drawing.Size(1402, 627);
             this.VehiclesSortingDGV.TabIndex = 2;
             this.VehiclesSortingDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.VehiclesSortingDGV_CellContentClick);
             // 
@@ -49,8 +49,12 @@ namespace Transportation
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.ClientSize = new System.Drawing.Size(1402, 627);
             this.Controls.Add(this.VehiclesSortingDGV);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(1420, 674);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(1420, 674);
             this.Name = "SortingVehicle";
             this.Text = "Сортировка";
             this.Load += new System.EventHandler(this.SortingVehicle_Load);

+ 1 - 1
Transportation/SortingVehicle.cs

@@ -29,7 +29,7 @@ namespace Transportation
 
         private void SortingVehicle_Load(object sender, EventArgs e)
         {
-            dataAdapter = new SqlDataAdapter($"select * from vehicles where volume_body like {MainMenu.sort}", dbhelper.sqlConnection);
+            dataAdapter = new SqlDataAdapter($"select code_vehicle as 'Код автомобиля', (executors.surname_executor + ' ' + executors.name_executor + ' ' + executors.midname_executor) as 'ФИО исполнителя', brand_vehicle as 'Марка автомобиля', model_vehicle as 'Модель автомобиля', number_vehicle as 'Гос. номер автомобиля', name_category as 'Категория прицепа', volume_body as 'Тоннаж', length_body as 'Длина автомобиля', width_body as 'Ширина автомобиля', height_body as 'Высота автомобиля' from vehicles, executors, category_trailer where vehicles.code_executor = executors.code_executor and vehicles.code_category = category_trailer.code_category and volume_body like {MainMenu.sort}", dbhelper.sqlConnection);
             dataSet = new DataSet();
             dataAdapter.Fill(dataSet);
             VehiclesSortingDGV.DataSource = dataSet.Tables[0];

+ 4 - 0
Transportation/UpdateDrivers.Designer.cs

@@ -267,6 +267,10 @@ namespace Transportation
             this.Controls.Add(this.label1);
             this.Controls.Add(this.SurnameDriverTB);
             this.Controls.Add(this.label2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(812, 383);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(812, 383);
             this.Name = "UpdateDrivers";
             this.Text = "Изменение водителя";
             this.Load += new System.EventHandler(this.UpdateDrivers_Load);

+ 4 - 0
Transportation/UpdateExecutor.Designer.cs

@@ -120,6 +120,10 @@ namespace Transportation
             this.Controls.Add(this.label1);
             this.Controls.Add(this.SurnameExecutorTB);
             this.Controls.Add(this.label2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(661, 199);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(661, 199);
             this.Name = "UpdateExecutor";
             this.Text = "Изменение исполнителя";
             this.Load += new System.EventHandler(this.UpdateExecutor_Load);

+ 1 - 1
Transportation/UpdateExecutor.cs

@@ -22,7 +22,7 @@ namespace Transportation
 
         private void UpdateExecutor_Load(object sender, EventArgs e)
         {
-            query = new SqlCommand($"select surname_executor, name_executor, midname_executor from executors where code_executor like '{MainMenu.executorIndex}'", dbhelper.sqlConnection);
+            query = new SqlCommand($"select surname_executor as 'Фамилия исполнителя', name_executor as 'Имя исполнителя', midname_executor as 'Отчество исполнителя' from Executors where code_executor like '{MainMenu.executorIndex}'", dbhelper.sqlConnection);
             reader = query.ExecuteReader();
             reader.Read();
             SurnameExecutorTB.Text = reader.GetString(0);

+ 5 - 1
Transportation/UpdateLogistician.Designer.cs

@@ -206,7 +206,7 @@ namespace Transportation
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(794, 299);
+            this.ClientSize = new System.Drawing.Size(794, 293);
             this.Controls.Add(this.UpdateBTN);
             this.Controls.Add(this.TelephoneLogisticianMTB);
             this.Controls.Add(this.label11);
@@ -225,6 +225,10 @@ namespace Transportation
             this.Controls.Add(this.label1);
             this.Controls.Add(this.SurnameLogisticianTB);
             this.Controls.Add(this.label2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(812, 340);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(812, 340);
             this.Name = "UpdateLogistician";
             this.Text = "Изменение логиста";
             this.Load += new System.EventHandler(this.UpdateLogistician_Load);

+ 4 - 0
Transportation/UpdateRequest.Designer.cs

@@ -451,6 +451,10 @@ namespace Transportation
             this.Controls.Add(this.ExecutorsCB);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.label2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(1277, 574);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(1277, 574);
             this.Name = "UpdateRequest";
             this.Text = "Изменение заявки";
             this.Load += new System.EventHandler(this.UpdateRequest_Load);

+ 4 - 0
Transportation/UpdateVehicle.Designer.cs

@@ -311,6 +311,10 @@ namespace Transportation
             this.Controls.Add(this.ModelTB);
             this.Controls.Add(this.BrandTB);
             this.Controls.Add(this.ExecutorsCB);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(533, 307);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(533, 307);
             this.Name = "UpdateVehicle";
             this.Text = "Изменение автомобиля";
             this.Load += new System.EventHandler(this.UpdateVehicle_Load);

+ 1 - 1
Transportation/UpdateVehicle.cs

@@ -46,7 +46,7 @@ namespace Transportation
 
         private void UpdateVehicle_Load(object sender, EventArgs e)
         {
-            // code_executor, brand_vehicle, model_vehicle, number_vehicle, code_category, volume_body, length_body, width_body, height_body
+           
 
             query = new SqlCommand("select surname_executor + ' ' + name_executor + ' ' + midname_executor from Executors", dbhelper.sqlConnection);
             reader = query.ExecuteReader();