roman/MIP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: roman:eed17d46cac5087f8d3dcbdc932ac26a96629ace
Branches Tags
roman:master
...
compare: roman:2981ef3f14d37e11a75792f18d4b45f5ae063272
Branches Tags
roman:master

10 Commits
eed17d46ca ... 2981ef3f14

Author SHA1 Message Date
roman6791
2981ef3f14 oprava formulara 2021-11-25 20:29:13 +01:00
roman6791
9333f64a07 verzia 1.1.15 2021-11-25 18:07:34 +01:00
roman6791
85c1bca6af Skladove opravy 2021-11-25 18:06:28 +01:00
roman6791
975c2b3a31 Oprava zobrazovania meskajucich ziadaniek 2021-11-11 19:13:54 +01:00
roman6791
f721b16226 Pridany potvrdeny datum zakaznikovi 2021-10-28 21:53:29 +02:00
roman6791
1be690abb4 oprava kontroly updatu 2021-10-28 18:32:05 +02:00
Lukáš
e75c253202 nova verzia 1.1.12 2021-10-25 18:51:08 +02:00
roman6791
f175dd8dab Oprava poctov v zozname dopytov 2021-10-25 18:01:23 +02:00
roman6791
b71c08b07e upravy na posledne zmeny dizajnu 2021-10-04 18:40:11 +02:00
roman6791
9ce8faa0dc oprava datumu prijatia bez casu na cenovej ponuke 2021-09-13 10:54:29 +02:00
13 changed files with 288 additions and 224 deletions
Expand all files Collapse all files

BIN
.vs/Mip_v1/v16/.suo
View File

Binary file not shown.

4
Mip/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.9.0")]
[assembly: AssemblyFileVersion("1.1.9.0")]
[assembly: AssemblyVersion("1.1.15.0")]
[assembly: AssemblyFileVersion("1.1.15.0")]

107
Mip/frmEditDopyt.Designer.cs generated
View File

