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

upravy na posledne zmeny dizajnu

Browse Source
This commit is contained in:
roman6791
2021-10-04 18:40:11 +02:00
parent 9ce8faa0dc
commit b71c08b07e
8 changed files with 223 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
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,7 +24,7 @@ namespace Mip
private void btnAddOBJ_Click(object sender, EventArgs e)
{
DateTime dt;
DateTime dt;
dt = DateTime.Now;
string format = "yyyy-MM-dd";
@@ -37,16 +32,16 @@ namespace Mip
string TypDopytu = "", StatusDopytu = "", PotvrdDatum = "";
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);
@@ -56,7 +51,7 @@ namespace Mip
cmd = "UPDATE `mip`.`tabvyrobok` SET `Status výrobku` = 'Výroba' WHERE `IDVyrobok` = " + idvyr + ";";
classSQL.SQL(cmd);
string cmd2 = "SELECT IFNULL(MAX(ZakazkoveCislo),0) AS Cislo FROM `mip`.`tabdopyt` WHERE MONTH (`DatumPrijatiaOBJ`) = MONTH(NOW()) AND YEAR(`DatumPrijatiaOBJ`) = YEAR(NOW());"; // zisti najvacsie zakazkove cislo
Int32 intZakCislo;
@@ -73,7 +68,7 @@ namespace Mip
int intNevytlacene = 1;
if ((rBObj.Checked == true && Convert.ToInt32(label22.Text) > 0) || rBObjDoKontr.Checked == true) intNevytlacene = 0;
else intNevytlacene = 1;
string cmd3 = @"INSERT INTO `mip`.`tabdopyt` (`TypDopytu`,
`StatusDopytu`,
`ZakazkoveCislo`,
@@ -94,18 +89,18 @@ namespace Mip
`VytlacenyKL-PS`,
`VytlacenyKL-ZS`,
`IDUsers`) VALUES ('"
+ TypDopytu + "', '"
+ TypDopytu + "', '"
+ StatusDopytu + "', '"
+ intZakCislo.ToString() + "', '"
+ comboBox1.Text + "', '"
+ textBox5.Text.ToString() + "', '"
+ comboBox5.Text.ToString() + "', '"
+ comboBox4.Text.ToString() + "', "
+ "DATE(NOW()), '" //+ DatumPrijatia + "', '"
+ PotvrdDatum + "', '"
+ comboBox2.Text.ToString () + "', " //zakaznik
+ "DATE(NOW()), '" //+ DatumPrijatia + "', '"
+ PotvrdDatum + "', '"
+ 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
@@ -113,13 +108,13 @@ namespace Mip
+ textBox1.Text.ToString() + ", " //Pociatocny stav odoslanych kusov
+ intNevytlacene.ToString() + ", "
+ intNevytlacene.ToString() + ", "
+ classUser.ID + ")";
+ classUser.ID + ")";
//classSQL.commandSQL(cmd);
//DataTable d1 = classSQL.commandSQL("SELECT last_insert_id()", 1);
Int32 idLastDopyt = 0;
classSQL.SQL(cmd3, out idLastDopyt);
//ak je obycajna objednavka prida zaznam do tabvyroba s ID dopytu
if ((rBObj.Checked == true && Convert.ToInt32(strPocetDoVyroby) != 0) || rBObjDoKontr.Checked == true) classSQL.SQL("INSERT INTO `mip`.`tabvyroba` (`IDDopyt`) VALUES (" + idLastDopyt.ToString() + ");");
//ak je cenova ponuka prida zaznam do tab-nacenovanie s ID dopytu
@@ -129,7 +124,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;
@@ -144,13 +139,13 @@ namespace Mip
+ strMatUMat + "', "
+ numericUpDown1.Value.ToString() + ", "
+ "DATE(NOW()) );";
classSQL.SQL(cmd);
classSQL.SQL(cmd);
}
MessageBox.Show("Dopyt pridaný!");
this.Close();
}
private void button6_Click(object sender, EventArgs e)
@@ -189,7 +184,7 @@ namespace Mip
private void textBox7_TextChanged(object sender, EventArgs e)
{
}
@@ -197,7 +192,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 +220,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 +232,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 +244,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");
@@ -259,16 +254,16 @@ namespace Mip
private void button5_Click(object sender, EventArgs e)
{
}
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");
}
// vyber zakaznika
@@ -277,24 +272,24 @@ 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
cmd = "SELECT * FROM `mip`.`tabvyrobok` WHERE `Zakaznik` = '" + comboBox2.Text
+ "' AND INSTR(`NazovVyrobku`, '" + textBox4.Text + "')>0 ORDER BY `NazovVyrobku`;";
classSQL.SQL(cmd, out globFrmDtbl);
foreach (DataRow row in globFrmDtbl.Rows)
{
comboBox3.Items.Add(row["NazovVyrobku"].ToString());
}
@@ -313,7 +308,7 @@ namespace Mip
textBox8.Text = "";
btnAddOBJ.Enabled = false;
btnZobrazVykres.Enabled = false;
}
@@ -323,11 +318,11 @@ namespace Mip
string cmd;
cmd = "SELECT * FROM `mip`.`tabvyrobok` WHERE `Zakaznik` = '" //SELECT `NazovVyrobku`, `Alias`
+ comboBox2.Text
+ comboBox2.Text
+ "' AND INSTR(`NazovVyrobku`, '" + textBox4.Text + "')>0 ORDER BY `NazovVyrobku`;";
classSQL.SQL(cmd, out globFrmDtbl);
DataRow dt;
dt = globFrmDtbl.Rows[comboBox3.SelectedIndex];
@@ -338,7 +333,7 @@ namespace Mip
if (rBdopyt.Checked || rBKontrakt.Checked || rBObj.Checked)
{
groupBox3.Enabled = true;
groupBox4.Enabled = true;
@@ -349,7 +344,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;
@@ -360,7 +355,7 @@ namespace Mip
ZistiPocetNaSklade();
ZistiPocetVoVyrobe();
}
}
private void button2_Click(object sender, EventArgs e)
@@ -368,13 +363,13 @@ namespace Mip
Form Add = new frmPridatVyrobok(comboBox2.Text.ToString());
Add.Text = "Pridať výrobok";
DialogResult dr = Add.ShowDialog();
if (dr == DialogResult.OK)
{
classGlobal.FillCB(comboBox3, "tabvyrobok","NazovVyrobku","Zakaznik",comboBox2.Text);//**//
classGlobal.FillCB(comboBox3, "tabvyrobok", "NazovVyrobku", "Zakaznik", comboBox2.Text);//**//
comboBox3.Text = classGlobal.strNovyPomocnyUdaj;
}
}
private void textBox5_TextChanged(object sender, EventArgs e)
@@ -446,12 +441,12 @@ namespace Mip
string strPocetKusov = dtrw["PocetKusov"].ToString();
string strOdoslane;
classSQL.SQL("SELECT SUM(`PocetKusov`) FROM pohladdopyty WHERE `NazovKontraktu` = '" + strNazovKontraktu +
classSQL.SQL("SELECT SUM(`PocetKusov`) FROM pohladdopyty WHERE `NazovKontraktu` = '" + strNazovKontraktu +
"' AND `TypDopytu` = 'Call Off' AND `StatusDopytu` = 'Odoslaný';", out strOdoslane);
string strNeodoslane;
classSQL.SQL("SELECT SUM(`PocetKusov`) FROM pohladdopyty WHERE `NazovKontraktu` = '" + strNazovKontraktu +
"' AND `TypDopytu` = 'Call Off' AND `StatusDopytu` != 'Odoslaný';", out strNeodoslane);
if (strOdoslane == "") strOdoslane = "0";
if (strNeodoslane == "") strNeodoslane = "0";
@@ -466,9 +461,9 @@ namespace Mip
private void VisibilityFlow() // Kontroluje, vypina a zapina zobrazenia a povolenia prvkov formulara
{
if(rBdopyt.Checked || rBObj.Checked || rBKontrakt.Checked)
if (rBdopyt.Checked || rBObj.Checked || rBKontrakt.Checked)
{
comboBox1.Visible = false;
textBox2.Visible = false;
@@ -507,7 +502,7 @@ namespace Mip
textBox3.Text = "";
comboBox3.Items.Clear();
textBox4.Text = "";
lblAlias.Text="";
lblAlias.Text = "";
//button2.Enabled = true;
label2.Enabled = true;
label3.Text = "";
@@ -525,7 +520,7 @@ namespace Mip
comboBox5.SelectedIndex = -1;
this.Text = "Nový záznam";
textBox2.Text = "";
}
private void comboBox5_SelectedValueChanged(object sender, EventArgs e)
@@ -600,7 +595,7 @@ namespace Mip
private void comboBox4_SelectedValueChanged(object sender, EventArgs e)
{
if (comboBox5.Text != "")
if (comboBox5.Text != "")
{
ZistiPocetNaSklade();
ZistiPocetVoVyrobe();
@@ -612,7 +607,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 +620,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,15 +645,15 @@ 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;
}
private void ZistiPouziteCeny()
{
string strTypDopytu = "(`tabdopyt`.TypDopytu = 'Objednávka do kontraktu' OR `tabdopyt`.TypDopytu = 'Objednávka')";
@@ -675,9 +670,9 @@ namespace Mip
comboBox7.ValueMember = "IDCPOBJ";
comboBox7.DisplayMember = "CenaDatum";
EnableSelectedValueChange = true;
}
private void checkBox2_CheckedChanged(object sender, EventArgs e)
{
@@ -732,7 +727,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,11 +739,11 @@ 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();
}
private void comboBox3_MouseLeave(object sender, EventArgs e)
@@ -785,7 +780,12 @@ namespace Mip
{
lblToolTip.Visible = false;
}
private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
{
dateTimePicker2.MinDate = dateTimePicker1.Value;
}
}
}