diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index 8c45248..1069a82 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/frmEditDopyt.cs b/Mip/frmEditDopyt.cs index 7c70f28..5f5209f 100644 --- a/Mip/frmEditDopyt.cs +++ b/Mip/frmEditDopyt.cs @@ -21,6 +21,8 @@ namespace Mip string PotvrdDatum = ""; PotvrdDatum = dateTimePicker1.Value.ToString(format); + string PotvrdDatumZakazikovi = ""; + PotvrdDatumZakazikovi = dateTimePicker2.Value.ToString(format); string strStatusDopytu = ""; string strPocetDoVyroby = ""; strPocetDoVyroby = label22.Text.ToString(); @@ -37,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() + @"', @@ -131,6 +134,7 @@ namespace Mip 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]); + 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()); diff --git a/Mip/frmMain.cs b/Mip/frmMain.cs index 6f265f0..4bc76c5 100644 --- a/Mip/frmMain.cs +++ b/Mip/frmMain.cs @@ -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; } } @@ -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"); diff --git a/Mip/frmNewDopyt.cs b/Mip/frmNewDopyt.cs index a3b3583..fe4edb8 100644 --- a/Mip/frmNewDopyt.cs +++ b/Mip/frmNewDopyt.cs @@ -29,7 +29,7 @@ namespace Mip 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á"; } @@ -44,6 +44,7 @@ namespace Mip (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; @@ -78,6 +79,7 @@ namespace Mip `UpravaMaterialu`, `DatumPrijatiaOBJ`, `DatumPotvrdeny`, + `DatumPotvrdenyZakaznikovi`, `Zakaznik`, `IDVyrobok`, `PoznamkaOBJ`, @@ -98,6 +100,7 @@ namespace Mip + comboBox4.Text.ToString() + "', " + "DATE(NOW()), '" //+ DatumPrijatia + "', '" + PotvrdDatum + "', '" + + PotvrdDatumZakaznikovi + "', '" + comboBox2.Text.ToString() + "', " //zakaznik + idvyr + ", '" //IDvyrobok + textBox8.Text.ToString() + "', " //poznamka diff --git a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache index e2d66fc..d5fe7e7 100644 Binary files a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache and b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache differ diff --git a/Mip/obj/Release/Mip.csproj.ResolveComReference.cache b/Mip/obj/Release/Mip.csproj.ResolveComReference.cache index e2d66fc..fc1efdf 100644 Binary files a/Mip/obj/Release/Mip.csproj.ResolveComReference.cache and b/Mip/obj/Release/Mip.csproj.ResolveComReference.cache differ diff --git a/MipInstaller/Release/MipInstaller.msi b/MipInstaller/Release/MipInstaller.msi index 0ef171e..a91d0cc 100644 Binary files a/MipInstaller/Release/MipInstaller.msi and b/MipInstaller/Release/MipInstaller.msi differ diff --git a/MipInstaller/Release/setup.exe b/MipInstaller/Release/setup.exe index 9509982..7e44825 100644 Binary files a/MipInstaller/Release/setup.exe and b/MipInstaller/Release/setup.exe differ