@@ -69,6 +69,7 @@
this.comboBox2 = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.label24 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.checkBox2 = new System.Windows.Forms.CheckBox();
@@ -85,7 +86,8 @@
this.button2 = new System.Windows.Forms.Button();
this.comboBox3 = new System.Windows.Forms.ComboBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
this.label25 = new System.Windows.Forms.Label();
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.groupBox4.SuspendLayout();
@@ -98,7 +100,7 @@
this.groupBox3.Controls.Add(this.label3);
this.groupBox3.Location = new System.Drawing.Point(1, 244);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(247, 53);
this.groupBox3.Size = new System.Drawing.Size(247, 79);
this.groupBox3.TabIndex = 16;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Rozmery výrobku";
@@ -114,7 +116,7 @@
//
// button8
//
this.button8.Location = new System.Drawing.Point(444, 273);
this.button8.Location = new System.Drawing.Point(500, 298);
this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(83, 23);
this.button8.TabIndex = 15;
@@ -125,7 +127,7 @@
// btnUlozitZmeny
//
this.btnUlozitZmeny.Enabled = false;
this.btnUlozitZmeny.Location = new System.Drawing.Point(347, 273);
this.btnUlozitZmeny.Location = new System.Drawing.Point(377, 298);
this.btnUlozitZmeny.Name = "btnUlozitZmeny";
this.btnUlozitZmeny.Size = new System.Drawing.Size(91, 23);
this.btnUlozitZmeny.TabIndex = 14;
@@ -136,7 +138,7 @@
// btnZobrazVykres
//
this.btnZobrazVykres.Enabled = false;
this.btnZobrazVykres.Location = new System.Drawing.Point(248, 273);
this.btnZobrazVykres.Location = new System.Drawing.Point(251, 298);
this.btnZobrazVykres.Name = "btnZobrazVykres";
this.btnZobrazVykres.Size = new System.Drawing.Size(93, 23);
this.btnZobrazVykres.TabIndex = 13;
@@ -147,16 +149,17 @@
// dateTimePicker1
//
this.dateTimePicker1.CustomFormat = "YYYY-mm-DD";
this.dateTimePicker1.Location = new System.Drawing.Point(98, 87);
this.dateTimePicker1.Location = new System.Drawing.Point(158, 87);
this.dateTimePicker1.Name = "dateTimePicker1";
this.dateTimePicker1.Size = new System.Drawing.Size(174, 20);
this.dateTimePicker1.TabIndex = 28;
this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged);
//
// label23
//
this.label23.AutoSize = true;
this.label23.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.label23.Location = new System.Drawing.Point(150, 112);
this.label23.Location = new System.Drawing.Point(210, 134);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(54, 13);
this.label23.TabIndex = 38;
@@ -165,7 +168,7 @@
//
// label22
//
this.label22.Location = new System.Drawing.Point(213, 142);
this.label22.Location = new System.Drawing.Point(273, 164);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(55, 13);
this.label22.TabIndex = 37;
@@ -175,7 +178,7 @@
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(213, 129);
this.label21.Location = new System.Drawing.Point(273, 151);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(55, 13);
this.label21.TabIndex = 36;
@@ -183,7 +186,7 @@
//
// numericUpDown1
//
this.numericUpDown1.Location = new System.Drawing.Point(205, 109);
this.numericUpDown1.Location = new System.Drawing.Point(265, 131);
this.numericUpDown1.Maximum = new decimal(new int[] {
99999,
0,
@@ -197,7 +200,7 @@
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(259, 112);
this.checkBox1.Location = new System.Drawing.Point(319, 134);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(15, 14);
this.checkBox1.TabIndex = 35;
@@ -207,7 +210,7 @@
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(155, 129);
this.label11.Location = new System.Drawing.Point(215, 151);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(55, 13);
this.label11.TabIndex = 33;
@@ -215,6 +218,8 @@
//
// groupBox4
//
this.groupBox4.Controls.Add(this.dateTimePicker2);
this.groupBox4.Controls.Add(this.label25);
this.groupBox4.Controls.Add(this.dateTimePicker1);
this.groupBox4.Controls.Add(this.label23);
this.groupBox4.Controls.Add(this.label22);
@@ -248,7 +253,7 @@
this.groupBox4.Controls.Add(this.label7);
this.groupBox4.Location = new System.Drawing.Point(249, 1);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(278, 272);
this.groupBox4.Size = new System.Drawing.Size(335, 294);
this.groupBox4.TabIndex = 12;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Informácie o zázname";
@@ -256,7 +261,7 @@
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(97, 129);
this.label10.Location = new System.Drawing.Point(157, 151);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(55, 13);
this.label10.TabIndex = 32;
@@ -264,7 +269,7 @@
//
// label6
//
this.label6.Location = new System.Drawing.Point(3, 251);
this.label6.Location = new System.Drawing.Point(3, 273);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(90, 14);
this.label6.TabIndex = 30;
@@ -274,7 +279,7 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.label5.Location = new System.Drawing.Point(101, 247);
this.label5.Location = new System.Drawing.Point(161, 269);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(0, 20);
this.label5.TabIndex = 9;
@@ -283,14 +288,14 @@
//
this.lblInynazov.AutoSize = true;
this.lblInynazov.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.lblInynazov.Location = new System.Drawing.Point(101, 155);
this.lblInynazov.Location = new System.Drawing.Point(161, 177);
this.lblInynazov.Name = "lblInynazov";
this.lblInynazov.Size = new System.Drawing.Size(0, 20);
this.lblInynazov.TabIndex = 29;
//
// label19
//
this.label19.Location = new System.Drawing.Point(3, 203);
this.label19.Location = new System.Drawing.Point(3, 225);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(90, 14);
this.label19.TabIndex = 25;
@@ -300,7 +305,7 @@
//
this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox7.FormattingEnabled = true;
this.comboBox7.Location = new System.Drawing.Point(98, 200);
this.comboBox7.Location = new System.Drawing.Point(158, 222);
this.comboBox7.Name = "comboBox7";
this.comboBox7.Size = new System.Drawing.Size(174, 21);
this.comboBox7.TabIndex = 24;
@@ -308,7 +313,7 @@
//
// label18
//
this.label18.Location = new System.Drawing.Point(97, 142);
this.label18.Location = new System.Drawing.Point(157, 164);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(55, 13);
this.label18.TabIndex = 23;
@@ -317,7 +322,7 @@
//
// label17
//
this.label17.Location = new System.Drawing.Point(155, 142);
this.label17.Location = new System.Drawing.Point(215, 164);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(55, 13);
this.label17.TabIndex = 22;
@@ -326,14 +331,14 @@
//
// textBox8
//
this.textBox8.Location = new System.Drawing.Point(98, 224);
this.textBox8.Location = new System.Drawing.Point(158, 246);
this.textBox8.Name = "textBox8";
this.textBox8.Size = new System.Drawing.Size(174, 20);
this.textBox8.TabIndex = 18;
//
// textBox7
//
this.textBox7.Location = new System.Drawing.Point(98, 177);
this.textBox7.Location = new System.Drawing.Point(158, 199);
this.textBox7.Name = "textBox7";
this.textBox7.Size = new System.Drawing.Size(174, 20);
this.textBox7.TabIndex = 17;
@@ -341,7 +346,7 @@
//
// textBox6
//
this.textBox6.Location = new System.Drawing.Point(98, 109);
this.textBox6.Location = new System.Drawing.Point(158, 131);
this.textBox6.MaxLength = 6;
this.textBox6.Name = "textBox6";
this.textBox6.Size = new System.Drawing.Size(51, 20);
@@ -350,7 +355,7 @@
//
// button3
//
this.button3.Location = new System.Drawing.Point(245, 62);
this.button3.Location = new System.Drawing.Point(305, 62);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(27, 23);
this.button3.TabIndex = 13;
@@ -361,7 +366,7 @@
//
this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox4.FormattingEnabled = true;
this.comboBox4.Location = new System.Drawing.Point(98, 63);
this.comboBox4.Location = new System.Drawing.Point(158, 63);
this.comboBox4.Name = "comboBox4";
this.comboBox4.Size = new System.Drawing.Size(141, 21);
this.comboBox4.TabIndex = 12;
@@ -369,7 +374,7 @@
//
// button4
//
this.button4.Location = new System.Drawing.Point(245, 39);
this.button4.Location = new System.Drawing.Point(305, 39);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(27, 23);
this.button4.TabIndex = 10;
@@ -380,7 +385,7 @@
//
this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox5.FormattingEnabled = true;
this.comboBox5.Location = new System.Drawing.Point(98, 40);
this.comboBox5.Location = new System.Drawing.Point(158, 40);
this.comboBox5.Name = "comboBox5";
this.comboBox5.Size = new System.Drawing.Size(141, 21);
this.comboBox5.TabIndex = 9;
@@ -388,7 +393,7 @@
//
// textBox5
//
this.textBox5.Location = new System.Drawing.Point(98, 17);
this.textBox5.Location = new System.Drawing.Point(158, 17);
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(174, 20);
this.textBox5.TabIndex = 8;
@@ -396,7 +401,7 @@
//
// label16
//
this.label16.Location = new System.Drawing.Point(3, 226);
this.label16.Location = new System.Drawing.Point(3, 248);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(90, 14);
this.label16.TabIndex = 7;
@@ -404,7 +409,7 @@
//
// label15
//
this.label15.Location = new System.Drawing.Point(3, 180);
this.label15.Location = new System.Drawing.Point(3, 202);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(90, 14);
this.label15.TabIndex = 6;
@@ -412,7 +417,7 @@
//
// label14
//
this.label14.Location = new System.Drawing.Point(3, 157);
this.label14.Location = new System.Drawing.Point(3, 179);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(90, 14);
this.label14.TabIndex = 5;
@@ -420,7 +425,7 @@
//
// label13
//
this.label13.Location = new System.Drawing.Point(3, 109);
this.label13.Location = new System.Drawing.Point(3, 131);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(90, 45);
this.label13.TabIndex = 4;
@@ -507,10 +512,19 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Typ záznamu";
//
// textBox2
//
this.textBox2.Enabled = false;
this.textBox2.Location = new System.Drawing.Point(3, 116);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(68, 20);
this.textBox2.TabIndex = 11;
this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged);
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(130, 77);
this.label24.Location = new System.Drawing.Point(127, 77);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(52, 13);
this.label24.TabIndex = 9;
@@ -681,20 +695,27 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Zákazník a výkres";
//
// textBox2
// dateTimePicker2
//
this.textBox2.Enabled = false;
this.textBox2.Location = new System.Drawing.Point(3, 116);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(68, 20);
this.textBox2.TabIndex = 11;
this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged);
this.dateTimePicker2.CustomFormat = "YYYY-mm-DD";
this.dateTimePicker2.Location = new System.Drawing.Point(158, 109);
this.dateTimePicker2.Name = "dateTimePicker2";
this.dateTimePicker2.Size = new System.Drawing.Size(174, 20);
this.dateTimePicker2.TabIndex = 40;
//
// label25
//
this.label25.Location = new System.Drawing.Point(3, 111);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(149, 18);
this.label25.TabIndex = 39;
this.label25.Text = "Dátum potvrdený zákazníkovi";
//
// frmEditDopyt
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(528, 297);
this.ClientSize = new System.Drawing.Size(585, 323);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.button8);
this.Controls.Add(this.btnUlozitZmeny);
@@ -779,5 +800,7 @@
private System.Windows.Forms.ComboBox comboBox3;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.DateTimePicker dateTimePicker2;
private System.Windows.Forms.Label label25;
}
}

37
Mip/frmEditDopyt.cs
View File

@@ -1,11 +1,5 @@
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 Mip
@@ -27,10 +21,12 @@ namespace Mip
string PotvrdDatum = "";
PotvrdDatum = dateTimePicker1.Value.ToString(format);
string PotvrdDatumZakazikovi = "";
PotvrdDatumZakazikovi = dateTimePicker2.Value.ToString(format);
string strStatusDopytu = "";
string strPocetDoVyroby = "";
strPocetDoVyroby = label22.Text.ToString();
if (Convert.ToInt32(strPocetDoVyroby) == 0 && (rBdopyt.Checked==true || rBzKontraktu.Checked==true))
if (Convert.ToInt32(strPocetDoVyroby) == 0 && (rBdopyt.Checked == true || rBzKontraktu.Checked == true))
{
classSQL.SQL("DELETE FROM `mip`.`tabvyroba` WHERE `IDDopyt` = " + strIDDopyt + ";");
strStatusDopytu = "`StatusDopytu` = 'Na lapovni',";
@@ -43,6 +39,7 @@ namespace Mip
`Material` = '" + comboBox5.Text.ToString() + @"',
`UpravaMaterialu` = '" + comboBox4.Text.ToString() + @"',
`DatumPotvrdeny` = '" + PotvrdDatum + @"',
`DatumPotvrdenyZakaznikovi` = '" + PotvrdDatumZakazikovi + @"',
`Zakaznik` = '" + comboBox2.Text.ToString() + @"',
`IDVyrobok` = " + IDvyrobokPrePocetNaSklade.ToString() + @",
`PoznamkaOBJ` = '" + textBox8.Text.ToString() + @"',
@@ -118,8 +115,8 @@ namespace Mip
classSQL.SQL("SELECT * FROM pohladdopyty WHERE `IDCPOBJ` = " + strIDDopyt + ";", out DTEditDopyt);
if (DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["TypDopytu"].Ordinal].ToString() == "Cenová ponuka"){rBdopyt.Checked = true; rBdopyt.Enabled = true;}
if (DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["TypDopytu"].Ordinal].ToString() == "Objednávka"){rBObj.Checked = true; rBObj.Enabled = true;}
if (DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["TypDopytu"].Ordinal].ToString() == "Cenová ponuka") { rBdopyt.Checked = true; rBdopyt.Enabled = true; }
if (DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["TypDopytu"].Ordinal].ToString() == "Objednávka") { rBObj.Checked = true; rBObj.Enabled = true; }
if (DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["TypDopytu"].Ordinal].ToString() == "Objednávka do kontraktu") { rBObjDoKontr.Checked = true; rBObjDoKontr.Enabled = true; }
if (DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["TypDopytu"].Ordinal].ToString() == "Kontrakt") { rBKontrakt.Checked = true; rBKontrakt.Enabled = true; }
if (DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["TypDopytu"].Ordinal].ToString() == "Call Off") { rBzKontraktu.Checked = true; rBzKontraktu.Enabled = true; }
@@ -136,7 +133,8 @@ namespace Mip
textBox5.Text = DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["CisloObj"].Ordinal].ToString();
comboBox5.Text = DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["Material"].Ordinal].ToString();
comboBox4.Text = DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["UpravaMaterialu"].Ordinal].ToString();
dateTimePicker1.Value = Convert.ToDateTime( DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["DatumPotvrdeny"].Ordinal]);
dateTimePicker1.Value = Convert.ToDateTime(DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["DatumPotvrdeny"].Ordinal]);
dateTimePicker2.Value = Convert.ToDateTime(DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["DatumPotvrdenyZakaznikovi"].Ordinal]);
textBox6.Text = DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["PocetKusov"].Ordinal].ToString();
//numericUpDown1.Minimum = 0;
//numericUpDown1.Maximum = Convert.ToInt32(DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["PocetZoSkladu"].Ordinal].ToString());
@@ -309,9 +307,9 @@ namespace Mip
if (comboBox5.Text != "")
{
ZistiPocetNaSklade();
ZistiPocetVoVyrobe();
ZistiPouziteCeny();
ZistiPocetNaSklade();
ZistiPocetVoVyrobe();
ZistiPouziteCeny();
}
else
{
@@ -325,11 +323,11 @@ namespace Mip
{
if (EnableSelectedValueChange == true)
{
/* string CenaDoTextBoxu ;
classSQL.SQL("SELECT `CenaOBJ` FROM `tabdopyt` WHERE `tabdopyt`.IDCPOBJ = '" + comboBox7.SelectedValue.ToString() + "';", out CenaDoTextBoxu);
/* string CenaDoTextBoxu ;
classSQL.SQL("SELECT `CenaOBJ` FROM `tabdopyt` WHERE `tabdopyt`.IDCPOBJ = '" + comboBox7.SelectedValue.ToString() + "';", out CenaDoTextBoxu);
textBox7.Text = CenaDoTextBoxu;
*/
textBox7.Text = CenaDoTextBoxu;
*/
}
}
@@ -467,6 +465,9 @@ namespace Mip
classGlobal.FillCB(comboBox1, "tabdopyt", "CisloObj", "TypDopytu", "Kontrakt", textBox2);
}
private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
{
dateTimePicker2.MinDate = dateTimePicker1.Value;
}
}
}

5
Mip/frmMain.Designer.cs generated
View File

@@ -11933,9 +11933,10 @@
this.lblVerzia.AutoSize = true;
this.lblVerzia.Location = new System.Drawing.Point(1367, 9);
this.lblVerzia.Name = "lblVerzia";
this.lblVerzia.Size = new System.Drawing.Size(34, 13);
this.lblVerzia.Size = new System.Drawing.Size(37, 13);
this.lblVerzia.TabIndex = 13;
this.lblVerzia.Text = "1,009";
this.lblVerzia.Tag = "1,115";
this.lblVerzia.Text = "1.1.15";
this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label50

57
Mip/frmMain.cs
View File

@@ -1240,7 +1240,7 @@ namespace Mip
IF (UpravaMaterialu = '',Material,CONCAT(Material,'-',UpravaMaterialu)) AS Material,
UpravaMaterialu,
Material,
IF (PocetDoVyroby=0,PocetKusov,CONCAT (PocetKusov,'(',PocetDoVyroby,')')) AS PocetKusov,
IF (PocetDoVyroby=0,PocetKusov,CONCAT (PocetKusov,', ',PocetDoVyroby,', ', (SELECT IFNULL( SUM(`tabexpedicia`.PocetVyrDobrychKusov), 0) FROM `tabexpedicia` WHERE `tabexpedicia`.IDDopyt=`pohladdopyty`.IDCPOBJ ))) AS PocetKusov,
RozlisZnakKonecnaOp,
SpojeneRozmery,
IF (StatusDopytu='Pozastavená',StatusDopytu,PoznamkaOBJ) AS PoznamkaOBJ
@@ -1251,7 +1251,7 @@ namespace Mip
`PocetDoVyroby` != 0 AND
`StatusDopytu` != 'Zrušená' AND
`StatusDopytu` != 'Odoslaná'
ORDER BY `DatumPotvrdeny`, `Zakaznik`, `DatumPrijatiaOBJ`";
ORDER BY `DatumPotvrdeny`, `Zakaznik`, `DatumPrijatiaOBJ`;";
classSQL.SQL(cmdZoznamy, out tblTlacitZoznamy);
CultureInfo local = new CultureInfo("sk-SK");
@@ -1409,6 +1409,8 @@ namespace Mip
dataGridView1.Columns["DatumPrijatiaOBJ"].Width = 70;
dataGridView1.Columns["DatumPotvrdeny"].HeaderText = "Potvrdený dátum";
dataGridView1.Columns["DatumPotvrdeny"].Width = 70;
dataGridView1.Columns["DatumPotvrdenyZakaznikovi"].HeaderText = "Potvrdený dátum zákazníkovi";
dataGridView1.Columns["DatumPotvrdenyZakaznikovi"].Width = 70;
dataGridView1.Columns["Zakaznik"].HeaderText = "Zákazník";
dataGridView1.Columns["Zakaznik"].MinimumWidth = 56;
dataGridView1.Columns["Zakaznik"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
@@ -1453,7 +1455,7 @@ namespace Mip
dataGridView1.Columns["RozlisZnakKonecnaOp"].Visible = true;
dataGridView1.Columns["InyNazov"].Visible = true;
dataGridView1.Columns["Alias"].Visible = true;
dataGridView1.Columns["DatumPotvrdenyZakaznikovi"].Visible = true;
}
else
{
@@ -1464,7 +1466,7 @@ namespace Mip
dataGridView1.Columns["RozlisZnakKonecnaOp"].Visible = false;
dataGridView1.Columns["InyNazov"].Visible = false;
dataGridView1.Columns["Alias"].Visible = false;
dataGridView1.Columns["DatumPotvrdenyZakaznikovi"].Visible = false;
}
}
@@ -2276,7 +2278,7 @@ namespace Mip
if (Convert.ToDouble(strVerzia) > 0)
{
if (Convert.ToDouble(strVerzia) > Convert.ToDouble(lblVerzia.Text)) btnUpdate.Enabled = true;
if (Convert.ToDouble(strVerzia) > Convert.ToDouble(lblVerzia.Tag)) btnUpdate.Enabled = true;
else btnUpdate.Enabled = false;
}
@@ -3939,6 +3941,7 @@ namespace Mip
//nastavenie velkosti stlpcov
dGVExpedicia.Columns["Potvrdený dátum"].Width = 70;
dGVExpedicia.Columns["Potvrdený dátum zákazníkovi"].Width = 70;
dGVExpedicia.Columns["Zákazník"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
dGVExpedicia.Columns["Číslo objednávky"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
dGVExpedicia.Columns["Názov výrobku"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
@@ -3977,6 +3980,7 @@ namespace Mip
dGVExpedicia.Columns["StatusDopytu"].Visible = true;
dGVExpedicia.Columns["Poznámka"].Visible = true;
dGVExpedicia.Columns["Výdaj zo skladu"].Visible = true;
dGVExpedicia.Columns["Potvrdený dátum zákazníkovi"].Visible = true;
}
else
{
@@ -3990,6 +3994,7 @@ namespace Mip
dGVExpedicia.Columns["StatusDopytu"].Visible = false;
dGVExpedicia.Columns["Poznámka"].Visible = false;
dGVExpedicia.Columns["Výdaj zo skladu"].Visible = false;
dGVExpedicia.Columns["Potvrdený dátum zákazníkovi"].Visible = false;
}
if (EXPColorIndex == -1) classGlobal.SetRowColor2(dGVExpedicia, "StatusDopytu");
@@ -6191,7 +6196,7 @@ namespace Mip
private void button95_Click(object sender, EventArgs e)
{
classGlobal.DeleteRamDisk(); classGlobal.CreateRamDisk();
classSQL.ExportFormToHDD("Zoznam zo skladu.xls", @"W:\zzs.xls");
classSQL.ExportFormToHDD("ZoznanZoSkladu.xls", @"W:\zzs.xls");
Excel.Application xlApp;
Excel.Workbook xlWorkBook;
@@ -6212,6 +6217,7 @@ namespace Mip
DataTable tblSklad = new DataTable();
classSQL.SQL(cmdSklad, out tblSklad);
var sumaPoloziek = 0.0m;
for (int ri = 0; ri < tblSklad.Rows.Count; ri++)
{
int excelRowIndex = ri + 3;
@@ -6224,13 +6230,24 @@ namespace Mip
xlWorkSheet.Range["F" + excelRowIndex.ToString()].Value = dtrSklad["RozlisZnakKonecnaOp"].ToString();
xlWorkSheet.Range["G" + excelRowIndex.ToString()].Value = dtrSklad["Alias"].ToString();
xlWorkSheet.Range["H" + excelRowIndex.ToString()].Value = dtrSklad["PocetSegmentov"].ToString();
xlWorkSheet.Range["I" + excelRowIndex.ToString()].Value = dtrSklad["Počet na sklade"].ToString();
xlWorkSheet.Range["I" + excelRowIndex.ToString()].Value = $"{dtrSklad["Vážená cena"].ToString()}, {dtrSklad["Priemerná cena"].ToString()}";
xlWorkSheet.Range["J" + excelRowIndex.ToString()].Value = dtrSklad["Počet na sklade"].ToString();
var cenaVazena = dtrSklad["Vážená cena"].ToString().Length != 0 ? Convert.ToDecimal(dtrSklad["Vážená cena"].ToString().Replace(" €", "").Replace(".", ",")) : 0;
var cenaMaximalna = dtrSklad["Najvyššia cena"].ToString().Length != 0 ? Convert.ToDecimal(dtrSklad["Najvyššia cena"].ToString().Replace(" €", "").Replace(".", ",")) : 0;
var cenaPriemerna = dtrSklad["Priemerná cena"].ToString().Length != 0 ? Convert.ToDecimal(dtrSklad["Priemerná cena"].ToString().Replace(" €", "").Replace(".", ",")) : 0;
var cena = cenaVazena != 0 ? cenaVazena : cenaPriemerna != 0 ? cenaPriemerna : cenaMaximalna;
var pocet = Convert.ToDecimal(dtrSklad["Počet na sklade"]);
sumaPoloziek = sumaPoloziek + (cena * pocet);
}
var pocetPoloziek = tblSklad.Rows.Count;
xlWorkSheet.Range["B2"].Value = $"Počet položiek: {pocetPoloziek.ToString()}{Environment.NewLine}Suma filtrovaných záznamov: { sumaPoloziek.ToString() }€{Environment.NewLine} Názov výrobku";
//vypocet poslednej strany tlacenia
double dNumber = Convert.ToDouble(tblSklad.Rows.Count) / Convert.ToDouble(31);
int lastrow = Convert.ToInt16(Math.Ceiling(dNumber) * 31); //'odpocita cislo prvej bunky kont tab., vydeli poctom riadkov na stramu (40), zaokruhli hore, a vynasobi poctom riadkov na stranu
xlWorkSheet.PageSetup.PrintArea = "$B$2:$I$" + (lastrow + 2);
xlWorkSheet.PageSetup.PrintArea = "$B$2:$J$" + (lastrow + 2);
xlApp.Visible = true;
xlApp.ActiveWindow.Activate();
@@ -7085,11 +7102,9 @@ namespace Mip
private void refreshNepotvrdeneNedoruceneZiadanky()
{
string sqlCommandZiadanky;
sqlCommandZiadanky = @"SELECT * FROM `pohlad-ziadanka`
WHERE `Status` = 'True'
AND (`Status žiadanky` = '#&@' OR (`Status žiadanky` = 'Dopyt odoslaný' AND `Termín` <= NOW()) OR (`Status žiadanky` = 'Objednávka odoslaná' AND `Termín` <= NOW()) OR (`Status žiadanky` = 'Potvrdená' AND `Potvrdený dátum` <= NOW()))
ORDER BY `IDZiadanka` DESC;";
var sqlCommandZiadanky = @"SELECT* FROM `pohlad-ziadanka`
WHERE `Status` = 'True' AND(`Potvrdený dátum` <= NOW() OR `Potvrdený dátum` != NULL) AND(`Status žiadanky` != 'Vybavená' AND `Status žiadanky` != 'Nevybavená' AND `Status žiadanky` != 'Zamietnutá')
ORDER BY `IDZiadanka` DESC;";
DataTable outdtbl = new DataTable();
@@ -7106,7 +7121,7 @@ namespace Mip
if (dataGridView16.SelectedRows.Count > 0) selectedIndex = Convert.ToInt32(dataGridView16.SelectedRows[0].Index);
string strTextBoxCondition = $"{textBox52.Tag} {textBox38.Tag}";
string strTextBoxCondition = $"{ textBox52.Tag} {textBox38.Tag}";
//if (ZiadankyColorIndex > 0) strTextBoxCondition = " AND INSTR(`" + dataGridView16.Columns[ZiadankyColorIndex].Name + "`, '" + textBox38.Text + "')>0 ";
string sqlCommandZiadanky;
@@ -8444,6 +8459,8 @@ namespace Mip
dataGridView16.Columns["Dátum schválenia"].Width = 70;
dataGridView16.Columns["Dátum odoslania"].Width = 70;
dataGridView16.Columns["Potvrdený dátum"].Width = 70;
dataGridView16.Columns["Potvrdený dátum"].HeaderText = "Potvrdený termín";
dataGridView16.Columns["Potvrdený dátum"].DisplayIndex = 6;
dataGridView16.Columns["Dátum prijatia"].Width = 70;
dataGridView16.Columns["Dátum vybavenia"].Width = 70;
dataGridView16.Columns["Status žiadanky"].MinimumWidth = 85;
@@ -8462,19 +8479,19 @@ namespace Mip
dataGridView16.Columns["Firma"].DisplayIndex = 4;
dataGridView16.Columns["Poznámka"].MinimumWidth = 100;
dataGridView16.Columns["Poznámka"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
dataGridView16.Columns["Poznámka"].DisplayIndex = 11;
dataGridView16.Columns["Poznámka"].DisplayIndex = 12;
dataGridView16.Columns["Termín"].Width = 70;
dataGridView16.Columns["Termín"].DisplayIndex = 5;
dataGridView16.Columns["Počet kusov"].Width = 60;
dataGridView16.Columns["Počet kusov"].DisplayIndex = 6;
dataGridView16.Columns["Počet kusov"].DisplayIndex = 7;
dataGridView16.Columns["Množstvo"].Width = 60;
dataGridView16.Columns["Množstvo"].DisplayIndex = 7;
dataGridView16.Columns["Množstvo"].DisplayIndex = 8;
dataGridView16.Columns["Jednotka"].Width = 60;
dataGridView16.Columns["Jednotka"].DisplayIndex = 8;
dataGridView16.Columns["Jednotka"].DisplayIndex = 9;
dataGridView16.Columns["Faktúra"].Width = 80;
dataGridView16.Columns["Cena"].Width = 60;
dataGridView16.Columns["Cena"].DisplayIndex = 9;
dataGridView16.Columns["Číslo objednávky"].DisplayIndex = 10;
dataGridView16.Columns["Cena"].DisplayIndex = 10;
dataGridView16.Columns["Číslo objednávky"].DisplayIndex = 11;
dataGridView16.Columns["IDUser"].Visible = false;
dataGridView16.Columns["Číslo dokumentu"].MinimumWidth = 95;
dataGridView16.Columns["Číslo dokumentu"].AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;

2
Mip/frmNacenovanie.cs
View File

@@ -5346,7 +5346,7 @@ namespace Mip
range = xlWorkSheet.UsedRange;
xlWorkSheet.Range["B4", "E5"].Value = objObjectVyrobok.DatumPrijatia; //datum prijatia
xlWorkSheet.Range["B4", "E5"].Value = String.Format("{0:dd.MM.yyyy}", Convert.ToDateTime(objObjectVyrobok.DatumPrijatia)); //datum prijatia
xlWorkSheet.Range["F4", "I5"].Value = DateTime.Now.Day.ToString() + "." + DateTime.Now.Month.ToString() + "." + DateTime.Now.Year.ToString(); //dnesny datum
xlWorkSheet.Range["J4", "Q5"].Value = objObjectVyrobok.SpojeneRozmery; //rozmery
xlWorkSheet.Range["B7", "I8"].Value = objObjectVyrobok.NazovVyrobku; //cislo vykresu

93
Mip/frmNewDopyt.Designer.cs generated
View File

@@ -52,6 +52,8 @@
this.comboBox2 = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
this.label25 = new System.Windows.Forms.Label();
this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
this.label23 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
@@ -127,7 +129,7 @@
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(130, 77);
this.label24.Location = new System.Drawing.Point(127, 77);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(52, 13);
this.label24.TabIndex = 9;
@@ -366,6 +368,8 @@
//
// groupBox4
//
this.groupBox4.Controls.Add(this.dateTimePicker2);
this.groupBox4.Controls.Add(this.label25);
this.groupBox4.Controls.Add(this.dateTimePicker1);
this.groupBox4.Controls.Add(this.label23);
this.groupBox4.Controls.Add(this.label22);
@@ -400,25 +404,42 @@
this.groupBox4.Enabled = false;
this.groupBox4.Location = new System.Drawing.Point(249, 1);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(278, 272);
this.groupBox4.Size = new System.Drawing.Size(335, 294);
this.groupBox4.TabIndex = 3;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Informácie o zázname";
//
// dateTimePicker2
//
this.dateTimePicker2.CustomFormat = "YYYY-mm-DD";
this.dateTimePicker2.Location = new System.Drawing.Point(158, 110);
this.dateTimePicker2.Name = "dateTimePicker2";
this.dateTimePicker2.Size = new System.Drawing.Size(174, 20);
this.dateTimePicker2.TabIndex = 40;
//
// label25
//
this.label25.Location = new System.Drawing.Point(3, 112);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(149, 18);
this.label25.TabIndex = 39;
this.label25.Text = "Dátum potvrdený zákazníkovi";
//
// dateTimePicker1
//
this.dateTimePicker1.CustomFormat = "YYYY-mm-DD";
this.dateTimePicker1.Location = new System.Drawing.Point(98, 87);
this.dateTimePicker1.Location = new System.Drawing.Point(158, 87);
this.dateTimePicker1.Name = "dateTimePicker1";
this.dateTimePicker1.Size = new System.Drawing.Size(174, 20);
this.dateTimePicker1.TabIndex = 28;
this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged);
//
// label23
//
this.label23.AutoSize = true;
this.label23.Enabled = false;
this.label23.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.label23.Location = new System.Drawing.Point(150, 112);
this.label23.Location = new System.Drawing.Point(210, 135);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(54, 13);
this.label23.TabIndex = 38;
@@ -427,7 +448,7 @@
//
// label22
//
this.label22.Location = new System.Drawing.Point(213, 142);
this.label22.Location = new System.Drawing.Point(273, 165);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(55, 13);
this.label22.TabIndex = 37;
@@ -437,7 +458,7 @@
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(213, 129);
this.label21.Location = new System.Drawing.Point(273, 152);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(55, 13);
this.label21.TabIndex = 36;
@@ -446,7 +467,7 @@
// numericUpDown1
//
this.numericUpDown1.Enabled = false;
this.numericUpDown1.Location = new System.Drawing.Point(205, 109);
this.numericUpDown1.Location = new System.Drawing.Point(265, 132);
this.numericUpDown1.Maximum = new decimal(new int[] {
99999,
0,
@@ -460,7 +481,7 @@
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(259, 112);
this.checkBox1.Location = new System.Drawing.Point(319, 135);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(15, 14);
this.checkBox1.TabIndex = 35;
@@ -470,7 +491,7 @@
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(155, 129);
this.label11.Location = new System.Drawing.Point(215, 152);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(55, 13);
this.label11.TabIndex = 33;
@@ -479,7 +500,7 @@
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(97, 129);
this.label10.Location = new System.Drawing.Point(157, 152);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(55, 13);
this.label10.TabIndex = 32;
@@ -487,7 +508,7 @@
//
// label6
//
this.label6.Location = new System.Drawing.Point(3, 251);
this.label6.Location = new System.Drawing.Point(3, 274);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(90, 14);
this.label6.TabIndex = 30;
@@ -497,7 +518,7 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.label5.Location = new System.Drawing.Point(101, 245);
this.label5.Location = new System.Drawing.Point(160, 268);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(0, 20);
this.label5.TabIndex = 9;
@@ -506,14 +527,14 @@
//
this.lblInynazov.AutoSize = true;
this.lblInynazov.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.lblInynazov.Location = new System.Drawing.Point(101, 155);
this.lblInynazov.Location = new System.Drawing.Point(161, 178);
this.lblInynazov.Name = "lblInynazov";
this.lblInynazov.Size = new System.Drawing.Size(0, 20);
this.lblInynazov.TabIndex = 29;
//
// label19
//
this.label19.Location = new System.Drawing.Point(3, 203);
this.label19.Location = new System.Drawing.Point(3, 226);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(90, 14);
this.label19.TabIndex = 25;
@@ -524,7 +545,7 @@
this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox7.Enabled = false;
this.comboBox7.FormattingEnabled = true;
this.comboBox7.Location = new System.Drawing.Point(98, 200);
this.comboBox7.Location = new System.Drawing.Point(158, 223);
this.comboBox7.Name = "comboBox7";
this.comboBox7.Size = new System.Drawing.Size(174, 21);
this.comboBox7.TabIndex = 24;
@@ -532,7 +553,7 @@
//
// label18
//
this.label18.Location = new System.Drawing.Point(97, 142);
this.label18.Location = new System.Drawing.Point(157, 165);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(55, 13);
this.label18.TabIndex = 23;
@@ -541,7 +562,7 @@
//
// label17
//
this.label17.Location = new System.Drawing.Point(155, 142);
this.label17.Location = new System.Drawing.Point(215, 165);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(55, 13);
this.label17.TabIndex = 22;
@@ -550,14 +571,14 @@
//
// textBox8
//
this.textBox8.Location = new System.Drawing.Point(98, 224);
this.textBox8.Location = new System.Drawing.Point(158, 247);
this.textBox8.Name = "textBox8";
this.textBox8.Size = new System.Drawing.Size(174, 20);
this.textBox8.TabIndex = 18;
//
// textBox7
//
this.textBox7.Location = new System.Drawing.Point(98, 177);
this.textBox7.Location = new System.Drawing.Point(158, 200);
this.textBox7.Name = "textBox7";
this.textBox7.Size = new System.Drawing.Size(174, 20);
this.textBox7.TabIndex = 17;
@@ -568,7 +589,7 @@
//
// textBox6
//
this.textBox6.Location = new System.Drawing.Point(98, 109);
this.textBox6.Location = new System.Drawing.Point(158, 132);
this.textBox6.MaxLength = 6;
this.textBox6.Name = "textBox6";
this.textBox6.Size = new System.Drawing.Size(51, 20);
@@ -578,7 +599,7 @@
//
// button3
//
this.button3.Location = new System.Drawing.Point(245, 62);
this.button3.Location = new System.Drawing.Point(305, 62);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(27, 23);
this.button3.TabIndex = 13;
@@ -590,7 +611,7 @@
//
this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox4.FormattingEnabled = true;
this.comboBox4.Location = new System.Drawing.Point(98, 63);
this.comboBox4.Location = new System.Drawing.Point(158, 63);
this.comboBox4.Name = "comboBox4";
this.comboBox4.Size = new System.Drawing.Size(141, 21);
this.comboBox4.TabIndex = 12;
@@ -598,7 +619,7 @@
//
// button4
//
this.button4.Location = new System.Drawing.Point(245, 39);
this.button4.Location = new System.Drawing.Point(305, 39);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(27, 23);
this.button4.TabIndex = 10;
@@ -610,7 +631,7 @@
//
this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox5.FormattingEnabled = true;
this.comboBox5.Location = new System.Drawing.Point(98, 40);
this.comboBox5.Location = new System.Drawing.Point(158, 40);
this.comboBox5.Name = "comboBox5";
this.comboBox5.Size = new System.Drawing.Size(141, 21);
this.comboBox5.TabIndex = 9;
@@ -618,7 +639,7 @@
//
// textBox5
//
this.textBox5.Location = new System.Drawing.Point(98, 17);
this.textBox5.Location = new System.Drawing.Point(158, 17);
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(174, 20);
this.textBox5.TabIndex = 8;
@@ -626,7 +647,7 @@
//
// label16
//
this.label16.Location = new System.Drawing.Point(3, 226);
this.label16.Location = new System.Drawing.Point(3, 249);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(90, 14);
this.label16.TabIndex = 7;
@@ -634,7 +655,7 @@
//
// label15
//
this.label15.Location = new System.Drawing.Point(3, 180);
this.label15.Location = new System.Drawing.Point(3, 203);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(90, 14);
this.label15.TabIndex = 6;
@@ -642,7 +663,7 @@
//
// label14
//
this.label14.Location = new System.Drawing.Point(3, 157);
this.label14.Location = new System.Drawing.Point(3, 180);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(90, 14);
this.label14.TabIndex = 5;
@@ -650,9 +671,9 @@
//
// label13
//
this.label13.Location = new System.Drawing.Point(3, 109);
this.label13.Location = new System.Drawing.Point(3, 132);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(90, 45);
this.label13.Size = new System.Drawing.Size(98, 45);
this.label13.TabIndex = 4;
this.label13.Text = "Objednaný počet kusov";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -692,7 +713,7 @@
// btnZobrazVykres
//
this.btnZobrazVykres.Enabled = false;
this.btnZobrazVykres.Location = new System.Drawing.Point(248, 273);
this.btnZobrazVykres.Location = new System.Drawing.Point(251, 297);
this.btnZobrazVykres.Name = "btnZobrazVykres";
this.btnZobrazVykres.Size = new System.Drawing.Size(93, 23);
this.btnZobrazVykres.TabIndex = 5;
@@ -703,7 +724,7 @@
// btnAddOBJ
//
this.btnAddOBJ.Enabled = false;
this.btnAddOBJ.Location = new System.Drawing.Point(347, 273);
this.btnAddOBJ.Location = new System.Drawing.Point(378, 297);
this.btnAddOBJ.Name = "btnAddOBJ";
this.btnAddOBJ.Size = new System.Drawing.Size(91, 23);
this.btnAddOBJ.TabIndex = 6;
@@ -713,7 +734,7 @@
//
// button8
//
this.button8.Location = new System.Drawing.Point(444, 273);
this.button8.Location = new System.Drawing.Point(500, 297);
this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(83, 23);
this.button8.TabIndex = 7;
@@ -736,7 +757,7 @@
this.groupBox3.Enabled = false;
this.groupBox3.Location = new System.Drawing.Point(1, 244);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(247, 53);
this.groupBox3.Size = new System.Drawing.Size(247, 79);
this.groupBox3.TabIndex = 9;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Rozmery výrobku";
@@ -745,7 +766,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(528, 297);
this.ClientSize = new System.Drawing.Size(585, 323);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.button8);
this.Controls.Add(this.btnAddOBJ);
@@ -835,5 +856,7 @@
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.DateTimePicker dateTimePicker2;
private System.Windows.Forms.Label label25;
}
}

81
Mip/frmNewDopyt.cs
View File

@@ -1,11 +1,6 @@
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 Mip
@@ -29,26 +24,27 @@ namespace Mip
private void btnAddOBJ_Click(object sender, EventArgs e)
{
DateTime dt;
DateTime dt;
dt = DateTime.Now;
string format = "yyyy-MM-dd";
string TypDopytu = "", StatusDopytu = "", PotvrdDatum = "";
string TypDopytu = "", StatusDopytu = "", PotvrdDatum = "", PotvrdDatumZakaznikovi = "";
string cmd;
//if (rBdopyt.Checked == true){TypDopytu = "Cenová ponuka"; StatusDopytu = "Prijatá";}
if (rBObj.Checked == true){TypDopytu = "Objednávka"; StatusDopytu = "Prijatá";}
if (rBObj.Checked == true) { TypDopytu = "Objednávka"; StatusDopytu = "Prijatá"; }
if (rBObjDoKontr.Checked == true) { TypDopytu = "Objednávka do kontraktu"; StatusDopytu = "Prijatá"; }
if (rBKontrakt.Checked == true) {TypDopytu = "Kontrakt"; StatusDopytu = "Prijatý";}
if (rBzKontraktu.Checked == true){ TypDopytu = "Call Off"; StatusDopytu = "Prijatý";}
if (rBKontrakt.Checked == true) { TypDopytu = "Kontrakt"; StatusDopytu = "Prijatý"; }
if (rBzKontraktu.Checked == true) { TypDopytu = "Call Off"; StatusDopytu = "Prijatý"; }
//ak je pocet do vyroby 0, status sa nastavi na hodnotu "Na lapovni, vyminka je kontrakt ten sa nezmeni aj ked je 0"
string strPocetDoVyroby = "";
strPocetDoVyroby = label22.Text.ToString();
if ( Convert.ToInt32(strPocetDoVyroby) == 0 &&
(rBzKontraktu.Checked == true||rBObj.Checked == true)) StatusDopytu = "Na lapovni";
if (Convert.ToInt32(strPocetDoVyroby) == 0 &&
(rBzKontraktu.Checked == true || rBObj.Checked == true)) StatusDopytu = "Na lapovni";
PotvrdDatum = dateTimePicker1.Value.ToString(format);
PotvrdDatumZakaznikovi = dateTimePicker2.Value.ToString(format);
cmd = "SELECT `IDVyrobok` FROM `mip`.`tabvyrobok` WHERE `NazovVyrobku` = '" + comboBox3.Text + "' AND `Zakaznik` = '" + comboBox2.Text + "' ;";
string idvyr;
@@ -83,6 +79,7 @@ namespace Mip
`UpravaMaterialu`,
`DatumPrijatiaOBJ`,
`DatumPotvrdeny`,
`DatumPotvrdenyZakaznikovi`,
`Zakaznik`,
`IDVyrobok`,
`PoznamkaOBJ`,
@@ -101,11 +98,12 @@ namespace Mip
+ textBox5.Text.ToString() + "', '"
+ comboBox5.Text.ToString() + "', '"
+ comboBox4.Text.ToString() + "', "
+ "DATE(NOW()), '" //+ DatumPrijatia + "', '"
+ "DATE(NOW()), '" //+ DatumPrijatia + "', '"
+ PotvrdDatum + "', '"
+ comboBox2.Text.ToString () + "', " //zakaznik
+ PotvrdDatumZakaznikovi + "', '"
+ comboBox2.Text.ToString() + "', " //zakaznik
+ idvyr + ", '" //IDvyrobok
+ textBox8.Text.ToString () + "', " //poznamka
+ textBox8.Text.ToString() + "', " //poznamka
+ textBox6.Text.ToString() + ", " //pocet kusov
+ strCena.Replace(",", ".") + ", " //cena
+ label22.Text.ToString() + ", " //pocet do vyroby
@@ -129,7 +127,7 @@ namespace Mip
if ((rBObj.Checked == true && numericUpDown1.Value != 0) || (rBzKontraktu.Checked == true))
{
string strTypVydaja = "'Výdaj'";
if (rBObj.Checked == true && Convert.ToInt32(label22.Text)!=0) strTypVydaja = "'Rezervovaný výdaj'";
if (rBObj.Checked == true && Convert.ToInt32(label22.Text) != 0) strTypVydaja = "'Rezervovaný výdaj'";
if (rBzKontraktu.Checked == true) strTypVydaja = "'Výdaj'";
string strMatUMat;
@@ -197,7 +195,7 @@ namespace Mip
{
float floatResult;
if (e.KeyChar == '.') e.KeyChar = ',';
if(!(float.TryParse(textBox7.Text + e.KeyChar, out floatResult)) && (int ) e.KeyChar !=8) e.KeyChar = '\0';
if (!(float.TryParse(textBox7.Text + e.KeyChar, out floatResult)) && (int)e.KeyChar != 8) e.KeyChar = '\0';
}
private void textBox7_TextChanged_1(object sender, EventArgs e)
@@ -225,10 +223,10 @@ namespace Mip
{
Form Add = new frmAddPomUdaje();
Add.Text = "Pridať zákazníka";
DialogResult dr= Add.ShowDialog();
DialogResult dr = Add.ShowDialog();
if (dr == DialogResult.OK)
{
classGlobal.FillCB(comboBox2, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať zákazníka",textBox3);
classGlobal.FillCB(comboBox2, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať zákazníka", textBox3);
comboBox2.Text = classGlobal.strNovyPomocnyUdaj;
}
}
@@ -237,7 +235,7 @@ namespace Mip
{
Form Add = new frmAddPomUdaje();
Add.Text = "Pridať materiál";
DialogResult dr= Add.ShowDialog();
DialogResult dr = Add.ShowDialog();
if (dr == DialogResult.OK)
{
classGlobal.FillCB(comboBox5, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať materiál");
@@ -249,7 +247,7 @@ namespace Mip
{
Form Add = new frmAddPomUdaje();
Add.Text = "Pridať úpravu materiálu";
DialogResult dr= Add.ShowDialog();
DialogResult dr = Add.ShowDialog();
if (dr == DialogResult.OK)
{
classGlobal.FillCB(comboBox4, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať úpravu materiálu");
@@ -262,9 +260,9 @@ namespace Mip
}
private void frmNewEditOBJ_Shown(object sender, EventArgs e)
private void frmNewEditOBJ_Shown(object sender, EventArgs e)
{
classGlobal.FillCB(comboBox2, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať zákazníka",textBox3);
classGlobal.FillCB(comboBox2, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať zákazníka", textBox3);
classGlobal.FillCB(comboBox5, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať materiál");
classGlobal.FillCB(comboBox4, "tabpomocnychudajov", "Hodnota", "Kategoria", "Pridať úpravu materiálu");
@@ -277,13 +275,13 @@ namespace Mip
{
comboBox3.Items.Clear();
comboBox5.SelectedIndex=-1;
comboBox5.SelectedIndex = -1;
comboBox4.SelectedIndex = -1;
EnableSelectedValueChange = false;
comboBox7.DataSource = null;
comboBox7.Items.Clear();
comboBox7.Text = "";
lblAlias.Text="";
lblAlias.Text = "";
string cmd;
cmd = "SELECT * FROM `mip`.`tabvyrobok` WHERE `Zakaznik` = '" + comboBox2.Text
@@ -349,7 +347,7 @@ namespace Mip
}
if (comboBox3.Text != "") btnZobrazVykres.Enabled = true;
else btnZobrazVykres.Enabled = false ;
else btnZobrazVykres.Enabled = false;
if (rBObj.Checked) checkBox1.Enabled = true;
else checkBox1.Enabled = false;
lblToolTip.Text = comboBox3.Text;
@@ -371,7 +369,7 @@ namespace Mip
if (dr == DialogResult.OK)
{
classGlobal.FillCB(comboBox3, "tabvyrobok","NazovVyrobku","Zakaznik",comboBox2.Text);//**//
classGlobal.FillCB(comboBox3, "tabvyrobok", "NazovVyrobku", "Zakaznik", comboBox2.Text);//**//
comboBox3.Text = classGlobal.strNovyPomocnyUdaj;
}
@@ -468,7 +466,7 @@ namespace Mip
{
if(rBdopyt.Checked || rBObj.Checked || rBKontrakt.Checked)
if (rBdopyt.Checked || rBObj.Checked || rBKontrakt.Checked)
{
comboBox1.Visible = false;
textBox2.Visible = false;
@@ -507,7 +505,7 @@ namespace Mip
textBox3.Text = "";
comboBox3.Items.Clear();
textBox4.Text = "";
lblAlias.Text="";
lblAlias.Text = "";
//button2.Enabled = true;
label2.Enabled = true;
label3.Text = "";
@@ -612,7 +610,7 @@ namespace Mip
string strMatUMat;
if (comboBox4.Text.ToString() == "") strMatUMat = comboBox5.Text.ToString();
else strMatUMat = comboBox5.Text.ToString() + " + " + comboBox4.Text.ToString();
string cmd = @"SELECT
string cmd = @"SELECT
IFNULL((SELECT SUM(`tabskladvyrobkov`.Pocet) FROM `tabskladvyrobkov`
WHERE (`tabskladvyrobkov`.SkladOperacia = 'Príjem' OR `tabskladvyrobkov`.SkladOperacia = 'Inventárny príjem') AND
`tabskladvyrobkov`.StatusSkladOperacie = 'Vybavený' AND
@@ -625,10 +623,10 @@ namespace Mip
`tabskladvyrobkov`.MaterialSUpravouMat = '" + strMatUMat + @"' AND
`tabskladvyrobkov`.IDvyr = " + IDvyrobokPrePocetNaSklade + @"),0)
AS `TotalNaSklade`";
string strTotalNaSklade;
classSQL.SQL(cmd, out strTotalNaSklade);
if (strTotalNaSklade != "") label17.Text = strTotalNaSklade;
else label17.Text = "0";
string strTotalNaSklade;
classSQL.SQL(cmd, out strTotalNaSklade);
if (strTotalNaSklade != "") label17.Text = strTotalNaSklade;
else label17.Text = "0";
}
@@ -650,9 +648,9 @@ namespace Mip
`pohladpocetciastocneodoslanych`.IDVyrobok = " + IDvyrobokPrePocetNaSklade + @"),0)
AS `TotalVoVyrobe`";
/* DataTable TotalVoVyrobe = classSQL.commandSQL(cmd, 1);
if (TotalVoVyrobe.Rows[0][0].ToString() != "") label18.Text = TotalVoVyrobe.Rows[0][0].ToString();
else label18.Text = "0";*/
/* DataTable TotalVoVyrobe = classSQL.commandSQL(cmd, 1);
if (TotalVoVyrobe.Rows[0][0].ToString() != "") label18.Text = TotalVoVyrobe.Rows[0][0].ToString();
else label18.Text = "0";*/
string strTotalVoVyrobe = "";
classSQL.SQL(cmd, out strTotalVoVyrobe);
label18.Text = strTotalVoVyrobe;
@@ -732,7 +730,7 @@ namespace Mip
private void comboBox3_MouseHover(object sender, EventArgs e)
{
if(comboBox3.Text != "") InfoPanel(groupBox2, comboBox3, comboBox3.Text);
if (comboBox3.Text != "") InfoPanel(groupBox2, comboBox3, comboBox3.Text);
}
@@ -744,7 +742,7 @@ namespace Mip
lblToolTip.Text = hodnota;
lblToolTip.AutoSize = true;
lblToolTip.BorderStyle = BorderStyle.FixedSingle;
lblToolTip.Location = new Point(grpB.Location.X+ctrl.Location.X + ctrl.Width + 3,grpB.Location.Y+ ctrl.Location.Y);
lblToolTip.Location = new Point(grpB.Location.X + ctrl.Location.X + ctrl.Width + 3, grpB.Location.Y + ctrl.Location.Y);
lblToolTip.Visible = true;
this.Controls.Add(lblToolTip);
lblToolTip.BringToFront();
@@ -785,6 +783,11 @@ namespace Mip
{
lblToolTip.Visible = false;
}
private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
{
dateTimePicker2.MinDate = dateTimePicker1.Value;
}
}

26
Mip/frmVydajZoSkladu.cs
View File

@@ -1,11 +1,5 @@
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 Mip
@@ -36,7 +30,7 @@ namespace Mip
textBox1.Enabled = false;
comboBox1.Enabled = false;
}
if(Convert.ToInt32(label15.Text) == 0) comboBox1.Items.RemoveAt(comboBox1.SelectedIndex);
if (Convert.ToInt32(label15.Text) == 0) comboBox1.Items.RemoveAt(comboBox1.SelectedIndex);
tblForGridView.Rows.Add(newdr);
tblForGridView.AcceptChanges();
dataGridView1.DataSource = tblForGridView;
@@ -102,7 +96,7 @@ namespace Mip
DataTable tblCBHodnoty = new DataTable();
string cmd4 = "";
cmd4 = "SELECT DISTINCT `CisloKrabice` FROM `pohladkrabiceskop` WHERE `IDvyr` = " + idnajdivyrobok.ToString() + ";";
cmd4 = $"SELECT DISTINCT `CisloKrabice` FROM `pohladkrabiceskop` WHERE `IDvyr` = {idnajdivyrobok.ToString()} AND `MaterialSUpravouMat` = '{dr0["MaterialSUpravouMat"].ToString()}';";
classSQL.SQL(cmd4, out tblCBHodnoty);
comboBox1.Items.Clear();
@@ -111,19 +105,21 @@ namespace Mip
foreach (DataRow CBRow in tblCBHodnoty.Rows)
{
string cmd5 = @"SELECT DISTINCT
string cmd5 = $@"SELECT DISTINCT
(IFNULL((SELECT SUM(`PocetKusov`)
FROM `pohladkrabiceskop`
WHERE (`IDvyr` = " + idnajdivyrobok.ToString() +
@" AND (`SkladOperacia` = 'Príjem' OR `SkladOperacia` = 'Inventárny príjem')
WHERE (`IDvyr` = {idnajdivyrobok.ToString()}
AND (`SkladOperacia` = 'Príjem' OR `SkladOperacia` = 'Inventárny príjem')
AND `StatusSkladOperacie` = 'Vybavený'
AND `CisloKrabice` = " + CBRow["CisloKrabice"].ToString() + @")),0)
AND `MaterialSUpravouMat` = '{dr0["MaterialSUpravouMat"].ToString()}'
AND `CisloKrabice` = {CBRow["CisloKrabice"].ToString()})),0)
-
IFNULL((SELECT SUM(`PocetKusov`)
FROM `pohladkrabiceskop`
WHERE (`IDvyr` = " + idnajdivyrobok.ToString() +
@" AND (`SkladOperacia` = 'Výdaj' OR `SkladOperacia` = 'Inventárny výdaj')
AND `CisloKrabice` = " + CBRow["CisloKrabice"].ToString() + @")),0)
WHERE (`IDvyr` = {idnajdivyrobok.ToString()}
AND (`SkladOperacia` = 'Výdaj' OR `SkladOperacia` = 'Inventárny výdaj')
AND `MaterialSUpravouMat` = '{dr0["MaterialSUpravouMat"].ToString()}'
AND `CisloKrabice` = {CBRow["CisloKrabice"].ToString()})),0)
) as `PocKus`
FROM `pohladkrabiceskop`";
classSQL.SQL(cmd5, out strPocetVKrabici);

BIN
Mip/obj/Debug/Mip.csproj.ResolveComReference.cache
View File

Binary file not shown.

6
MipInstaller/MipInstaller.vdproj
View File

@@ -630,15 +630,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Mip1.1"
"ProductCode" = "8:{F2D86B63-AD8A-40C4-9E80-2969F8815850}"
"PackageCode" = "8:{7CABACB3-CA4C-4040-A0BE-96F7EA2DACDA}"
"ProductCode" = "8:{CEA7D3C2-1155-4451-8864-74556EC36D03}"
"PackageCode" = "8:{1F79D53A-9B5A-4A70-8994-9C39FD5AB51C}"
"UpgradeCode" = "8:{96C5136E-DF0B-48C4-9031-F8CA75E3E3E6}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.9"
"ProductVersion" = "8:1.1.14"
"Manufacturer" = "8:Kompozitum"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"

BIN
MipInstaller/Release/MipInstaller.msi
View File

Binary file not shown.