diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index 97077bf..8cc2f2b 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/frmNacenovanie.Designer.cs b/Mip/frmNacenovanie.Designer.cs index 4ce1e48..d0a7d52 100644 --- a/Mip/frmNacenovanie.Designer.cs +++ b/Mip/frmNacenovanie.Designer.cs @@ -413,6 +413,30 @@ this.myNumericUpDown72 = new MyTools.MyNumericUpDown(); this.label160 = new System.Windows.Forms.Label(); this.panel89 = new System.Windows.Forms.Panel(); + this.label568 = new System.Windows.Forms.Label(); + this.label569 = new System.Windows.Forms.Label(); + this.label570 = new System.Windows.Forms.Label(); + this.label571 = new System.Windows.Forms.Label(); + this.label572 = new System.Windows.Forms.Label(); + this.label573 = new System.Windows.Forms.Label(); + this.myNumericUpDown130 = new MyTools.MyNumericUpDown(); + this.myNumericUpDown131 = new MyTools.MyNumericUpDown(); + this.myNumericUpDown132 = new MyTools.MyNumericUpDown(); + this.myNumericUpDown133 = new MyTools.MyNumericUpDown(); + this.myNumericUpDown134 = new MyTools.MyNumericUpDown(); + this.myNumericUpDown135 = new MyTools.MyNumericUpDown(); + this.label574 = new System.Windows.Forms.Label(); + this.label575 = new System.Windows.Forms.Label(); + this.label576 = new System.Windows.Forms.Label(); + this.label577 = new System.Windows.Forms.Label(); + this.label578 = new System.Windows.Forms.Label(); + this.label579 = new System.Windows.Forms.Label(); + this.label580 = new System.Windows.Forms.Label(); + this.label581 = new System.Windows.Forms.Label(); + this.label582 = new System.Windows.Forms.Label(); + this.label583 = new System.Windows.Forms.Label(); + this.label584 = new System.Windows.Forms.Label(); + this.label585 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.label555 = new System.Windows.Forms.Label(); this.label556 = new System.Windows.Forms.Label(); @@ -704,6 +728,12 @@ this.panel73 = new System.Windows.Forms.Panel(); this.button8 = new System.Windows.Forms.Button(); this.panel76 = new System.Windows.Forms.Panel(); + this.label587 = new System.Windows.Forms.Label(); + this.myNumericUpDown137 = new MyTools.MyNumericUpDown(); + this.label588 = new System.Windows.Forms.Label(); + this.myNumericUpDown138 = new MyTools.MyNumericUpDown(); + this.label589 = new System.Windows.Forms.Label(); + this.myNumericUpDown139 = new MyTools.MyNumericUpDown(); this.label557 = new System.Windows.Forms.Label(); this.myNumericUpDown126 = new MyTools.MyNumericUpDown(); this.button9 = new System.Windows.Forms.Button(); @@ -738,6 +768,12 @@ this.checkBox35 = new System.Windows.Forms.CheckBox(); this.panel71 = new System.Windows.Forms.Panel(); this.panel75 = new System.Windows.Forms.Panel(); + this.label586 = new System.Windows.Forms.Label(); + this.myNumericUpDown136 = new MyTools.MyNumericUpDown(); + this.label590 = new System.Windows.Forms.Label(); + this.myNumericUpDown140 = new MyTools.MyNumericUpDown(); + this.label591 = new System.Windows.Forms.Label(); + this.myNumericUpDown141 = new MyTools.MyNumericUpDown(); this.label561 = new System.Windows.Forms.Label(); this.myNumericUpDown127 = new MyTools.MyNumericUpDown(); this.button7 = new System.Windows.Forms.Button(); @@ -1063,6 +1099,12 @@ this.panel90.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown72)).BeginInit(); this.panel89.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown130)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown131)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown132)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown133)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown134)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown135)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown124)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown125)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown85)).BeginInit(); @@ -1143,6 +1185,9 @@ this.panel70.SuspendLayout(); this.panel73.SuspendLayout(); this.panel76.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown137)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown138)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown139)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown126)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown70)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown57)).BeginInit(); @@ -1160,6 +1205,9 @@ this.panel74.SuspendLayout(); this.panel71.SuspendLayout(); this.panel75.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown136)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown140)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown141)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown127)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown69)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown56)).BeginInit(); @@ -1205,7 +1253,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Margin = new System.Windows.Forms.Padding(1); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(551, 130); + this.panel1.Size = new System.Drawing.Size(2051, 130); this.panel1.TabIndex = 20; // // panel19 @@ -1466,7 +1514,7 @@ this.Výkres.Controls.Add(this.panel15); this.Výkres.Controls.Add(this.panel105); this.Výkres.Dock = System.Windows.Forms.DockStyle.Right; - this.Výkres.Location = new System.Drawing.Point(551, 0); + this.Výkres.Location = new System.Drawing.Point(2051, 0); this.Výkres.MaximumSize = new System.Drawing.Size(1073, 916); this.Výkres.MinimumSize = new System.Drawing.Size(23, 916); this.Výkres.Name = "Výkres"; @@ -1556,7 +1604,7 @@ // button4 // this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button4.Location = new System.Drawing.Point(474, 31); + this.button4.Location = new System.Drawing.Point(1974, 31); this.button4.Margin = new System.Windows.Forms.Padding(1); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(75, 23); @@ -1613,7 +1661,7 @@ this.panel17.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel17.Location = new System.Drawing.Point(0, 865); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(551, 56); + this.panel17.Size = new System.Drawing.Size(2051, 56); this.panel17.TabIndex = 22; // // panel24 @@ -1624,7 +1672,7 @@ this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(549, 31); + this.panel24.Size = new System.Drawing.Size(2049, 31); this.panel24.TabIndex = 13; // // label14 @@ -1633,7 +1681,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.label14.Location = new System.Drawing.Point(94, 1); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(0, 29); + this.label14.Size = new System.Drawing.Size(1500, 29); this.label14.TabIndex = 1; this.label14.Text = "----"; // @@ -1664,7 +1712,7 @@ this.panel16.Location = new System.Drawing.Point(0, 130); this.panel16.MinimumSize = new System.Drawing.Size(551, 730); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(551, 735); + this.panel16.Size = new System.Drawing.Size(2051, 735); this.panel16.TabIndex = 21; // // Polotovar @@ -1676,12 +1724,12 @@ this.Polotovar.Controls.Add(this.label17); this.Polotovar.Controls.Add(this.panel10); this.Polotovar.Dock = System.Windows.Forms.DockStyle.Right; - this.Polotovar.Location = new System.Drawing.Point(411, 0); + this.Polotovar.Location = new System.Drawing.Point(86, 0); this.Polotovar.Margin = new System.Windows.Forms.Padding(1); this.Polotovar.MaximumSize = new System.Drawing.Size(324, 728); this.Polotovar.MinimumSize = new System.Drawing.Size(23, 728); this.Polotovar.Name = "Polotovar"; - this.Polotovar.Size = new System.Drawing.Size(23, 728); + this.Polotovar.Size = new System.Drawing.Size(324, 728); this.Polotovar.TabIndex = 2; // // panel28 @@ -1752,7 +1800,6 @@ // button14 // this.button14.Dock = System.Windows.Forms.DockStyle.Right; - this.button14.Image = global::Mip.Properties.Resources.save; this.button14.Location = new System.Drawing.Point(258, 1); this.button14.Margin = new System.Windows.Forms.Padding(1); this.button14.Name = "button14"; @@ -2863,12 +2910,12 @@ this.Materiál.Controls.Add(this.label15); this.Materiál.Controls.Add(this.panel11); this.Materiál.Dock = System.Windows.Forms.DockStyle.Right; - this.Materiál.Location = new System.Drawing.Point(434, 0); + this.Materiál.Location = new System.Drawing.Point(410, 0); this.Materiál.Margin = new System.Windows.Forms.Padding(1); this.Materiál.MaximumSize = new System.Drawing.Size(457, 728); this.Materiál.MinimumSize = new System.Drawing.Size(23, 728); this.Materiál.Name = "Materiál"; - this.Materiál.Size = new System.Drawing.Size(23, 728); + this.Materiál.Size = new System.Drawing.Size(457, 728); this.Materiál.TabIndex = 3; // // panel45 @@ -5245,12 +5292,12 @@ this.Naceňovanie.Controls.Add(this.panel77); this.Naceňovanie.Controls.Add(this.panel14); this.Naceňovanie.Dock = System.Windows.Forms.DockStyle.Right; - this.Naceňovanie.Location = new System.Drawing.Point(457, 0); + this.Naceňovanie.Location = new System.Drawing.Point(867, 0); this.Naceňovanie.Margin = new System.Windows.Forms.Padding(1); this.Naceňovanie.MaximumSize = new System.Drawing.Size(406, 728); this.Naceňovanie.MinimumSize = new System.Drawing.Size(23, 728); this.Naceňovanie.Name = "Naceňovanie"; - this.Naceňovanie.Size = new System.Drawing.Size(23, 728); + this.Naceňovanie.Size = new System.Drawing.Size(406, 728); this.Naceňovanie.TabIndex = 6; // // panel110 @@ -5308,11 +5355,13 @@ this.panel88.Dock = System.Windows.Forms.DockStyle.Top; this.panel88.Location = new System.Drawing.Point(0, 74); this.panel88.Name = "panel88"; - this.panel88.Size = new System.Drawing.Size(381, 367); + this.panel88.Size = new System.Drawing.Size(381, 428); this.panel88.TabIndex = 3; // // panel92 // + this.panel92.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel92.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel92.Controls.Add(this.label272); this.panel92.Controls.Add(this.label271); @@ -5329,7 +5378,7 @@ this.panel92.Controls.Add(this.label162); this.panel92.Controls.Add(this.label156); this.panel92.Controls.Add(this.label163); - this.panel92.Location = new System.Drawing.Point(1, 310); + this.panel92.Location = new System.Drawing.Point(1, 371); this.panel92.Name = "panel92"; this.panel92.Size = new System.Drawing.Size(377, 54); this.panel92.TabIndex = 33; @@ -5483,6 +5532,8 @@ // // panel91 // + this.panel91.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel91.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel91.Controls.Add(this.label192); this.panel91.Controls.Add(this.label260); @@ -5491,7 +5542,7 @@ this.panel91.Controls.Add(this.label194); this.panel91.Controls.Add(this.label196); this.panel91.Controls.Add(this.label198); - this.panel91.Location = new System.Drawing.Point(1, 285); + this.panel91.Location = new System.Drawing.Point(1, 346); this.panel91.Name = "panel91"; this.panel91.Size = new System.Drawing.Size(377, 24); this.panel91.TabIndex = 32; @@ -5578,6 +5629,8 @@ // // panel90 // + this.panel90.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel90.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel90.Controls.Add(this.label255); this.panel90.Controls.Add(this.label256); @@ -5586,7 +5639,7 @@ this.panel90.Controls.Add(this.label252); this.panel90.Controls.Add(this.myNumericUpDown72); this.panel90.Controls.Add(this.label160); - this.panel90.Location = new System.Drawing.Point(1, 257); + this.panel90.Location = new System.Drawing.Point(1, 318); this.panel90.Name = "panel90"; this.panel90.Size = new System.Drawing.Size(377, 27); this.panel90.TabIndex = 31; @@ -5685,6 +5738,30 @@ // this.panel89.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.panel89.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel89.Controls.Add(this.label568); + this.panel89.Controls.Add(this.label569); + this.panel89.Controls.Add(this.label570); + this.panel89.Controls.Add(this.label571); + this.panel89.Controls.Add(this.label572); + this.panel89.Controls.Add(this.label573); + this.panel89.Controls.Add(this.myNumericUpDown130); + this.panel89.Controls.Add(this.myNumericUpDown131); + this.panel89.Controls.Add(this.myNumericUpDown132); + this.panel89.Controls.Add(this.myNumericUpDown133); + this.panel89.Controls.Add(this.myNumericUpDown134); + this.panel89.Controls.Add(this.myNumericUpDown135); + this.panel89.Controls.Add(this.label574); + this.panel89.Controls.Add(this.label575); + this.panel89.Controls.Add(this.label576); + this.panel89.Controls.Add(this.label577); + this.panel89.Controls.Add(this.label578); + this.panel89.Controls.Add(this.label579); + this.panel89.Controls.Add(this.label580); + this.panel89.Controls.Add(this.label581); + this.panel89.Controls.Add(this.label582); + this.panel89.Controls.Add(this.label583); + this.panel89.Controls.Add(this.label584); + this.panel89.Controls.Add(this.label585); this.panel89.Controls.Add(this.textBox1); this.panel89.Controls.Add(this.label555); this.panel89.Controls.Add(this.label556); @@ -5775,12 +5852,280 @@ this.panel89.Controls.Add(this.label270); this.panel89.Location = new System.Drawing.Point(1, 19); this.panel89.Name = "panel89"; - this.panel89.Size = new System.Drawing.Size(377, 237); + this.panel89.Size = new System.Drawing.Size(377, 298); this.panel89.TabIndex = 18; // + // label568 + // + this.label568.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label568.Location = new System.Drawing.Point(337, 232); + this.label568.Name = "label568"; + this.label568.Size = new System.Drawing.Size(37, 20); + this.label568.TabIndex = 123; + this.label568.Text = "[€/ks]"; + this.label568.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label569 + // + this.label569.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label569.Location = new System.Drawing.Point(337, 211); + this.label569.Name = "label569"; + this.label569.Size = new System.Drawing.Size(37, 20); + this.label569.TabIndex = 122; + this.label569.Text = "[€/ks]"; + this.label569.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label570 + // + this.label570.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label570.Location = new System.Drawing.Point(337, 190); + this.label570.Name = "label570"; + this.label570.Size = new System.Drawing.Size(37, 20); + this.label570.TabIndex = 121; + this.label570.Text = "[€/ks]"; + this.label570.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label571 + // + this.label571.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label571.Location = new System.Drawing.Point(278, 232); + this.label571.Name = "label571"; + this.label571.Size = new System.Drawing.Size(58, 20); + this.label571.TabIndex = 120; + this.label571.Text = "0"; + this.label571.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label571.TextChanged += new System.EventHandler(this.label571_TextChanged); + // + // label572 + // + this.label572.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label572.Location = new System.Drawing.Point(278, 211); + this.label572.Name = "label572"; + this.label572.Size = new System.Drawing.Size(58, 20); + this.label572.TabIndex = 119; + this.label572.Text = "0"; + this.label572.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label572.TextChanged += new System.EventHandler(this.label572_TextChanged); + // + // label573 + // + this.label573.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label573.Location = new System.Drawing.Point(278, 190); + this.label573.Name = "label573"; + this.label573.Size = new System.Drawing.Size(58, 20); + this.label573.TabIndex = 118; + this.label573.Text = "0"; + this.label573.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label573.TextChanged += new System.EventHandler(this.label573_TextChanged); + // + // myNumericUpDown130 + // + this.myNumericUpDown130.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown130.Location = new System.Drawing.Point(225, 232); + this.myNumericUpDown130.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.myNumericUpDown130.Name = "myNumericUpDown130"; + this.myNumericUpDown130.Size = new System.Drawing.Size(52, 20); + this.myNumericUpDown130.TabIndex = 111; + this.myNumericUpDown130.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.myNumericUpDown130.ValueChanged += new System.EventHandler(this.myNumericUpDown130_ValueChanged); + // + // myNumericUpDown131 + // + this.myNumericUpDown131.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown131.Location = new System.Drawing.Point(225, 211); + this.myNumericUpDown131.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.myNumericUpDown131.Name = "myNumericUpDown131"; + this.myNumericUpDown131.Size = new System.Drawing.Size(52, 20); + this.myNumericUpDown131.TabIndex = 110; + this.myNumericUpDown131.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.myNumericUpDown131.ValueChanged += new System.EventHandler(this.myNumericUpDown131_ValueChanged); + // + // myNumericUpDown132 + // + this.myNumericUpDown132.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown132.Location = new System.Drawing.Point(225, 190); + this.myNumericUpDown132.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.myNumericUpDown132.Name = "myNumericUpDown132"; + this.myNumericUpDown132.Size = new System.Drawing.Size(52, 20); + this.myNumericUpDown132.TabIndex = 109; + this.myNumericUpDown132.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.myNumericUpDown132.ValueChanged += new System.EventHandler(this.myNumericUpDown132_ValueChanged); + // + // myNumericUpDown133 + // + this.myNumericUpDown133.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown133.Location = new System.Drawing.Point(167, 232); + this.myNumericUpDown133.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.myNumericUpDown133.Name = "myNumericUpDown133"; + this.myNumericUpDown133.Size = new System.Drawing.Size(52, 20); + this.myNumericUpDown133.TabIndex = 108; + this.myNumericUpDown133.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.myNumericUpDown133.UpDownAlign = System.Windows.Forms.LeftRightAlignment.Left; + this.myNumericUpDown133.ValueChanged += new System.EventHandler(this.myNumericUpDown133_ValueChanged); + // + // myNumericUpDown134 + // + this.myNumericUpDown134.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown134.Location = new System.Drawing.Point(167, 211); + this.myNumericUpDown134.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.myNumericUpDown134.Name = "myNumericUpDown134"; + this.myNumericUpDown134.Size = new System.Drawing.Size(52, 20); + this.myNumericUpDown134.TabIndex = 106; + this.myNumericUpDown134.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.myNumericUpDown134.UpDownAlign = System.Windows.Forms.LeftRightAlignment.Left; + this.myNumericUpDown134.ValueChanged += new System.EventHandler(this.myNumericUpDown134_ValueChanged); + // + // myNumericUpDown135 + // + this.myNumericUpDown135.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown135.Location = new System.Drawing.Point(166, 190); + this.myNumericUpDown135.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.myNumericUpDown135.Name = "myNumericUpDown135"; + this.myNumericUpDown135.Size = new System.Drawing.Size(52, 20); + this.myNumericUpDown135.TabIndex = 104; + this.myNumericUpDown135.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.myNumericUpDown135.UpDownAlign = System.Windows.Forms.LeftRightAlignment.Left; + this.myNumericUpDown135.ValueChanged += new System.EventHandler(this.myNumericUpDown135_ValueChanged); + // + // label574 + // + this.label574.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label574.AutoSize = true; + this.label574.Location = new System.Drawing.Point(1, 234); + this.label574.Name = "label574"; + this.label574.Size = new System.Drawing.Size(85, 13); + this.label574.TabIndex = 107; + this.label574.Text = "CNC Fréza 5 osí"; + // + // label575 + // + this.label575.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label575.AutoSize = true; + this.label575.Location = new System.Drawing.Point(1, 213); + this.label575.Name = "label575"; + this.label575.Size = new System.Drawing.Size(73, 13); + this.label575.TabIndex = 105; + this.label575.Text = "CNC Brúsenie"; + // + // label576 + // + this.label576.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label576.AutoSize = true; + this.label576.Location = new System.Drawing.Point(1, 192); + this.label576.Name = "label576"; + this.label576.Size = new System.Drawing.Size(62, 13); + this.label576.TabIndex = 103; + this.label576.Text = "3D Meranie"; + // + // label577 + // + this.label577.AutoSize = true; + this.label577.Location = new System.Drawing.Point(216, 235); + this.label577.Name = "label577"; + this.label577.Size = new System.Drawing.Size(13, 13); + this.label577.TabIndex = 114; + this.label577.Text = "+"; + // + // label578 + // + this.label578.AutoSize = true; + this.label578.Location = new System.Drawing.Point(216, 214); + this.label578.Name = "label578"; + this.label578.Size = new System.Drawing.Size(13, 13); + this.label578.TabIndex = 113; + this.label578.Text = "+"; + // + // label579 + // + this.label579.AutoSize = true; + this.label579.Location = new System.Drawing.Point(216, 193); + this.label579.Name = "label579"; + this.label579.Size = new System.Drawing.Size(13, 13); + this.label579.TabIndex = 112; + this.label579.Text = "+"; + // + // label580 + // + this.label580.Location = new System.Drawing.Point(140, 231); + this.label580.Name = "label580"; + this.label580.Size = new System.Drawing.Size(30, 20); + this.label580.TabIndex = 117; + this.label580.Text = "[€/h]"; + this.label580.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label581 + // + this.label581.Location = new System.Drawing.Point(140, 210); + this.label581.Name = "label581"; + this.label581.Size = new System.Drawing.Size(30, 20); + this.label581.TabIndex = 116; + this.label581.Text = "[€/h]"; + this.label581.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label582 + // + this.label582.Location = new System.Drawing.Point(140, 189); + this.label582.Name = "label582"; + this.label582.Size = new System.Drawing.Size(30, 20); + this.label582.TabIndex = 115; + this.label582.Text = "[€/h]"; + this.label582.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label583 + // + this.label583.Location = new System.Drawing.Point(125, 231); + this.label583.Name = "label583"; + this.label583.Size = new System.Drawing.Size(19, 20); + this.label583.TabIndex = 126; + this.label583.Text = "0"; + this.label583.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label584 + // + this.label584.Location = new System.Drawing.Point(125, 210); + this.label584.Name = "label584"; + this.label584.Size = new System.Drawing.Size(19, 20); + this.label584.TabIndex = 125; + this.label584.Text = "0"; + this.label584.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label585 + // + this.label585.Location = new System.Drawing.Point(125, 189); + this.label585.Name = "label585"; + this.label585.Size = new System.Drawing.Size(19, 20); + this.label585.TabIndex = 124; + this.label585.Text = "0"; + this.label585.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(1, 211); + this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.textBox1.Location = new System.Drawing.Point(1, 274); this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(121, 20); this.textBox1.TabIndex = 102; @@ -5788,8 +6133,9 @@ // // label555 // + this.label555.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label555.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label555.Location = new System.Drawing.Point(337, 211); + this.label555.Location = new System.Drawing.Point(337, 274); this.label555.Name = "label555"; this.label555.Size = new System.Drawing.Size(37, 20); this.label555.TabIndex = 100; @@ -5798,18 +6144,20 @@ // // label556 // + this.label556.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label556.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label556.Location = new System.Drawing.Point(278, 211); + this.label556.Location = new System.Drawing.Point(278, 274); this.label556.Name = "label556"; this.label556.Size = new System.Drawing.Size(58, 20); this.label556.TabIndex = 99; this.label556.Text = "0"; this.label556.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label556.TextChanged += new System.EventHandler(this.label556_TextChanged); // // myNumericUpDown124 // - this.myNumericUpDown124.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.myNumericUpDown124.Location = new System.Drawing.Point(225, 211); + this.myNumericUpDown124.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown124.Location = new System.Drawing.Point(225, 274); this.myNumericUpDown124.Maximum = new decimal(new int[] { 99999, 0, @@ -5823,8 +6171,8 @@ // // myNumericUpDown125 // - this.myNumericUpDown125.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.myNumericUpDown125.Location = new System.Drawing.Point(167, 211); + this.myNumericUpDown125.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown125.Location = new System.Drawing.Point(167, 274); this.myNumericUpDown125.Maximum = new decimal(new int[] { 99999, 0, @@ -5839,8 +6187,9 @@ // // label558 // + this.label558.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label558.AutoSize = true; - this.label558.Location = new System.Drawing.Point(216, 214); + this.label558.Location = new System.Drawing.Point(216, 277); this.label558.Name = "label558"; this.label558.Size = new System.Drawing.Size(13, 13); this.label558.TabIndex = 97; @@ -5848,7 +6197,8 @@ // // label559 // - this.label559.Location = new System.Drawing.Point(140, 210); + this.label559.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.label559.Location = new System.Drawing.Point(140, 273); this.label559.Name = "label559"; this.label559.Size = new System.Drawing.Size(30, 20); this.label559.TabIndex = 98; @@ -5857,7 +6207,8 @@ // // label560 // - this.label560.Location = new System.Drawing.Point(125, 210); + this.label560.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.label560.Location = new System.Drawing.Point(125, 273); this.label560.Name = "label560"; this.label560.Size = new System.Drawing.Size(19, 20); this.label560.TabIndex = 101; @@ -5866,8 +6217,9 @@ // // label240 // + this.label240.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label240.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label240.Location = new System.Drawing.Point(337, 190); + this.label240.Location = new System.Drawing.Point(337, 253); this.label240.Name = "label240"; this.label240.Size = new System.Drawing.Size(37, 20); this.label240.TabIndex = 83; @@ -5966,8 +6318,9 @@ // // label180 // + this.label180.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label180.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label180.Location = new System.Drawing.Point(278, 190); + this.label180.Location = new System.Drawing.Point(278, 253); this.label180.Name = "label180"; this.label180.Size = new System.Drawing.Size(58, 20); this.label180.TabIndex = 73; @@ -6077,8 +6430,8 @@ // // myNumericUpDown85 // - this.myNumericUpDown85.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.myNumericUpDown85.Location = new System.Drawing.Point(225, 190); + this.myNumericUpDown85.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown85.Location = new System.Drawing.Point(225, 253); this.myNumericUpDown85.Maximum = new decimal(new int[] { 99999, 0, @@ -6221,8 +6574,8 @@ // // myNumericUpDown73 // - this.myNumericUpDown73.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.myNumericUpDown73.Location = new System.Drawing.Point(167, 190); + this.myNumericUpDown73.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown73.Location = new System.Drawing.Point(167, 253); this.myNumericUpDown73.Maximum = new decimal(new int[] { 99999, 0, @@ -6375,9 +6728,9 @@ // // label161 // - this.label161.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label161.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label161.AutoSize = true; - this.label161.Location = new System.Drawing.Point(1, 192); + this.label161.Location = new System.Drawing.Point(1, 255); this.label161.Name = "label161"; this.label161.Size = new System.Drawing.Size(123, 13); this.label161.TabIndex = 24; @@ -6399,9 +6752,9 @@ this.label165.AutoSize = true; this.label165.Location = new System.Drawing.Point(1, 150); this.label165.Name = "label165"; - this.label165.Size = new System.Drawing.Size(55, 13); + this.label165.Size = new System.Drawing.Size(91, 13); this.label165.TabIndex = 16; - this.label165.Text = "CNC fréza"; + this.label165.Text = "CNC fréza 3/4 osi"; // // label166 // @@ -6445,9 +6798,9 @@ this.label170.AutoSize = true; this.label170.Location = new System.Drawing.Point(1, 45); this.label170.Name = "label170"; - this.label170.Size = new System.Drawing.Size(48, 13); + this.label170.Size = new System.Drawing.Size(96, 13); this.label170.TabIndex = 6; - this.label170.Text = "Brúsenie"; + this.label170.Text = "Brúsenie BULDOG"; // // label171 // @@ -6469,8 +6822,9 @@ // // label154 // + this.label154.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label154.AutoSize = true; - this.label154.Location = new System.Drawing.Point(216, 193); + this.label154.Location = new System.Drawing.Point(216, 256); this.label154.Name = "label154"; this.label154.Size = new System.Drawing.Size(13, 13); this.label154.TabIndex = 49; @@ -6559,7 +6913,8 @@ // // label155 // - this.label155.Location = new System.Drawing.Point(140, 189); + this.label155.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.label155.Location = new System.Drawing.Point(140, 252); this.label155.Name = "label155"; this.label155.Size = new System.Drawing.Size(30, 20); this.label155.TabIndex = 61; @@ -6649,7 +7004,8 @@ // // label261 // - this.label261.Location = new System.Drawing.Point(125, 189); + this.label261.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.label261.Location = new System.Drawing.Point(125, 252); this.label261.Name = "label261"; this.label261.Size = new System.Drawing.Size(19, 20); this.label261.TabIndex = 93; @@ -7162,7 +7518,7 @@ this.Vyhodnocovanie.Controls.Add(this.panel112); this.Vyhodnocovanie.Controls.Add(this.panel12); this.Vyhodnocovanie.Dock = System.Windows.Forms.DockStyle.Right; - this.Vyhodnocovanie.Location = new System.Drawing.Point(480, 0); + this.Vyhodnocovanie.Location = new System.Drawing.Point(1273, 0); this.Vyhodnocovanie.Margin = new System.Windows.Forms.Padding(1); this.Vyhodnocovanie.MaximumSize = new System.Drawing.Size(406, 728); this.Vyhodnocovanie.MinimumSize = new System.Drawing.Size(23, 728); @@ -8979,12 +9335,12 @@ this.Sadzby.Controls.Add(this.panel70); this.Sadzby.Controls.Add(this.panel13); this.Sadzby.Dock = System.Windows.Forms.DockStyle.Right; - this.Sadzby.Location = new System.Drawing.Point(503, 0); + this.Sadzby.Location = new System.Drawing.Point(1296, 0); this.Sadzby.Margin = new System.Windows.Forms.Padding(1); this.Sadzby.MaximumSize = new System.Drawing.Size(350, 728); this.Sadzby.MinimumSize = new System.Drawing.Size(23, 728); this.Sadzby.Name = "Sadzby"; - this.Sadzby.Size = new System.Drawing.Size(23, 728); + this.Sadzby.Size = new System.Drawing.Size(350, 728); this.Sadzby.TabIndex = 5; // // panel70 @@ -9006,10 +9362,10 @@ this.panel73.Controls.Add(this.panel74); this.panel73.Dock = System.Windows.Forms.DockStyle.Top; this.panel73.Location = new System.Drawing.Point(0, 0); - this.panel73.MaximumSize = new System.Drawing.Size(326, 220); + this.panel73.MaximumSize = new System.Drawing.Size(326, 267); this.panel73.MinimumSize = new System.Drawing.Size(326, 23); this.panel73.Name = "panel73"; - this.panel73.Size = new System.Drawing.Size(326, 220); + this.panel73.Size = new System.Drawing.Size(326, 267); this.panel73.TabIndex = 1; // // button8 @@ -9026,6 +9382,12 @@ // this.panel76.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.panel76.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel76.Controls.Add(this.label587); + this.panel76.Controls.Add(this.myNumericUpDown137); + this.panel76.Controls.Add(this.label588); + this.panel76.Controls.Add(this.myNumericUpDown138); + this.panel76.Controls.Add(this.label589); + this.panel76.Controls.Add(this.myNumericUpDown139); this.panel76.Controls.Add(this.label557); this.panel76.Controls.Add(this.myNumericUpDown126); this.panel76.Controls.Add(this.button9); @@ -9057,9 +9419,59 @@ this.panel76.Controls.Add(this.myNumericUpDown68); this.panel76.Location = new System.Drawing.Point(1, 44); this.panel76.Name = "panel76"; - this.panel76.Size = new System.Drawing.Size(322, 173); + this.panel76.Size = new System.Drawing.Size(322, 220); this.panel76.TabIndex = 7; // + // label587 + // + this.label587.AutoSize = true; + this.label587.Location = new System.Drawing.Point(2, 172); + this.label587.Name = "label587"; + this.label587.Size = new System.Drawing.Size(62, 13); + this.label587.TabIndex = 38; + this.label587.Text = "3D Meranie"; + // + // myNumericUpDown137 + // + this.myNumericUpDown137.Location = new System.Drawing.Point(89, 169); + this.myNumericUpDown137.Name = "myNumericUpDown137"; + this.myNumericUpDown137.Size = new System.Drawing.Size(42, 20); + this.myNumericUpDown137.TabIndex = 39; + // + // label588 + // + this.label588.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label588.AutoSize = true; + this.label588.Location = new System.Drawing.Point(148, 151); + this.label588.Name = "label588"; + this.label588.Size = new System.Drawing.Size(85, 13); + this.label588.TabIndex = 36; + this.label588.Text = "CNC Fréza 5 osí"; + // + // myNumericUpDown138 + // + this.myNumericUpDown138.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown138.Location = new System.Drawing.Point(277, 148); + this.myNumericUpDown138.Name = "myNumericUpDown138"; + this.myNumericUpDown138.Size = new System.Drawing.Size(42, 20); + this.myNumericUpDown138.TabIndex = 37; + // + // label589 + // + this.label589.AutoSize = true; + this.label589.Location = new System.Drawing.Point(2, 151); + this.label589.Name = "label589"; + this.label589.Size = new System.Drawing.Size(73, 13); + this.label589.TabIndex = 34; + this.label589.Text = "CNC Brúsenie"; + // + // myNumericUpDown139 + // + this.myNumericUpDown139.Location = new System.Drawing.Point(89, 148); + this.myNumericUpDown139.Name = "myNumericUpDown139"; + this.myNumericUpDown139.Size = new System.Drawing.Size(42, 20); + this.myNumericUpDown139.TabIndex = 35; + // // label557 // this.label557.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -9080,7 +9492,9 @@ // // button9 // - this.button9.Location = new System.Drawing.Point(7, 148); + this.button9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button9.Location = new System.Drawing.Point(7, 192); this.button9.Name = "button9"; this.button9.Size = new System.Drawing.Size(307, 23); this.button9.TabIndex = 31; @@ -9182,9 +9596,9 @@ this.label125.AutoSize = true; this.label125.Location = new System.Drawing.Point(148, 25); this.label125.Name = "label125"; - this.label125.Size = new System.Drawing.Size(55, 13); + this.label125.Size = new System.Drawing.Size(91, 13); this.label125.TabIndex = 16; - this.label125.Text = "CNC fréza"; + this.label125.Text = "CNC fréza 3/4 osi"; // // myNumericUpDown61 // @@ -9265,9 +9679,9 @@ this.label130.AutoSize = true; this.label130.Location = new System.Drawing.Point(2, 46); this.label130.Name = "label130"; - this.label130.Size = new System.Drawing.Size(48, 13); + this.label130.Size = new System.Drawing.Size(84, 13); this.label130.TabIndex = 6; - this.label130.Text = "Brúsenie"; + this.label130.Text = "Brúsenie Buldog"; // // myNumericUpDown66 // @@ -9347,7 +9761,7 @@ this.panel71.Controls.Add(this.panel72); this.panel71.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel71.Location = new System.Drawing.Point(0, 680); - this.panel71.MaximumSize = new System.Drawing.Size(326, 213); + this.panel71.MaximumSize = new System.Drawing.Size(326, 258); this.panel71.MinimumSize = new System.Drawing.Size(326, 23); this.panel71.Name = "panel71"; this.panel71.Size = new System.Drawing.Size(326, 23); @@ -9357,6 +9771,12 @@ // this.panel75.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.panel75.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel75.Controls.Add(this.label586); + this.panel75.Controls.Add(this.myNumericUpDown136); + this.panel75.Controls.Add(this.label590); + this.panel75.Controls.Add(this.myNumericUpDown140); + this.panel75.Controls.Add(this.label591); + this.panel75.Controls.Add(this.myNumericUpDown141); this.panel75.Controls.Add(this.label561); this.panel75.Controls.Add(this.myNumericUpDown127); this.panel75.Controls.Add(this.button7); @@ -9389,9 +9809,59 @@ this.panel75.Enabled = false; this.panel75.Location = new System.Drawing.Point(1, 36); this.panel75.Name = "panel75"; - this.panel75.Size = new System.Drawing.Size(322, 174); + this.panel75.Size = new System.Drawing.Size(322, 219); this.panel75.TabIndex = 5; // + // label586 + // + this.label586.AutoSize = true; + this.label586.Location = new System.Drawing.Point(2, 172); + this.label586.Name = "label586"; + this.label586.Size = new System.Drawing.Size(62, 13); + this.label586.TabIndex = 44; + this.label586.Text = "3D Meranie"; + // + // myNumericUpDown136 + // + this.myNumericUpDown136.Location = new System.Drawing.Point(89, 169); + this.myNumericUpDown136.Name = "myNumericUpDown136"; + this.myNumericUpDown136.Size = new System.Drawing.Size(42, 20); + this.myNumericUpDown136.TabIndex = 45; + // + // label590 + // + this.label590.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label590.AutoSize = true; + this.label590.Location = new System.Drawing.Point(148, 151); + this.label590.Name = "label590"; + this.label590.Size = new System.Drawing.Size(85, 13); + this.label590.TabIndex = 42; + this.label590.Text = "CNC Fréza 5 osí"; + // + // myNumericUpDown140 + // + this.myNumericUpDown140.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.myNumericUpDown140.Location = new System.Drawing.Point(277, 148); + this.myNumericUpDown140.Name = "myNumericUpDown140"; + this.myNumericUpDown140.Size = new System.Drawing.Size(42, 20); + this.myNumericUpDown140.TabIndex = 43; + // + // label591 + // + this.label591.AutoSize = true; + this.label591.Location = new System.Drawing.Point(2, 151); + this.label591.Name = "label591"; + this.label591.Size = new System.Drawing.Size(73, 13); + this.label591.TabIndex = 40; + this.label591.Text = "CNC Brúsenie"; + // + // myNumericUpDown141 + // + this.myNumericUpDown141.Location = new System.Drawing.Point(89, 148); + this.myNumericUpDown141.Name = "myNumericUpDown141"; + this.myNumericUpDown141.Size = new System.Drawing.Size(42, 20); + this.myNumericUpDown141.TabIndex = 41; + // // label561 // this.label561.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -9412,8 +9882,10 @@ // // button7 // + this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.button7.Enabled = false; - this.button7.Location = new System.Drawing.Point(7, 149); + this.button7.Location = new System.Drawing.Point(7, 192); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(307, 23); this.button7.TabIndex = 28; @@ -9515,9 +9987,9 @@ this.label115.AutoSize = true; this.label115.Location = new System.Drawing.Point(148, 25); this.label115.Name = "label115"; - this.label115.Size = new System.Drawing.Size(55, 13); + this.label115.Size = new System.Drawing.Size(91, 13); this.label115.TabIndex = 16; - this.label115.Text = "CNC fréza"; + this.label115.Text = "CNC fréza 3/4 osi"; // // myNumericUpDown52 // @@ -9598,9 +10070,9 @@ this.label110.AutoSize = true; this.label110.Location = new System.Drawing.Point(2, 46); this.label110.Name = "label110"; - this.label110.Size = new System.Drawing.Size(48, 13); + this.label110.Size = new System.Drawing.Size(84, 13); this.label110.TabIndex = 6; - this.label110.Text = "Brúsenie"; + this.label110.Text = "Brúsenie Buldog"; // // myNumericUpDown47 // @@ -9698,12 +10170,12 @@ this.Počty.Controls.Add(this.panel98); this.Počty.Controls.Add(this.panel9); this.Počty.Dock = System.Windows.Forms.DockStyle.Right; - this.Počty.Location = new System.Drawing.Point(526, 0); + this.Počty.Location = new System.Drawing.Point(1646, 0); this.Počty.Margin = new System.Windows.Forms.Padding(1); this.Počty.MaximumSize = new System.Drawing.Size(403, 728); this.Počty.MinimumSize = new System.Drawing.Size(23, 728); this.Počty.Name = "Počty"; - this.Počty.Size = new System.Drawing.Size(23, 728); + this.Počty.Size = new System.Drawing.Size(403, 728); this.Počty.TabIndex = 1; // // panel98 @@ -11494,7 +11966,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(574, 921); + this.ClientSize = new System.Drawing.Size(2074, 921); this.Controls.Add(this.panel16); this.Controls.Add(this.panel1); this.Controls.Add(this.panel17); @@ -11696,6 +12168,12 @@ ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown72)).EndInit(); this.panel89.ResumeLayout(false); this.panel89.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown130)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown131)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown132)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown133)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown134)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown135)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown124)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown125)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown85)).EndInit(); @@ -11791,6 +12269,9 @@ this.panel73.ResumeLayout(false); this.panel76.ResumeLayout(false); this.panel76.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown137)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown138)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown139)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown126)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown70)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown57)).EndInit(); @@ -11811,6 +12292,9 @@ this.panel71.PerformLayout(); this.panel75.ResumeLayout(false); this.panel75.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown136)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown140)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown141)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown127)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown69)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.myNumericUpDown56)).EndInit(); @@ -12739,5 +13223,41 @@ private System.Windows.Forms.Label label565; private System.Windows.Forms.Label label566; private System.Windows.Forms.Label label567; + private System.Windows.Forms.Label label568; + private System.Windows.Forms.Label label569; + private System.Windows.Forms.Label label570; + private System.Windows.Forms.Label label571; + private System.Windows.Forms.Label label572; + private System.Windows.Forms.Label label573; + private MyTools.MyNumericUpDown myNumericUpDown130; + private MyTools.MyNumericUpDown myNumericUpDown131; + private MyTools.MyNumericUpDown myNumericUpDown132; + private MyTools.MyNumericUpDown myNumericUpDown133; + private MyTools.MyNumericUpDown myNumericUpDown134; + private MyTools.MyNumericUpDown myNumericUpDown135; + private System.Windows.Forms.Label label574; + private System.Windows.Forms.Label label575; + private System.Windows.Forms.Label label576; + private System.Windows.Forms.Label label577; + private System.Windows.Forms.Label label578; + private System.Windows.Forms.Label label579; + private System.Windows.Forms.Label label580; + private System.Windows.Forms.Label label581; + private System.Windows.Forms.Label label582; + private System.Windows.Forms.Label label583; + private System.Windows.Forms.Label label584; + private System.Windows.Forms.Label label585; + private System.Windows.Forms.Label label587; + private MyTools.MyNumericUpDown myNumericUpDown137; + private System.Windows.Forms.Label label588; + private MyTools.MyNumericUpDown myNumericUpDown138; + private System.Windows.Forms.Label label589; + private MyTools.MyNumericUpDown myNumericUpDown139; + private System.Windows.Forms.Label label586; + private MyTools.MyNumericUpDown myNumericUpDown136; + private System.Windows.Forms.Label label590; + private MyTools.MyNumericUpDown myNumericUpDown140; + private System.Windows.Forms.Label label591; + private MyTools.MyNumericUpDown myNumericUpDown141; } } \ No newline at end of file diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index ce2c4da..038fb28 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -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; using Excel = Microsoft.Office.Interop.Excel; @@ -21,7 +16,7 @@ namespace Mip public static decimal psdRozmer2; public static decimal psdRozmer3; public static string pssRozmerTvar; - + Point pointPosition; //Single zoom = 1; Single z; @@ -31,7 +26,7 @@ namespace Mip //int PictureBoxSizeHeight; //int PictureBoxSizeWidth; public static string status = ""; - + //NacenovanyObjekt objNacenovanyObjekt; public static ObjectVyrobok objObjectVyrobok; public static ObjectSadzby objObjectSadzby; @@ -40,7 +35,7 @@ namespace Mip public static ObjectNacenovanie objObjectNacenovanie; public static ObjectVyhodnocovanie objObjectVyhodnocovanie; public static ObjectPocty objObjectPocty; - + private bool showNacenovanie = false; private bool showVyhodnocovanie = false; @@ -86,18 +81,18 @@ namespace Mip pictureBox1.SizeMode = PictureBoxSizeMode.Zoom; Single prirastok = (Convert.ToSingle(0.1) * (e.Delta / Math.Abs(e.Delta))); - if (prirastok < (10-z)) + if (prirastok < (10 - z)) { if (z > zMin) { if (e.Delta != 0) z += prirastok; } else { if (e.Delta > 0) z += prirastok; } } - + trackBar1.Value = (float)Math.Round(z, 2); pictureBox1.Size = new Size(Convert.ToInt32(sizeW * z), Convert.ToInt32(sizeH * z)); } - + private void frmNacenovanie_Shown(object sender, EventArgs e) { foreach (Panel pn in panel16.Controls) @@ -134,7 +129,7 @@ namespace Mip objObjectNacenovanie = new ObjectNacenovanie(IDN); objObjectPocty = new ObjectPocty(IDN); objObjectVyhodnocovanie = new ObjectVyhodnocovanie(IDVyhodnocovanie); - + objObjectVyrobok.SetDataToForm(this); objObjectSadzby.SetDataToForm(this); objObjectPolotovar.SetDataToForm(this); @@ -144,7 +139,7 @@ namespace Mip objObjectVyhodnocovanie.SetDataToForm(this); string strIDVykres = ""; - classSQL.SQL("SELECT `IDVykres` FROM `mip`.`tabvykres` WHERE IDVyrobok = " + IDV.ToString() + " AND IndexVykresu = 1", out strIDVykres); + classSQL.SQL("SELECT `IDVykres` FROM `mip`.`tabvykres` WHERE IDVyrobok = " + IDV.ToString() + " AND IndexVykresu = 1", out strIDVykres); IDVykres = Convert.ToInt32(strIDVykres); Image setImage = classSQL.VykresZSQLDoPictureBox(IDVykres); @@ -169,11 +164,11 @@ namespace Mip button8_Click(null, null); button9_Click(null, null); - + //if (Form.ActiveForm != null) //{ //} - + RefreshAll(); RefreshVyhodnotenieAll(); @@ -184,7 +179,7 @@ namespace Mip button18_Click(null, null); this.Close(); } - + } @@ -193,7 +188,7 @@ namespace Mip if (Výkres.Width > Výkres.MinimumSize.Width) { Výkres.Size = new Size(Výkres.MinimumSize.Width, Výkres.Height); - this.Size = new Size(this.Width - (Výkres.MaximumSize.Width-Výkres.MinimumSize.Width), this.Height); + this.Size = new Size(this.Width - (Výkres.MaximumSize.Width - Výkres.MinimumSize.Width), this.Height); this.CenterToScreen(); } else @@ -221,12 +216,12 @@ namespace Mip int WindowSizeWidth = this.Size.Width; int vykresSize = Výkres.Width - Výkres.MinimumSize.Width; - if((WindowSizeWidth + SizeChange) < Screen.PrimaryScreen.WorkingArea.Width) + if ((WindowSizeWidth + SizeChange) < Screen.PrimaryScreen.WorkingArea.Width) { ctrl.Parent.Size = new Size(ctrl.Parent.MaximumSize.Width, ctrl.Parent.Height); ctrl.Parent.Dock = DockStyle.Left; } - + foreach (Panel pn in panel16.Controls) panelWidthSum = panelWidthSum + pn.Width; if ((WindowSizeWidth + SizeChange) < Screen.PrimaryScreen.WorkingArea.Width) @@ -255,7 +250,7 @@ namespace Mip this.CenterToScreen(); } - + private void RefreshAll() { objObjectSadzby.RefreshForm(this); @@ -263,7 +258,7 @@ namespace Mip objObjectMaterial.RefreshForm(this); objObjectNacenovanie.RefreshForm(this); objObjectPocty.RefreshForm(this); - + } private void RefreshVyhodnotenieAll() @@ -426,7 +421,7 @@ namespace Mip Material2 = tblObjectVyrobokNacenovanie.Rows[0]["Material2"].ToString(); Material3 = tblObjectVyrobokNacenovanie.Rows[0]["Material3"].ToString(); Material4 = tblObjectVyrobokNacenovanie.Rows[0]["Material4"].ToString(); - + DatumPrijatia = tblObjectVyrobokNacenovanie.Rows[0]["DatumPrijatia"].ToString(); PocetKusov = Convert.ToInt32(tblObjectVyrobokNacenovanie.Rows[0]["PocetNacenovanychKusov"].ToString()); ObjednanyPocetKusov = PocetKusov; @@ -470,7 +465,7 @@ namespace Mip public bool bEnableSQLUpdate = false; #endregion Premenné public - + #region Premenné private private bool chB5 = true; private decimal myNuD18 { get; set; } @@ -521,8 +516,8 @@ namespace Mip DataTable tblObjectPolotovar = new DataTable(); string cmd = "SELECT * FROM `tab-nacenovanie-polotovar` WHERE IDNacenovanie = 0 OR IDNacenovanie = " + IDNacenovanie.ToString() + ";"; classSQL.SQL(cmd, out tblObjectPolotovar); - - int intCisloRiadka = tblObjectPolotovar.Rows.Count-1; + + int intCisloRiadka = tblObjectPolotovar.Rows.Count - 1; l27 = tblObjectPolotovar.Rows[intCisloRiadka]["TvarPolotovaru"].ToString(); chB5 = Convert.ToBoolean(tblObjectPolotovar.Rows[intCisloRiadka]["chB5"].ToString()); @@ -556,7 +551,7 @@ namespace Mip IDNacenovaniePolotovar = Convert.ToInt32(tblObjectPolotovar.Rows[intCisloRiadka]["IDNacecovaniePolotovar"].ToString()); if (intCisloRiadka > 0) bEnableSQLUpdate = true; - + } #endregion Konštruktor @@ -668,8 +663,8 @@ namespace Mip dObjemPouzMaterialu = Objem; } } - return dObjemPouzMaterialu; - + return dObjemPouzMaterialu; + } #endregion Objem použitého materiálu @@ -768,13 +763,13 @@ namespace Mip { GetDataFromForm(inputForm); dynamic form = inputForm as frmNacenovanie; - + if (form != null) { form.SuspendLayout(); decimal decDlzka; double decPomer; - if (Convert.ToInt16(l6) > 1) decDlzka = Math.Ceiling(Convert.ToDecimal(myNuD7 / (Convert.ToInt16(l6)-1)))*(myNuD20 + myNuD3 + myNuD5 + myNuD13); + if (Convert.ToInt16(l6) > 1) decDlzka = Math.Ceiling(Convert.ToDecimal(myNuD7 / (Convert.ToInt16(l6) - 1))) * (myNuD20 + myNuD3 + myNuD5 + myNuD13); else decDlzka = (myNuD7 * (myNuD20 + myNuD3 + myNuD5 + myNuD13)) + myNuD9 + ((myNuD7 - 1) * myNuD8); form.label66.Text = string.Format("{0:F2}", (myNuD18 + myNuD1 + myNuD4 + myNuD12)); @@ -787,13 +782,13 @@ namespace Mip form.label62.Text = string.Format("{0:F6} dm³", ObjemPouzMaterialu()); form.label217.Text = ObjemPouzMaterialu().ToString(); if (l27 == "Ø") - form.label69.Text = l27 + (myNuD18 + myNuD1 + myNuD4).ToString() + "/" + (myNuD19 - myNuD2 - myNuD6).ToString() + "x" + (Convert.ToDecimal(l64)- myNuD13).ToString(); + form.label69.Text = l27 + (myNuD18 + myNuD1 + myNuD4).ToString() + "/" + (myNuD19 - myNuD2 - myNuD6).ToString() + "x" + (Convert.ToDecimal(l64) - myNuD13).ToString(); else - form.label69.Text = l27 + (myNuD18 + myNuD1 + myNuD4).ToString() + "x" + (myNuD19 + myNuD2 + myNuD6).ToString() + "x" + (Convert.ToDecimal(l64) - myNuD13).ToString(); + form.label69.Text = l27 + (myNuD18 + myNuD1 + myNuD4).ToString() + "x" + (myNuD19 + myNuD2 + myNuD6).ToString() + "x" + (Convert.ToDecimal(l64) - myNuD13).ToString(); - if(ObjemPouzMaterialu()!= 0) decPomer = (double)ObjemVyrobku()/(double)ObjemPouzMaterialu(); - else decPomer =0; - form.label33.Text = "Využ. mat.: " + Math.Round(decPomer*100,4).ToString() + " %"; + if (ObjemPouzMaterialu() != 0) decPomer = (double)ObjemVyrobku() / (double)ObjemPouzMaterialu(); + else decPomer = 0; + form.label33.Text = "Využ. mat.: " + Math.Round(decPomer * 100, 4).ToString() + " %"; form.ResumeLayout(); } } @@ -882,7 +877,7 @@ namespace Mip } - if(cmd != "") classSQL.SQL(cmd); + if (cmd != "") classSQL.SQL(cmd); } #endregion Ulož údaje do MariaDB @@ -910,7 +905,7 @@ namespace Mip public bool bEnableSQLUpdate = false; #endregion Premenné public - + #region Premenné private //Material1 private bool chB1 = true; @@ -1077,7 +1072,7 @@ namespace Mip cb2 = tblObjectMaterial.Rows[intCisloRiadka]["cb2"].ToString(); IDNacenovanieMaterial = Convert.ToInt32(tblObjectMaterial.Rows[intCisloRiadka]["IDNacenovanieMaterial"].ToString()); } - + if (intCisloRiadka > 0) bEnableSQLUpdate = true; } @@ -1173,44 +1168,44 @@ namespace Mip { form.checkBox1.Checked = chB1; form.checkBox2.Checked = chB2; - form.myNumericUpDown21.Value=myNuD21; - form.checkBox4.Checked=chB4; - form.myNumericUpDown23.Value=myNuD23; - form.checkBox13.Checked=chB13; + form.myNumericUpDown21.Value = myNuD21; + form.checkBox4.Checked = chB4; + form.myNumericUpDown23.Value = myNuD23; + form.checkBox13.Checked = chB13; form.checkBox3.Checked = chB3; - form.myNumericUpDown22.Value=myNuD22; - form.myNumericUpDown24.Value=myNuD24; - form.checkBox14.Checked=chB14; - form.myNumericUpDown25.Value=myNuD25; - form.myNumericUpDown26.Value=myNuD26; + form.myNumericUpDown22.Value = myNuD22; + form.myNumericUpDown24.Value = myNuD24; + form.checkBox14.Checked = chB14; + form.myNumericUpDown25.Value = myNuD25; + form.myNumericUpDown26.Value = myNuD26; form.myNumericUpDown75.Value = myNuD75; - form.checkBox20.Checked=chB20; - form.checkBox19.Checked=chB19; - form.myNumericUpDown32.Value=myNuD32; - form.checkBox17.Checked=chB17; - form.myNumericUpDown29.Value=myNuD29; - form.checkBox16.Checked=chB16; + form.checkBox20.Checked = chB20; + form.checkBox19.Checked = chB19; + form.myNumericUpDown32.Value = myNuD32; + form.checkBox17.Checked = chB17; + form.myNumericUpDown29.Value = myNuD29; + form.checkBox16.Checked = chB16; form.checkBox18.Checked = chB18; - form.myNumericUpDown31.Value=myNuD31; - form.myNumericUpDown30.Value=myNuD30; - form.checkBox15.Checked=chB15; - form.myNumericUpDown28.Value=myNuD28; - form.myNumericUpDown27.Value=myNuD27; + form.myNumericUpDown31.Value = myNuD31; + form.myNumericUpDown30.Value = myNuD30; + form.checkBox15.Checked = chB15; + form.myNumericUpDown28.Value = myNuD28; + form.myNumericUpDown27.Value = myNuD27; form.myNumericUpDown86.Value = myNuD86; - form.checkBox26.Checked=chB26; - form.checkBox25.Checked=chB25; - form.myNumericUpDown38.Value=myNuD38; - form.checkBox23.Checked=chB23; - form.myNumericUpDown35.Value=myNuD35; - form.checkBox22.Checked=chB22; + form.checkBox26.Checked = chB26; + form.checkBox25.Checked = chB25; + form.myNumericUpDown38.Value = myNuD38; + form.checkBox23.Checked = chB23; + form.myNumericUpDown35.Value = myNuD35; + form.checkBox22.Checked = chB22; form.checkBox24.Checked = chB24; - form.myNumericUpDown37.Value=myNuD37; - form.myNumericUpDown36.Value=myNuD36; - form.checkBox21.Checked=chB21; - form.myNumericUpDown34.Value=myNuD34; - form.myNumericUpDown33.Value=myNuD33; + form.myNumericUpDown37.Value = myNuD37; + form.myNumericUpDown36.Value = myNuD36; + form.checkBox21.Checked = chB21; + form.myNumericUpDown34.Value = myNuD34; + form.myNumericUpDown33.Value = myNuD33; form.myNumericUpDown87.Value = myNuD87; form.checkBox32.Checked = chB32; @@ -1301,7 +1296,7 @@ namespace Mip } #endregion Nastav údaje do formulára - + #region Refresh public void RefreshForm(Form inputForm) { @@ -1401,7 +1396,7 @@ namespace Mip form.label182.Text = string.Format("{0:F3}", form.label224.Text); //cena materialu form.label197.Text = string.Format("{0:F3}", myNuD25); //pocet impregnacii //form.label181.Text = string.Format("{0:F3}", Convert.ToDecimal(form.label271.Text)*myNuD25/objObjectVyrobok.ObjednanyPocetKusov); //cena impregnacia praca - form.label181.Text = string.Format("{0:F3}", getImpPracaMatPrice(Convert.ToDecimal(form.label225.Text),objObjectSadzby.ImpregnaciaPraca)); + form.label181.Text = string.Format("{0:F3}", getImpPracaMatPrice(Convert.ToDecimal(form.label225.Text), objObjectSadzby.ImpregnaciaPraca)); form.label152.Text = string.Format("{0:F3}", myNuD26); //pocet material //form.label193.Text = string.Format("{0:F3}", Convert.ToDecimal(form.label272.Text)*myNuD26/objObjectVyrobok.ObjednanyPocetKusov); //cena impregnacia material form.label193.Text = string.Format("{0:F3}", getImpPracaMatPrice(Convert.ToDecimal(form.label225.Text), objObjectSadzby.ImpregnaciaMaterial)); @@ -1446,7 +1441,7 @@ namespace Mip #endregion Refresh #region Iné funkcie - private decimal getMaterialPrice(CheckBox _chb1, decimal _mynud1, decimal _objemPouzitehoMaterialu, decimal _hustota, CheckBox _chb2, decimal _mynud2, CheckBox _chb3, + private decimal getMaterialPrice(CheckBox _chb1, decimal _mynud1, decimal _objemPouzitehoMaterialu, decimal _hustota, CheckBox _chb2, decimal _mynud2, CheckBox _chb3, CheckBox _chb4, decimal _mynud3, decimal _mynud4) { decimal decCenaKusu = 0; @@ -1463,7 +1458,7 @@ namespace Mip { decimal decCenaKusu = 0; - if ((objObjectSadzby.ImpregnaciaMaterial + objObjectSadzby.ImpregnaciaPraca).ToString() != "") decCenaKusu = (_cenaImp * _sadzba / (objObjectSadzby.ImpregnaciaMaterial+objObjectSadzby.ImpregnaciaPraca)); + if ((objObjectSadzby.ImpregnaciaMaterial + objObjectSadzby.ImpregnaciaPraca).ToString() != "") decCenaKusu = (_cenaImp * _sadzba / (objObjectSadzby.ImpregnaciaMaterial + objObjectSadzby.ImpregnaciaPraca)); return decCenaKusu; } @@ -1473,10 +1468,10 @@ namespace Mip decimal decCenaKusu = 0; if (_chb5.Checked == true) decCenaKusu = (_cenaMat * _vyuzitieKosa / 100 /* / objObjectVyrobok.ObjednanyPocetKusov*/); - + return decCenaKusu; } - + //stara verzia /* private decimal getImpPrice(CheckBox _chb5, decimal _mynud5, decimal _mynud6, decimal _vyuzitieKosa) @@ -1564,7 +1559,7 @@ namespace Mip "`cb9` = '" + cb9 + "'"; cmd = @"UPDATE `tab-nacenovanie-material` SET " + strMat + "WHERE `IDNacenovanieMaterial`= " + IDNacenovanieMaterial.ToString() + ";"; - + } else @@ -1578,72 +1573,72 @@ namespace Mip `chB32`, `chB31`, `myNuD44`, `chB29`, `myNuD41`, `chB28`, `chB30`, `myNuD43`, `myNuD42`, `chB27`, `myNuD40`, `myNuD39`, `myNuD98`, `cb5`, `cb9`, `cb2`) VALUES (" + IDN.ToString() + ", " - + chB1.ToString() + ", " - + chB2.ToString() + ", " - + myNuD21.ToString().Replace(",", ".") + ", " - + chB4.ToString() + ", " - + myNuD23.ToString().Replace(",", ".") + ", " - + chB13.ToString() + ", " - + chB3.ToString() + ", " - + myNuD22.ToString().Replace(",", ".") + ", " - + myNuD24.ToString().Replace(",", ".") + ", " - + chB14.ToString() + ", " - + myNuD25.ToString().Replace(",", ".") + ", " - + myNuD26.ToString().Replace(",", ".") + ", " - + myNuD75.ToString().Replace(",", ".") + ", '" - + cb1 + "', '" - + cb6 + "', " - + chB20.ToString() + ", " - + chB19.ToString() + ", " - + myNuD32.ToString().Replace(",", ".") + ", " - + chB17.ToString() + ", " - + myNuD29.ToString().Replace(",", ".") + ", " - + chB16.ToString() + ", " - + chB18.ToString() + ", " - + myNuD31.ToString().Replace(",", ".") + ", " - + myNuD30.ToString().Replace(",", ".") + ", " - + chB15.ToString() + ", " - + myNuD28.ToString().Replace(",", ".") + ", " - + myNuD27.ToString().Replace(",", ".") + ", " - + myNuD86.ToString().Replace(",", ".") + ", '" - + cb3 + "', '" - + cb7 + "', " - + chB26.ToString() + ", " - + chB25.ToString() + ", " - + myNuD38.ToString().Replace(",", ".") + ", " - + chB23.ToString() + ", " - + myNuD35.ToString().Replace(",", ".") + ", " - + chB22.ToString() + ", " - + chB24.ToString() + ", " - + myNuD37.ToString().Replace(",", ".") + ", " - + myNuD36.ToString().Replace(",", ".") + ", " - + chB21.ToString() + ", " - + myNuD34.ToString().Replace(",", ".") + ", " - + myNuD33.ToString().Replace(",", ".") + ", " - + myNuD87.ToString().Replace(",", ".") + ", '" - + cb5 + "', '" - + cb8 + "', " - + chB32.ToString() + ", " - + chB31.ToString() + ", " - + myNuD44.ToString().Replace(",", ".") + ", " - + chB29.ToString() + ", " - + myNuD41.ToString().Replace(",", ".") + ", " - + chB28.ToString() + ", " - + chB30.ToString() + ", " - + myNuD43.ToString().Replace(",", ".") + ", " - + myNuD42.ToString().Replace(",", ".") + ", " - + chB27.ToString() + ", " - + myNuD40.ToString().Replace(",", ".") + ", " - + myNuD39.ToString().Replace(",", ".") + ", " - + myNuD98.ToString().Replace(",", ".") + ", '" - + cb5 + "', '" - + cb9 + "', '" + + chB1.ToString() + ", " + + chB2.ToString() + ", " + + myNuD21.ToString().Replace(",", ".") + ", " + + chB4.ToString() + ", " + + myNuD23.ToString().Replace(",", ".") + ", " + + chB13.ToString() + ", " + + chB3.ToString() + ", " + + myNuD22.ToString().Replace(",", ".") + ", " + + myNuD24.ToString().Replace(",", ".") + ", " + + chB14.ToString() + ", " + + myNuD25.ToString().Replace(",", ".") + ", " + + myNuD26.ToString().Replace(",", ".") + ", " + + myNuD75.ToString().Replace(",", ".") + ", '" + + cb1 + "', '" + + cb6 + "', " + + chB20.ToString() + ", " + + chB19.ToString() + ", " + + myNuD32.ToString().Replace(",", ".") + ", " + + chB17.ToString() + ", " + + myNuD29.ToString().Replace(",", ".") + ", " + + chB16.ToString() + ", " + + chB18.ToString() + ", " + + myNuD31.ToString().Replace(",", ".") + ", " + + myNuD30.ToString().Replace(",", ".") + ", " + + chB15.ToString() + ", " + + myNuD28.ToString().Replace(",", ".") + ", " + + myNuD27.ToString().Replace(",", ".") + ", " + + myNuD86.ToString().Replace(",", ".") + ", '" + + cb3 + "', '" + + cb7 + "', " + + chB26.ToString() + ", " + + chB25.ToString() + ", " + + myNuD38.ToString().Replace(",", ".") + ", " + + chB23.ToString() + ", " + + myNuD35.ToString().Replace(",", ".") + ", " + + chB22.ToString() + ", " + + chB24.ToString() + ", " + + myNuD37.ToString().Replace(",", ".") + ", " + + myNuD36.ToString().Replace(",", ".") + ", " + + chB21.ToString() + ", " + + myNuD34.ToString().Replace(",", ".") + ", " + + myNuD33.ToString().Replace(",", ".") + ", " + + myNuD87.ToString().Replace(",", ".") + ", '" + + cb5 + "', '" + + cb8 + "', " + + chB32.ToString() + ", " + + chB31.ToString() + ", " + + myNuD44.ToString().Replace(",", ".") + ", " + + chB29.ToString() + ", " + + myNuD41.ToString().Replace(",", ".") + ", " + + chB28.ToString() + ", " + + chB30.ToString() + ", " + + myNuD43.ToString().Replace(",", ".") + ", " + + myNuD42.ToString().Replace(",", ".") + ", " + + chB27.ToString() + ", " + + myNuD40.ToString().Replace(",", ".") + ", " + + myNuD39.ToString().Replace(",", ".") + ", " + + myNuD98.ToString().Replace(",", ".") + ", '" + + cb5 + "', '" + + cb9 + "', '" + cb2 + "');"; } - + } - if(cmd != "") classSQL.SQL(cmd); + if (cmd != "") classSQL.SQL(cmd); } #endregion Ulož údaje do MariaDB @@ -1672,20 +1667,28 @@ namespace Mip public decimal CasVyrobaCNCFreza { get; private set; } public decimal CasNastavCNCSustruhSPU40 { get; private set; } public decimal CasVyrobaCNCSustruhSPU40 { get; private set; } + public decimal CasNastav3DMeranie { get; private set; } + public decimal CasVyroba3DMeranie { get; private set; } + public decimal CasNastavCNCBrusenie { get; private set; } + public decimal CasVyrobaCNCBrusenie { get; private set; } + public decimal CasNastavCNCFreza5Osi { get; private set; } + public decimal CasVyrobaCNCFreza5Osi { get; private set; } + + public decimal CasNastavProgramovanie { get; private set; } public decimal CasVyrobaProgramovanie { get; private set; } public decimal CasNastavNovaPolozka { get; private set; } public decimal CasVyrobaNovaPolozka { get; private set; } public string textBoxNazovNovejPolozky { get; private set; } = ""; - + public decimal CenaOstatne { get; private set; } public decimal Rezia; public decimal Zisk; - + public bool bEnableSQLUpdate = false; - + #endregion Premenné public - + #region Premenné private private decimal CenaRezanie; @@ -1701,6 +1704,9 @@ namespace Mip private decimal CenaPrace; private decimal CenaNovejPolozky; private decimal CenaPraceSReziou; + private decimal Cena3DMeranie; + private decimal CenaCNCBrusenie; + private decimal CenaCNCFreza5Osi; private string nazovNovejPolozky; //casy nastaveni @@ -1715,6 +1721,9 @@ namespace Mip private decimal myNuD76; private decimal myNuD73; private decimal myNuD125; + private decimal myNuD135; + private decimal myNuD134; + private decimal myNuD133; //vyrobne casy private decimal myNuD96; @@ -1728,15 +1737,18 @@ namespace Mip private decimal myNuD88; private decimal myNuD85; private decimal myNuD124; + private decimal myNuD132; + private decimal myNuD131; + private decimal myNuD130; - private decimal myNuD72=1; + private decimal myNuD72 = 1; private decimal myNuD99; private decimal myNuD97; private decimal myNuD71; private Int32 IDNacenovanie; private Int32 IDNacenovanieNacenovanie; - private string l206; + private string l206; public bool bEnableRefresh = false; #endregion Premenné private @@ -1761,6 +1773,9 @@ namespace Mip myNuD78 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD78"].ToString()); myNuD77 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD77"].ToString()); myNuD76 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD76"].ToString()); + myNuD135 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD135"].ToString()); + myNuD134 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD134"].ToString()); + myNuD133 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD133"].ToString()); myNuD73 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD73"].ToString()); myNuD96 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD96"].ToString()); myNuD95 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD95"].ToString()); @@ -1771,6 +1786,9 @@ namespace Mip myNuD90 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD90"].ToString()); myNuD89 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD89"].ToString()); myNuD88 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD88"].ToString()); + myNuD132 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD132"].ToString()); + myNuD131 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD131"].ToString()); + myNuD130 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD130"].ToString()); myNuD85 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD85"].ToString()); myNuD72 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD72"].ToString()); myNuD99 = Convert.ToDecimal(tblObjectNacenovanie.Rows[intCisloRiadka]["myNuD99"].ToString()); @@ -1804,6 +1822,9 @@ namespace Mip CasNastavCNCSustruh = myNuD78 = form.myNumericUpDown78.Value; CasNastavCNCFreza = myNuD77 = form.myNumericUpDown77.Value; CasNastavCNCSustruhSPU40 = myNuD76 = form.myNumericUpDown76.Value; + CasNastav3DMeranie = myNuD135 = form.myNumericUpDown135.Value; + CasNastavCNCBrusenie = myNuD134 = form.myNumericUpDown134.Value; + CasNastavCNCFreza5Osi = myNuD133 = form.myNumericUpDown133.Value; CasNastavProgramovanie = myNuD73 = form.myNumericUpDown73.Value; CasNastavNovaPolozka = myNuD125 = form.myNumericUpDown125.Value; CasVyrobaRezanie = myNuD96 = form.myNumericUpDown96.Value; @@ -1815,6 +1836,9 @@ namespace Mip CasVyrobaCNCSustruh = myNuD90 = form.myNumericUpDown90.Value; CasVyrobaCNCFreza = myNuD89 = form.myNumericUpDown89.Value; CasVyrobaCNCSustruhSPU40 = myNuD88 = form.myNumericUpDown88.Value; + CasVyroba3DMeranie = myNuD132 = form.myNumericUpDown132.Value; + CasVyrobaCNCBrusenie = myNuD131 = form.myNumericUpDown131.Value; + CasVyrobaCNCFreza5Osi = myNuD130 = form.myNumericUpDown130.Value; CasVyrobaProgramovanie = myNuD85 = form.myNumericUpDown85.Value; CasVyrobaNovaPolozka = myNuD124 = form.myNumericUpDown124.Value; Rezia = myNuD72 = form.myNumericUpDown72.Value; @@ -1845,6 +1869,9 @@ namespace Mip form.myNumericUpDown78.Value = myNuD78; form.myNumericUpDown77.Value = myNuD77; form.myNumericUpDown76.Value = myNuD76; + form.myNumericUpDown135.Value = myNuD135; + form.myNumericUpDown134.Value = myNuD134; + form.myNumericUpDown133.Value = myNuD133; form.myNumericUpDown73.Value = myNuD73; form.myNumericUpDown96.Value = myNuD96; form.myNumericUpDown95.Value = myNuD95; @@ -1855,6 +1882,9 @@ namespace Mip form.myNumericUpDown90.Value = myNuD90; form.myNumericUpDown89.Value = myNuD89; form.myNumericUpDown88.Value = myNuD88; + form.myNumericUpDown132.Value = myNuD132; + form.myNumericUpDown131.Value = myNuD131; + form.myNumericUpDown130.Value = myNuD130; form.myNumericUpDown85.Value = myNuD85; form.myNumericUpDown72.Value = myNuD72; form.myNumericUpDown99.Value = myNuD99; @@ -1873,10 +1903,13 @@ namespace Mip form.label264.Text = objObjectSadzby.CNCSustruh.ToString(); form.label263.Text = objObjectSadzby.CNCFreza.ToString(); form.label262.Text = objObjectSadzby.CNCSustruhSPU40.ToString(); + form.label585.Text = objObjectSadzby.Meranie3D.ToString(); + form.label584.Text = objObjectSadzby.CNCBrusenie.ToString(); + form.label583.Text = objObjectSadzby.CNCFreza5Osi.ToString(); form.label261.Text = objObjectSadzby.Programovanie.ToString(); form.label560.Text = objObjectSadzby.NovaPolozka.ToString(); form.label137.Text = objObjectVyrobok.ObjednanyPocetKusov.ToString(); - + bEnableRefresh = true; } } @@ -1886,6 +1919,7 @@ namespace Mip public void RefreshForm(Form inputForm) { GetDataFromForm(inputForm); + objObjectSadzby.GetDataFromForm(inputForm); dynamic form = inputForm as frmNacenovanie; if (form != null) @@ -1909,13 +1943,20 @@ namespace Mip form.label184.Text = string.Format("{0:F3}", CenaCNCFreza); CenaCNCSustruhSPU40 = vypocetCeny(objObjectSadzby.CNCSustruhSPU40, myNuD76, myNuD88); form.label183.Text = string.Format("{0:F3}", CenaCNCSustruhSPU40); + Cena3DMeranie = vypocetCeny(objObjectSadzby.Meranie3D, myNuD135, myNuD132); + form.label573.Text = string.Format("{0:F3}", Cena3DMeranie); + CenaCNCBrusenie = vypocetCeny(objObjectSadzby.CNCBrusenie, myNuD134, myNuD131); + form.label572.Text = string.Format("{0:F3}", CenaCNCBrusenie); + CenaCNCFreza5Osi = vypocetCeny(objObjectSadzby.CNCFreza5Osi, myNuD133, myNuD130); + form.label571.Text = string.Format("{0:F3}", CenaCNCFreza5Osi); CenaProgramovanie = vypocetCeny(objObjectSadzby.Programovanie, myNuD73, myNuD85); form.label180.Text = string.Format("{0:F3}", CenaProgramovanie); CenaNovejPolozky = vypocetCeny(objObjectSadzby.NovaPolozka, myNuD124, myNuD125); form.label556.Text = string.Format("{0:F3}", CenaNovejPolozky); - CenaPrace = CenaRezanie + CenaKlasika + CenaBrusenie + CenaLapovanie + CenaKontrola + CenaBalenie + CenaCNCSustruh + CenaCNCFreza + CenaCNCSustruhSPU40 + CenaProgramovanie + CenaNovejPolozky; + CenaPrace = CenaRezanie + CenaKlasika + CenaBrusenie + CenaLapovanie + CenaKontrola + CenaBalenie + CenaCNCSustruh + + CenaCNCFreza + CenaCNCSustruhSPU40 + Cena3DMeranie + CenaCNCBrusenie + CenaCNCFreza5Osi + CenaProgramovanie + CenaNovejPolozky; form.label254.Text = string.Format("{0:F3}", CenaPrace); - CenaPraceSReziou = CenaPrace * (1+(myNuD72/100)); + CenaPraceSReziou = CenaPrace * (1 + (myNuD72 / 100)); form.label255.Text = string.Format("{0:F3}", CenaPraceSReziou); CenaOstatne = myNuD99 * myNuD97 / objObjectVyrobok.ObjednanyPocetKusov; @@ -1924,13 +1965,13 @@ namespace Mip form.label271.Text = objObjectSadzby.ImpregnaciaPraca.ToString(); form.label272.Text = objObjectSadzby.ImpregnaciaMaterial.ToString(); - form.label206.Text = (Convert.ToDecimal(form.label255.Text) + + form.label206.Text = (Convert.ToDecimal(form.label255.Text) + Convert.ToDecimal(form.label260.Text) + Convert.ToDecimal(form.label182.Text) + Convert.ToDecimal(form.label181.Text) + Convert.ToDecimal(form.label193.Text)).ToString(); - if (Convert.ToDecimal(form.label206.Text) == 0) form.label212.Text = string.Format("{0:F2}",0); - else form.label212.Text = string.Format("{0:F2}", (myNuD71 / Convert.ToDecimal(form.label206.Text) * 100)-100); + if (Convert.ToDecimal(form.label206.Text) == 0) form.label212.Text = string.Format("{0:F2}", 0); + else form.label212.Text = string.Format("{0:F2}", (myNuD71 / Convert.ToDecimal(form.label206.Text) * 100) - 100); form.label354.Text = form.label212.Text; Zisk = Convert.ToDecimal(form.label212.Text); @@ -1940,7 +1981,7 @@ namespace Mip myNuD96 + myNuD95 + myNuD94 + myNuD93 + myNuD92 + myNuD91 + myNuD90 + myNuD89 + myNuD88 + myNuD85); form.label202.Text = string.Format("{0:F3}", Convert.ToDecimal(form.label200.Text) / 440); - decimal cas = Convert.ToDecimal(form.label200.Text)/objObjectVyrobok.ObjednanyPocetKusov*60; + decimal cas = Convert.ToDecimal(form.label200.Text) / objObjectVyrobok.ObjednanyPocetKusov * 60; int hodiny = Convert.ToInt32(Math.Floor(cas / 3600)); int minuty = Convert.ToInt32(Math.Floor((cas - (hodiny * 3600)) / 60)); int sekundy = Convert.ToInt32(cas - (hodiny * 3600) - (minuty * 60)); @@ -1960,10 +2001,13 @@ namespace Mip form.label264.Text = objObjectSadzby.CNCSustruh.ToString(); form.label263.Text = objObjectSadzby.CNCFreza.ToString(); form.label262.Text = objObjectSadzby.CNCSustruhSPU40.ToString(); + form.label585.Text = objObjectSadzby.Meranie3D.ToString(); + form.label584.Text = objObjectSadzby.CNCBrusenie.ToString(); + form.label583.Text = objObjectSadzby.CNCFreza5Osi.ToString(); form.label261.Text = objObjectSadzby.Programovanie.ToString(); form.label560.Text = objObjectSadzby.NovaPolozka.ToString(); form.label137.Text = objObjectVyrobok.ObjednanyPocetKusov.ToString(); - if (objObjectSadzby.Rezia>0) form.myNumericUpDown72.Value = objObjectSadzby.Rezia; + if (objObjectSadzby.Rezia > 0) form.myNumericUpDown72.Value = objObjectSadzby.Rezia; form.ResumeLayout(); } @@ -1972,8 +2016,8 @@ namespace Mip private decimal vypocetCeny(decimal _sadzba, decimal _minutyNastav, decimal _minutyPraca) { decimal returnValue = 0; - returnValue = (_minutyNastav + _minutyPraca) / 60 * _sadzba / objObjectVyrobok.ObjednanyPocetKusov; - + returnValue = (_minutyNastav + _minutyPraca) / 60 * _sadzba / objObjectVyrobok.ObjednanyPocetKusov; + return returnValue; } #endregion Refresh @@ -1986,44 +2030,50 @@ namespace Mip { string strMat = ""; - strMat = @"`myNuD84` = " + myNuD84.ToString().Replace(",", ".") + ", " + - "`myNuD83` = " + myNuD83.ToString().Replace(",", ".") + ", " + - "`myNuD82` = " + myNuD82.ToString().Replace(",", ".") + ", " + - "`myNuD81` = " + myNuD81.ToString().Replace(",", ".") + ", " + - "`myNuD80` = " + myNuD80.ToString().Replace(",", ".") + ", " + - "`myNuD79` = " + myNuD79.ToString().Replace(",", ".") + ", " + - "`myNuD78` = " + myNuD78.ToString().Replace(",", ".") + ", " + - "`myNuD77` = " + myNuD77.ToString().Replace(",", ".") + ", " + - "`myNuD76` = " + myNuD76.ToString().Replace(",", ".") + ", " + - "`myNuD73` = " + myNuD73.ToString().Replace(",", ".") + ", " + - "`myNuD96` = " + myNuD96.ToString().Replace(",", ".") + ", " + - "`myNuD95` = " + myNuD95.ToString().Replace(",", ".") + ", " + - "`myNuD94` = " + myNuD94.ToString().Replace(",", ".") + ", " + - "`myNuD93` = " + myNuD93.ToString().Replace(",", ".") + ", " + - "`myNuD92` = " + myNuD92.ToString().Replace(",", ".") + ", " + - "`myNuD91` = " + myNuD91.ToString().Replace(",", ".") + ", " + - "`myNuD90` = " + myNuD90.ToString().Replace(",", ".") + ", " + - "`myNuD89` = " + myNuD89.ToString().Replace(",", ".") + ", " + - "`myNuD88` = " + myNuD88.ToString().Replace(",", ".") + ", " + - "`myNuD85` = " + myNuD85.ToString().Replace(",", ".") + ", " + - "`myNuD72` = " + myNuD72.ToString().Replace(",", ".") + ", " + - "`myNuD99` = " + myNuD99.ToString().Replace(",", ".") + ", " + - "`myNuD97` = " + myNuD97.ToString().Replace(",", ".") + ", " + - "`myNuD124` = " + myNuD124.ToString().Replace(",", ".") + ", " + - "`myNuD125` = " + myNuD125.ToString().Replace(",", ".") + ", " + - "`nazovNovejPolozky` = '" + nazovNovejPolozky + "', " + - "`myNuD71` = " + myNuD71.ToString().Replace(",", ".") + " "; - - cmd = @"UPDATE `tab-nacenovanie-nacenovanie` SET " + strMat + "WHERE `IDNacenovanieNacenovanie`= " + IDNacenovanieNacenovanie.ToString() + ";"; + strMat = $@"`myNuD84` = {myNuD84.ToString().Replace(",", ".")}, + `myNuD83` = {myNuD83.ToString().Replace(",", ".")}, + `myNuD82` = {myNuD82.ToString().Replace(",", ".")}, + `myNuD81` = {myNuD81.ToString().Replace(",", ".")}, + `myNuD80` = {myNuD80.ToString().Replace(",", ".")}, + `myNuD79` = {myNuD79.ToString().Replace(",", ".")}, + `myNuD78` = {myNuD78.ToString().Replace(",", ".")}, + `myNuD77` = {myNuD77.ToString().Replace(",", ".")}, + `myNuD76` = {myNuD76.ToString().Replace(",", ".")}, + `myNuD135` = {myNuD135.ToString().Replace(",", ".")}, + `myNuD134` = {myNuD134.ToString().Replace(",", ".")}, + `myNuD133` = {myNuD133.ToString().Replace(",", ".")}, + `myNuD73` = {myNuD73.ToString().Replace(",", ".")}, + `myNuD96` = {myNuD96.ToString().Replace(",", ".")}, + `myNuD95` = {myNuD95.ToString().Replace(",", ".")}, + `myNuD94` = {myNuD94.ToString().Replace(",", ".")}, + `myNuD93` = {myNuD93.ToString().Replace(",", ".")}, + `myNuD92` = {myNuD92.ToString().Replace(",", ".")}, + `myNuD91` = {myNuD91.ToString().Replace(",", ".")}, + `myNuD90` = {myNuD90.ToString().Replace(",", ".")}, + `myNuD89` = {myNuD89.ToString().Replace(",", ".")}, + `myNuD88` = {myNuD88.ToString().Replace(",", ".")}, + `myNuD132` = {myNuD132.ToString().Replace(",", ".")}, + `myNuD131` = {myNuD131.ToString().Replace(",", ".")}, + `myNuD130` = {myNuD130.ToString().Replace(",", ".")}, + `myNuD85` = {myNuD85.ToString().Replace(",", ".")}, + `myNuD72` = {myNuD72.ToString().Replace(",", ".")}, + `myNuD99` = {myNuD99.ToString().Replace(",", ".")}, + `myNuD97` = {myNuD97.ToString().Replace(",", ".")}, + `myNuD124` = {myNuD124.ToString().Replace(",", ".")}, + `myNuD125` = {myNuD125.ToString().Replace(",", ".")}, + `nazovNovejPolozky` = '{nazovNovejPolozky}', + `myNuD71` = {myNuD71.ToString().Replace(",", ".")}"; + cmd = $@"UPDATE `tab-nacenovanie-nacenovanie` SET {strMat} WHERE `IDNacenovanieNacenovanie`= {IDNacenovanieNacenovanie.ToString()};"; } else { if (l206 != "0,000") { cmd = @"INSERT INTO `mip`.`tab-nacenovanie-nacenovanie` ( - `IDNacenovanie`, `myNuD84`, `myNuD83`, `myNuD82`, `myNuD81`, `myNuD80`, `myNuD79`, `myNuD78`, `myNuD77`, `myNuD76`, `myNuD73`, - `myNuD96`, `myNuD95`, `myNuD94`, `myNuD93`, `myNuD92`, `myNuD91`, `myNuD90`, `myNuD89`, `myNuD88`, `myNuD85`, + `IDNacenovanie`, `myNuD84`, `myNuD83`, `myNuD82`, `myNuD81`, `myNuD80`, `myNuD79`, `myNuD78`, `myNuD77`, `myNuD76`, + `myNuD135`, `myNuD134`, `myNuD133`, `myNuD73`, `myNuD96`, `myNuD95`, `myNuD94`, `myNuD93`, `myNuD92`, + `myNuD91`, `myNuD90`, `myNuD89`, `myNuD88`, `myNuD132`, `myNuD131`, `myNuD130`, `myNuD85`, `myNuD72`, `myNuD99`, `myNuD97`, `myNuD71`, `myNuD124`, `myNuD125`, `nazovNovejPolozky`) VALUES (" + IDN.ToString() + ", " @@ -2036,6 +2086,9 @@ namespace Mip + myNuD78.ToString().Replace(",", ".") + ", " + myNuD77.ToString().Replace(",", ".") + ", " + myNuD76.ToString().Replace(",", ".") + ", " + + myNuD135.ToString().Replace(",", ".") + ", " + + myNuD134.ToString().Replace(",", ".") + ", " + + myNuD133.ToString().Replace(",", ".") + ", " + myNuD73.ToString().Replace(",", ".") + ", " + myNuD96.ToString().Replace(",", ".") + ", " + myNuD95.ToString().Replace(",", ".") + ", " @@ -2046,25 +2099,27 @@ namespace Mip + myNuD90.ToString().Replace(",", ".") + ", " + myNuD89.ToString().Replace(",", ".") + ", " + myNuD88.ToString().Replace(",", ".") + ", " + + myNuD132.ToString().Replace(",", ".") + ", " + + myNuD131.ToString().Replace(",", ".") + ", " + + myNuD130.ToString().Replace(",", ".") + ", " + myNuD85.ToString().Replace(",", ".") + ", " + myNuD72.ToString().Replace(",", ".") + ", " + myNuD99.ToString().Replace(",", ".") + ", " + myNuD97.ToString().Replace(",", ".") + ", " - + myNuD71.ToString().Replace(",",".") + ", " + + myNuD71.ToString().Replace(",", ".") + ", " + myNuD124.ToString().Replace(",", ".") + ", " + myNuD125.ToString().Replace(",", ".") + ", " + "'" + nazovNovejPolozky + "');"; } } - if(cmd != "") classSQL.SQL(cmd); - + if (cmd != "") classSQL.SQL(cmd); } #endregion Ulož údaje do MariaDB } - + public class ObjectVyhodnocovanie { public bool bEnableSQLUpdate = false; @@ -2206,6 +2261,7 @@ namespace Mip form.label524.Text = form.label264.Text; form.label523.Text = form.label263.Text; form.label522.Text = form.label262.Text; + form.label521.Text = form.label261.Text; form.label567.Text = form.label560.Text; form.label456.Text = form.label182.Text; @@ -2227,7 +2283,7 @@ namespace Mip //GetDataFromForm(inputForm); var form = inputForm as frmNacenovanie; var PocetKusov = form.myNumericUpDown123.Value; - + if (form != null) { form.SuspendLayout(); @@ -2253,7 +2309,7 @@ namespace Mip "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label521.Text), form.myNumericUpDown113.Value, form.myNumericUpDown103.Value, PocetKusov)); form.label563.Text = string.Format( "{0:F3}", vypocetCeny(Convert.ToDecimal(form.label567.Text), form.myNumericUpDown129.Value, form.myNumericUpDown128.Value, PocetKusov)); - var CenaPrace = + var CenaPrace = Convert.ToDecimal(form.label490.Text) + Convert.ToDecimal(form.label489.Text) + Convert.ToDecimal(form.label488.Text) + @@ -2352,12 +2408,15 @@ namespace Mip public decimal ImpregnaciaMaterial { get; private set; } public decimal Programovanie { get; private set; } public decimal NovaPolozka { get; private set; } + public decimal CNCBrusenie { get; private set; } + public decimal CNCFreza5Osi { get; private set; } + public decimal Meranie3D { get; private set; } public decimal Rezia { get; private set; } public bool bEnableSQLUpdate = false; - + #endregion Premenné public - + #region Premenné private //Aktualne sadzby private bool chB35 = true; @@ -2375,6 +2434,9 @@ namespace Mip private decimal myNuD57; private decimal myNuD70; private decimal myNuD126; + private decimal myNuD139; + private decimal myNuD138; + private decimal myNuD137; //Predvolene sadzby private decimal myNuD45; @@ -2391,6 +2453,9 @@ namespace Mip private decimal myNuD56; private decimal myNuD69; private decimal myNuD127; + private decimal myNuD141; + private decimal myNuD140; + private decimal myNuD136; private Int32 IDNacenovanie; @@ -2420,6 +2485,9 @@ namespace Mip myNuD56 = Convert.ToDecimal(tblObjectSadzby.Rows[0]["myNuD57"].ToString()); myNuD69 = Convert.ToDecimal(tblObjectSadzby.Rows[0]["myNuD70"].ToString()); myNuD127 = Convert.ToDecimal(tblObjectSadzby.Rows[0]["myNuD126"].ToString()); + myNuD141 = Convert.ToDecimal(tblObjectSadzby.Rows[0]["myNuD139"].ToString()); + myNuD140 = Convert.ToDecimal(tblObjectSadzby.Rows[0]["myNuD138"].ToString()); + myNuD136 = Convert.ToDecimal(tblObjectSadzby.Rows[0]["myNuD137"].ToString()); int intCisloRiadka = tblObjectSadzby.Rows.Count - 1; @@ -2440,6 +2508,9 @@ namespace Mip myNuD57 = Convert.ToDecimal(tblObjectSadzby.Rows[intCisloRiadka]["myNuD57"].ToString()); myNuD70 = Convert.ToDecimal(tblObjectSadzby.Rows[intCisloRiadka]["myNuD70"].ToString()); myNuD126 = Convert.ToDecimal(tblObjectSadzby.Rows[intCisloRiadka]["myNuD126"].ToString()); + myNuD139 = Convert.ToDecimal(tblObjectSadzby.Rows[intCisloRiadka]["myNuD139"].ToString()); + myNuD138 = Convert.ToDecimal(tblObjectSadzby.Rows[intCisloRiadka]["myNuD138"].ToString()); + myNuD137 = Convert.ToDecimal(tblObjectSadzby.Rows[intCisloRiadka]["myNuD137"].ToString()); Rezanie = myNuD68; Klasika = myNuD67; @@ -2455,6 +2526,9 @@ namespace Mip Programovanie = myNuD57; Rezia = myNuD70; NovaPolozka = myNuD126; + CNCBrusenie = myNuD139; + CNCFreza5Osi = myNuD138; + Meranie3D = myNuD137; bEnableSQLUpdate = true; } @@ -2462,7 +2536,7 @@ namespace Mip #endregion Konštruktor #region Získaj údaje z formulára - private void GetDataFromForm(Form inputForm) + public void GetDataFromForm(Form inputForm) { if (bEnableRefresh == true) { @@ -2486,6 +2560,9 @@ namespace Mip myNuD57 = form.myNumericUpDown57.Value; myNuD70 = form.myNumericUpDown70.Value; myNuD126 = form.myNumericUpDown126.Value; + myNuD139 = form.myNumericUpDown139.Value; + myNuD138 = form.myNumericUpDown138.Value; + myNuD137 = form.myNumericUpDown137.Value; myNuD45 = form.myNumericUpDown45.Value; myNuD46 = form.myNumericUpDown46.Value; @@ -2501,6 +2578,9 @@ namespace Mip myNuD56 = form.myNumericUpDown56.Value; myNuD69 = form.myNumericUpDown69.Value; myNuD127 = form.myNumericUpDown127.Value; + myNuD141 = form.myNumericUpDown141.Value; + myNuD140 = form.myNumericUpDown140.Value; + myNuD136 = form.myNumericUpDown136.Value; Rezanie = myNuD68; Klasika = myNuD67; @@ -2516,6 +2596,9 @@ namespace Mip Programovanie = myNuD57; Rezia = myNuD70; NovaPolozka = myNuD126; + CNCBrusenie = myNuD139; + CNCFreza5Osi = myNuD138; + Meranie3D = myNuD137; } } } @@ -2528,35 +2611,41 @@ namespace Mip if (form != null) { form.checkBox35.Checked = chB35; - form.myNumericUpDown68.Value=myNuD68; - form.myNumericUpDown67.Value=myNuD67; - form.myNumericUpDown66.Value=myNuD66; - form.myNumericUpDown65.Value=myNuD65; - form.myNumericUpDown64.Value=myNuD64; - form.myNumericUpDown63.Value=myNuD63; - form.myNumericUpDown62.Value=myNuD62; - form.myNumericUpDown61.Value=myNuD61; - form.myNumericUpDown60.Value=myNuD60; - form.myNumericUpDown59.Value=myNuD59; - form.myNumericUpDown58.Value=myNuD58; - form.myNumericUpDown57.Value=myNuD57; - form.myNumericUpDown70.Value=myNuD70; + form.myNumericUpDown68.Value = myNuD68; + form.myNumericUpDown67.Value = myNuD67; + form.myNumericUpDown66.Value = myNuD66; + form.myNumericUpDown65.Value = myNuD65; + form.myNumericUpDown64.Value = myNuD64; + form.myNumericUpDown63.Value = myNuD63; + form.myNumericUpDown62.Value = myNuD62; + form.myNumericUpDown61.Value = myNuD61; + form.myNumericUpDown60.Value = myNuD60; + form.myNumericUpDown59.Value = myNuD59; + form.myNumericUpDown58.Value = myNuD58; + form.myNumericUpDown57.Value = myNuD57; + form.myNumericUpDown70.Value = myNuD70; form.myNumericUpDown126.Value = myNuD126; + form.myNumericUpDown139.Value = myNuD139; + form.myNumericUpDown138.Value = myNuD138; + form.myNumericUpDown137.Value = myNuD137; - form.myNumericUpDown45.Value=myNuD45; - form.myNumericUpDown46.Value=myNuD46; - form.myNumericUpDown47.Value=myNuD47; - form.myNumericUpDown48.Value=myNuD48; - form.myNumericUpDown49.Value=myNuD49; - form.myNumericUpDown50.Value=myNuD50; - form.myNumericUpDown51.Value=myNuD51; - form.myNumericUpDown52.Value=myNuD52; - form.myNumericUpDown53.Value=myNuD53; - form.myNumericUpDown54.Value=myNuD54; - form.myNumericUpDown55.Value=myNuD55; - form.myNumericUpDown56.Value=myNuD56; - form.myNumericUpDown69.Value=myNuD69; + form.myNumericUpDown45.Value = myNuD45; + form.myNumericUpDown46.Value = myNuD46; + form.myNumericUpDown47.Value = myNuD47; + form.myNumericUpDown48.Value = myNuD48; + form.myNumericUpDown49.Value = myNuD49; + form.myNumericUpDown50.Value = myNuD50; + form.myNumericUpDown51.Value = myNuD51; + form.myNumericUpDown52.Value = myNuD52; + form.myNumericUpDown53.Value = myNuD53; + form.myNumericUpDown54.Value = myNuD54; + form.myNumericUpDown55.Value = myNuD55; + form.myNumericUpDown56.Value = myNuD56; + form.myNumericUpDown69.Value = myNuD69; form.myNumericUpDown127.Value = myNuD127; + form.myNumericUpDown141.Value = myNuD141; + form.myNumericUpDown140.Value = myNuD140; + form.myNumericUpDown136.Value = myNuD136; bEnableRefresh = true; } @@ -2569,9 +2658,9 @@ namespace Mip GetDataFromForm(inputForm); } #endregion Refresh - + } - + public class ObjectPocty { #region Premenné public @@ -2587,7 +2676,7 @@ namespace Mip private Int32 IDNacenovaniePocty; public bool bEnableRefresh = false; - + #endregion Premenné private #region Konštruktor @@ -2605,7 +2694,7 @@ namespace Mip IDNacenovaniePocty = Convert.ToInt32(tblObjectPocty.Rows[intCisloRiadka]["IDNacenovaniePocty"].ToString()); if (intCisloRiadka > 0) bEnableSQLUpdate = true; - + } #endregion Konštruktor @@ -2619,7 +2708,7 @@ namespace Mip if (form != null) { myNuD74 = form.myNumericUpDown74.Value; - + } } } @@ -2632,8 +2721,8 @@ namespace Mip dynamic form = inputForm as frmNacenovanie; if (form != null) { - form.myNumericUpDown74.Value=myNuD74; - + form.myNumericUpDown74.Value = myNuD74; + bEnableRefresh = true; } } @@ -2658,10 +2747,10 @@ namespace Mip decimal zisk = (1 + (objObjectNacenovanie.Zisk / 100)); decimal rezia = (1 + (objObjectNacenovanie.Rezia / 100)); - foreach (Label lbl in form.panel102.Controls) + foreach (Label lbl in form.panel102.Controls) if (lbl.Tag != null && form.checkBox1.Checked == true) lbl.Text = string.Format("{0:F3}", vypocitajCenu(Convert.ToInt32(lbl.Tag), - rezia, - Convert.ToDecimal(form.label281.Text), + rezia, + Convert.ToDecimal(form.label281.Text), Convert.ToDecimal(form.label415.Text), objObjectNacenovanie.CenaOstatne, zisk)); @@ -2686,12 +2775,12 @@ namespace Mip Convert.ToDecimal(form.label418.Text), objObjectNacenovanie.CenaOstatne, zisk)); - + } } - private decimal vypocitajCenu(Int32 _pocet,decimal _rezia, decimal _cenaMat, decimal _cenaImp, decimal _cenaOstatne, decimal _zisk) + private decimal vypocitajCenu(Int32 _pocet, decimal _rezia, decimal _cenaMat, decimal _cenaImp, decimal _cenaOstatne, decimal _zisk) { decimal cenaCelkom = 0; decimal cenaPrace = 0; @@ -2707,6 +2796,10 @@ namespace Mip decimal CenaCNCFreza = 0; decimal CenaCNCSustruhSPU40 = 0; decimal CenaProgramovanie = 0; + decimal Cena3DMeranie = 0; + decimal CenaCNCBrusenie = 0; + decimal CenaCNCFreza5Osi = 0; + decimal CenaNovaPolozka = 0; CenaRezanie = ((objObjectNacenovanie.CasNastavRezanie / _pocet) + (objObjectNacenovanie.CasVyrobaRezanie / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.Rezanie / 60; CenaKlasika = ((objObjectNacenovanie.CasNastavKlasika / _pocet) + (objObjectNacenovanie.CasVyrobaKlasika / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.Klasika / 60; @@ -2718,8 +2811,13 @@ namespace Mip CenaCNCFreza = ((objObjectNacenovanie.CasNastavCNCFreza / _pocet) + (objObjectNacenovanie.CasVyrobaCNCFreza / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.CNCFreza / 60; CenaCNCSustruhSPU40 = ((objObjectNacenovanie.CasNastavCNCSustruhSPU40 / _pocet) + (objObjectNacenovanie.CasVyrobaCNCSustruhSPU40 / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.CNCSustruhSPU40 / 60; CenaProgramovanie = ((objObjectNacenovanie.CasNastavProgramovanie / _pocet) + (objObjectNacenovanie.CasVyrobaProgramovanie / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.Programovanie / 60; + Cena3DMeranie = ((objObjectNacenovanie.CasNastav3DMeranie / _pocet) + (objObjectNacenovanie.CasVyroba3DMeranie / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.Meranie3D / 60; + CenaCNCBrusenie = ((objObjectNacenovanie.CasNastavCNCBrusenie / _pocet) + (objObjectNacenovanie.CasVyrobaCNCBrusenie / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.CNCBrusenie / 60; + CenaCNCFreza5Osi = ((objObjectNacenovanie.CasNastavCNCFreza5Osi / _pocet) + (objObjectNacenovanie.CasVyrobaCNCFreza5Osi / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.CNCFreza5Osi / 60; + CenaNovaPolozka = ((objObjectNacenovanie.CasNastavNovaPolozka / _pocet) + (objObjectNacenovanie.CasVyrobaNovaPolozka / objObjectVyrobok.ObjednanyPocetKusov)) * objObjectSadzby.NovaPolozka / 60; - cenaPrace = CenaRezanie + CenaKlasika + CenaBrusenie + CenaLapovanie + CenaKontrola + CenaBalenie + CenaCNCSustruh + CenaCNCFreza + CenaCNCSustruhSPU40 + CenaProgramovanie; + cenaPrace = CenaRezanie + CenaKlasika + CenaBrusenie + CenaLapovanie + CenaKontrola + CenaBalenie + CenaCNCSustruh + CenaCNCFreza + + CenaCNCSustruhSPU40 + CenaProgramovanie + Cena3DMeranie + CenaCNCBrusenie + CenaCNCFreza5Osi + CenaNovaPolozka; cenaPraceSReziou = cenaPrace * _rezia; cenaCelkom = (cenaPraceSReziou + _cenaMat + _cenaImp + _cenaOstatne) * _zisk; return cenaCelkom; @@ -2760,8 +2858,8 @@ namespace Mip private void checkBox33_CheckedChanged(object sender, EventArgs e) { - if (checkBox33.Checked == false) { panel71.Size = new Size(panel71.Width, panel71.MinimumSize.Height);} - else { panel71.Size = new Size(panel71.Width, panel71.MaximumSize.Height);} + if (checkBox33.Checked == false) { panel71.Size = new Size(panel71.Width, panel71.MinimumSize.Height); } + else { panel71.Size = new Size(panel71.Width, panel71.MaximumSize.Height); } } private void checkBox35_CheckedChanged(object sender, EventArgs e) @@ -2775,7 +2873,7 @@ namespace Mip if (checkBox34.Checked == false) { panel75.Enabled = false; - if(classUser.ID == 4 || classUser.ID == 1) + if (classUser.ID == 4 || classUser.ID == 1) { button7.Enabled = true; } @@ -2936,7 +3034,7 @@ namespace Mip { RefreshAll(); } - + private void myNumericUpDown7_ValueChanged(object sender, EventArgs e) { RefreshAll(); @@ -3193,21 +3291,21 @@ namespace Mip //material 1 private void checkBox1_CheckedChanged(object sender, EventArgs e) { - if (checkBox1.Checked == false) - { - panel23.Size = new Size(panel23.Width, panel23.MinimumSize.Height); - comboBox1.Visible = false; + if (checkBox1.Checked == false) + { + panel23.Size = new Size(panel23.Width, panel23.MinimumSize.Height); + comboBox1.Visible = false; //comboBox1.Items.Clear(); - comboBox6.Visible = false; - comboBox6.Items.Clear(); - button10.Visible = false; - button15.Visible = false; + comboBox6.Visible = false; + comboBox6.Items.Clear(); + button10.Visible = false; + button15.Visible = false; panel102.Enabled = false; panel102.BackColor = Color.Thistle; //MessageBox.Show(comboBox1.ValueMember.ToString()); } - else - { + else + { panel23.Size = new Size(panel23.Width, panel23.MaximumSize.Height); comboBox1.Visible = true; comboBox6.Visible = true; @@ -3233,26 +3331,26 @@ namespace Mip panel102.BackColor = Color.LemonChiffon; RefreshAll(); } - materialFill(); + materialFill(); } //material 2 private void checkBox20_CheckedChanged(object sender, EventArgs e) { - if (checkBox20.Checked == false) - { - panel47.Size = new Size(panel47.Width, panel47.MinimumSize.Height); - comboBox3.Visible = false; + if (checkBox20.Checked == false) + { + panel47.Size = new Size(panel47.Width, panel47.MinimumSize.Height); + comboBox3.Visible = false; //comboBox3.Items.Clear(); comboBox7.Visible = false; comboBox7.Items.Clear(); - button11.Visible = false; + button11.Visible = false; panel101.Enabled = false; panel101.BackColor = Color.Thistle; } - else - { - panel47.Size = new Size(panel47.Width, panel47.MaximumSize.Height); + else + { + panel47.Size = new Size(panel47.Width, panel47.MaximumSize.Height); comboBox3.Visible = true; comboBox7.Visible = true; button11.Visible = true; @@ -3275,20 +3373,20 @@ namespace Mip //material 3 private void checkBox26_CheckedChanged(object sender, EventArgs e) { - if (checkBox26.Checked == false) - { - panel54.Size = new Size(panel54.Width, panel54.MinimumSize.Height); - comboBox4.Visible = false; + if (checkBox26.Checked == false) + { + panel54.Size = new Size(panel54.Width, panel54.MinimumSize.Height); + comboBox4.Visible = false; //comboBox4.Items.Clear(); comboBox8.Visible = false; comboBox8.Items.Clear(); - button12.Visible = false; + button12.Visible = false; panel100.Enabled = false; panel100.BackColor = Color.Thistle; } - else - { - panel54.Size = new Size(panel54.Width, panel54.MaximumSize.Height); + else + { + panel54.Size = new Size(panel54.Width, panel54.MaximumSize.Height); comboBox4.Visible = true; comboBox8.Visible = true; button12.Visible = true; @@ -3311,20 +3409,20 @@ namespace Mip //material 4 private void checkBox32_CheckedChanged(object sender, EventArgs e) { - if (checkBox32.Checked == false) - { - panel63.Size = new Size(panel63.Width, panel63.MinimumSize.Height); - comboBox5.Visible = false; + if (checkBox32.Checked == false) + { + panel63.Size = new Size(panel63.Width, panel63.MinimumSize.Height); + comboBox5.Visible = false; //comboBox5.Items.Clear(); comboBox9.Visible = false; comboBox9.Items.Clear(); - button13.Visible = false; + button13.Visible = false; panel103.Enabled = false; panel103.BackColor = Color.Thistle; } - else - { - panel63.Size = new Size(panel63.Width, panel63.MaximumSize.Height); + else + { + panel63.Size = new Size(panel63.Width, panel63.MaximumSize.Height); comboBox5.Visible = true; comboBox9.Visible = true; button13.Visible = true; @@ -3359,9 +3457,9 @@ namespace Mip private void checkBox2_CheckedChanged(object sender, EventArgs e) { if (checkBox2.Checked == false) { myNumericUpDown21.Enabled = false; label72.Enabled = false; } - else - { - myNumericUpDown21.Enabled = true; + else + { + myNumericUpDown21.Enabled = true; label72.Enabled = true; checkBox4.Checked = false; checkBox13.Checked = false; @@ -3373,9 +3471,9 @@ namespace Mip private void checkBox4_CheckedChanged(object sender, EventArgs e) { if (checkBox4.Checked == false) { myNumericUpDown23.Enabled = false; label73.Enabled = false; } - else - { - myNumericUpDown23.Enabled = true; + else + { + myNumericUpDown23.Enabled = true; label73.Enabled = true; checkBox2.Checked = false; checkBox13.Checked = false; @@ -3494,7 +3592,7 @@ namespace Mip myNumericUpDown27.Enabled = true; label78.Enabled = true; myNumericUpDown86.Enabled = true; - label381.Enabled = true; + label381.Enabled = true; } RefreshAll(); } @@ -3565,7 +3663,7 @@ namespace Mip myNumericUpDown33.Enabled = true; label87.Enabled = true; myNumericUpDown87.Enabled = true; - label403.Enabled = true; + label403.Enabled = true; } RefreshAll(); } @@ -3636,8 +3734,8 @@ namespace Mip label97.Enabled = true; myNumericUpDown39.Enabled = true; label96.Enabled = true; - myNumericUpDown98.Enabled = true; - label405.Enabled = true; + myNumericUpDown98.Enabled = true; + label405.Enabled = true; } RefreshAll(); } @@ -3765,7 +3863,7 @@ namespace Mip private void myNumericUpDown42_ValueChanged(object sender, EventArgs e) { RefreshAll(); - + } #endregion Panel Materiál @@ -3776,13 +3874,13 @@ namespace Mip decimal decRozmer2; decimal decRozmer3; - if (Convert.ToInt16(label6.Text) > 1) decRozmer3 = Math.Ceiling(Convert.ToDecimal(myNumericUpDown7.Value / (Convert.ToInt16(label6.Text) - 1))) * (myNumericUpDown20.Value + myNumericUpDown3.Value + myNumericUpDown5.Value); - else decRozmer3 = (myNumericUpDown7.Value * (myNumericUpDown20.Value + myNumericUpDown3.Value + myNumericUpDown5.Value)) + myNumericUpDown9.Value + ((myNumericUpDown7.Value - 1) * myNumericUpDown8.Value); + if (Convert.ToInt16(label6.Text) > 1) decRozmer3 = Math.Ceiling(Convert.ToDecimal(myNumericUpDown7.Value / (Convert.ToInt16(label6.Text) - 1))) * (myNumericUpDown20.Value + myNumericUpDown3.Value + myNumericUpDown5.Value); + else decRozmer3 = (myNumericUpDown7.Value * (myNumericUpDown20.Value + myNumericUpDown3.Value + myNumericUpDown5.Value)) + myNumericUpDown9.Value + ((myNumericUpDown7.Value - 1) * myNumericUpDown8.Value); - decRozmer1 = myNumericUpDown18.Value + myNumericUpDown1.Value + myNumericUpDown4.Value; + decRozmer1 = myNumericUpDown18.Value + myNumericUpDown1.Value + myNumericUpDown4.Value; - if (label27.Text == "Ø") decRozmer2 = myNumericUpDown19.Value - myNumericUpDown2.Value - myNumericUpDown6.Value; - else decRozmer2 = myNumericUpDown19.Value + myNumericUpDown2.Value + myNumericUpDown6.Value; + if (label27.Text == "Ø") decRozmer2 = myNumericUpDown19.Value - myNumericUpDown2.Value - myNumericUpDown6.Value; + else decRozmer2 = myNumericUpDown19.Value + myNumericUpDown2.Value + myNumericUpDown6.Value; // ulozi polotovar do tabpolotovar Form frmUlozPolotovar2 = new frmUlozPolotovar(pssRozmerTvar, decRozmer1.ToString(), decRozmer2.ToString(), decRozmer3.ToString(), myNumericUpDown7.Value.ToString(), IDV); @@ -3795,51 +3893,59 @@ namespace Mip if (objObjectSadzby.bEnableSQLUpdate == true) { - cmd = @"UPDATE `tab-nacenovanie-sadzby` + cmd = $@"UPDATE `tab-nacenovanie-sadzby` SET - `chB35` = " + checkBox35.Checked + "," + - "`myNuD68` = " + myNumericUpDown68.Value.ToString().Replace(",", ".") + "," + - "`myNuD67` = " + myNumericUpDown67.Value.ToString().Replace(",", ".") + "," + - "`myNuD66` = " + myNumericUpDown66.Value.ToString().Replace(",", ".") + "," + - "`myNuD65` = " + myNumericUpDown65.Value.ToString().Replace(",", ".") + "," + - "`myNuD64` = " + myNumericUpDown64.Value.ToString().Replace(",", ".") + "," + - "`myNuD63` = " + myNumericUpDown63.Value.ToString().Replace(",", ".") + "," + - "`myNuD62` = " + myNumericUpDown62.Value.ToString().Replace(",", ".") + "," + - "`myNuD61` = " + myNumericUpDown61.Value.ToString().Replace(",", ".") + "," + - "`myNuD60` = " + myNumericUpDown60.Value.ToString().Replace(",", ".") + "," + - "`myNuD59` = " + myNumericUpDown59.Value.ToString().Replace(",", ".") + "," + - "`myNuD58` = " + myNumericUpDown58.Value.ToString().Replace(",", ".") + "," + - "`myNuD57` = " + myNumericUpDown57.Value.ToString().Replace(",", ".") + "," + - "`myNuD70` = " + myNumericUpDown70.Value.ToString().Replace(",", ".") + "," + - "`myNuD126` = " + myNumericUpDown126.Value.ToString().Replace(",", ".") + - " WHERE `IDNacenovanie`= " + IDN.ToString() + ";"; + `chB35` = { checkBox35.Checked }, + `myNuD68` = { myNumericUpDown68.Value.ToString().Replace(",", ".") }, + `myNuD67` = { myNumericUpDown67.Value.ToString().Replace(",", ".") }, + `myNuD66` = { myNumericUpDown66.Value.ToString().Replace(",", ".") }, + `myNuD65` = { myNumericUpDown65.Value.ToString().Replace(",", ".") }, + `myNuD64` = { myNumericUpDown64.Value.ToString().Replace(",", ".") }, + `myNuD63` = { myNumericUpDown63.Value.ToString().Replace(",", ".") }, + `myNuD62` = { myNumericUpDown62.Value.ToString().Replace(",", ".") }, + `myNuD61` = { myNumericUpDown61.Value.ToString().Replace(",", ".") }, + `myNuD60` = { myNumericUpDown60.Value.ToString().Replace(",", ".") }, + `myNuD59` = { myNumericUpDown59.Value.ToString().Replace(",", ".") }, + `myNuD58` = { myNumericUpDown58.Value.ToString().Replace(",", ".") }, + `myNuD57` = { myNumericUpDown57.Value.ToString().Replace(",", ".") }, + `myNuD70` = { myNumericUpDown70.Value.ToString().Replace(",", ".") }, + `myNuD126` = { myNumericUpDown126.Value.ToString().Replace(",", ".") }, + `myNuD139` = { myNumericUpDown139.Value.ToString().Replace(",", ".") }, + `myNuD138` = { myNumericUpDown138.Value.ToString().Replace(",", ".") }, + `myNuD137` = { myNumericUpDown137.Value.ToString().Replace(",", ".") } + WHERE `IDNacenovanie`= { IDN.ToString() };"; classSQL.SQL(cmd); } else { - cmd = @"INSERT INTO `mip`.`tab-nacenovanie-sadzby` (`IDNacenovanie`, `chB35`, `myNuD68`, `myNuD67`, `myNuD66`, `myNuD65`, `myNuD64`, `myNuD63`, `myNuD62`, `myNuD61`, `myNuD60`, `myNuD59`, `myNuD58`, `myNuD57`, `myNuD70`, `myNuD126`) - VALUES (" - + IDN.ToString() + ", " - + checkBox35.Checked + ", " - + myNumericUpDown68.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown67.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown66.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown65.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown64.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown63.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown62.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown61.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown60.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown59.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown58.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown57.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown70.Value.ToString().Replace(",", ".") + ", " - + myNumericUpDown126.Value.ToString().Replace(",", ".") + ");"; + cmd = $@"INSERT INTO `mip`.`tab-nacenovanie-sadzby` ( + `IDNacenovanie`, `chB35`, `myNuD68`, `myNuD67`, `myNuD66`, `myNuD65`, `myNuD64`, `myNuD63`, `myNuD62`, + `myNuD61`, `myNuD60`, `myNuD59`, `myNuD58`, `myNuD57`, `myNuD70`, `myNuD126`, `myNuD139`, `myNuD138`, `myNuD137`) + VALUES ( + { IDN.ToString() }, + { checkBox35.Checked }, + { myNumericUpDown68.Value.ToString().Replace(",", ".") }, + { myNumericUpDown67.Value.ToString().Replace(",", ".") }, + { myNumericUpDown66.Value.ToString().Replace(",", ".") }, + { myNumericUpDown65.Value.ToString().Replace(",", ".") }, + { myNumericUpDown64.Value.ToString().Replace(",", ".") }, + { myNumericUpDown63.Value.ToString().Replace(",", ".") }, + { myNumericUpDown62.Value.ToString().Replace(",", ".") }, + { myNumericUpDown61.Value.ToString().Replace(",", ".") }, + { myNumericUpDown60.Value.ToString().Replace(",", ".") }, + { myNumericUpDown59.Value.ToString().Replace(",", ".") }, + { myNumericUpDown58.Value.ToString().Replace(",", ".") }, + { myNumericUpDown57.Value.ToString().Replace(",", ".") }, + { myNumericUpDown70.Value.ToString().Replace(",", ".") }, + { myNumericUpDown126.Value.ToString().Replace(",", ".") }, + { myNumericUpDown139.Value.ToString().Replace(",", ".") }, + { myNumericUpDown138.Value.ToString().Replace(",", ".") }, + { myNumericUpDown137.Value.ToString().Replace(",", ".") });"; classSQL.SQL(cmd); objObjectSadzby.bEnableSQLUpdate = true; } + objObjectSadzby.GetDataFromForm(this); RefreshAll(); - } private void button8_Click(object sender, EventArgs e) @@ -3858,6 +3964,9 @@ namespace Mip myNumericUpDown57.Value = myNumericUpDown56.Value; myNumericUpDown70.Value = myNumericUpDown69.Value; myNumericUpDown126.Value = myNumericUpDown127.Value; + myNumericUpDown139.Value = myNumericUpDown141.Value; + myNumericUpDown138.Value = myNumericUpDown140.Value; + myNumericUpDown137.Value = myNumericUpDown136.Value; } private void button10_Click(object sender, EventArgs e) @@ -3913,11 +4022,11 @@ namespace Mip cmd = "SELECT CONCAT(`Nazov`,' - ', `Hustota`, ' Kg/dm³') AS Nazov, `Hustota` FROM `tabmaterial` ORDER BY `Nazov` ASC;"; DataTable tblMaterialy = new DataTable(); classSQL.SQL(cmd, out tblMaterialy); - + comboBox1.DataSource = tblMaterialy; comboBox1.ValueMember = "Hustota"; comboBox1.DisplayMember = "Nazov"; - + comboBox3.DataSource = tblMaterialy; comboBox3.ValueMember = "Hustota"; comboBox3.DisplayMember = "Nazov"; @@ -4255,11 +4364,11 @@ namespace Mip panel80.BackColor = Color.Empty; } } - + private static Color progressiveColor(decimal _value, int _min, int _max, Color _color1, Color _color2) { - if (_value < _min) _value = _min+1; - if (_value > _max) _value = _max-1; + if (_value < _min) _value = _min + 1; + if (_value > _max) _value = _max - 1; int rDelta = _color2.R + Convert.ToInt32(_value * (_color1.R - _color2.R) / (_max - _min)); int gDelta = _color2.G + Convert.ToInt32(_value * (_color1.G - _color2.G) / (_max - _min)); @@ -4302,7 +4411,7 @@ namespace Mip { Point changePoint = new Point(e.Location.X - pointPosition.X, e.Location.Y - pointPosition.Y); panel105.AutoScrollPosition = new Point(-panel105.AutoScrollPosition.X - changePoint.X, -panel105.AutoScrollPosition.Y - changePoint.Y); - + } //label387.Focus(); } @@ -4323,7 +4432,7 @@ namespace Mip private void comboBox1_SelectedValueChanged(object sender, EventArgs e) { - + } private void myNumericUpDown75_ValueChanged(object sender, EventArgs e) @@ -4350,7 +4459,7 @@ namespace Mip { if (showVyhodnocovanie) { - //objObjectVyhodnocovanie.SaveToMariaDB(); + //objObjectVyhodnocovanie.SaveToMariaDB(); } else { @@ -4364,7 +4473,7 @@ namespace Mip string cmd; cmd = "UPDATE `mip`.`tab-nacenovanie` SET `Status` = 'Nacenená' WHERE `IDNacenovanie`= " + IDN.ToString() + ";"; classSQL.SQL(cmd); - + this.Close(); } } @@ -4399,7 +4508,7 @@ namespace Mip } panel110.Size = new Size(377, 22); } - + else { string strWhere = ""; @@ -4424,7 +4533,7 @@ namespace Mip dgvVyrobky.AllowUserToResizeRows = false; dgvVyrobky.AllowUserToAddRows = false; dgvVyrobky.AllowUserToResizeColumns = false; - + dgvVyrobky.BorderStyle = BorderStyle.FixedSingle; dgvVyrobky.Size = new Size(373, 395); @@ -4432,7 +4541,7 @@ namespace Mip panel110.Size = new Size(377, 400); } - + @@ -4476,7 +4585,7 @@ namespace Mip xlWorkSheet.Range["N14", "O14"].Value = objObjectMaterial.Material4IMP; //mat4 cena impregnacie xlWorkSheet.Range["P14", "Q14"].Value = objObjectMaterial.Material4MAT; //mat4 cena materialu //material1 - if(checkBox1.Checked == true) + if (checkBox1.Checked == true) { xlWorkSheet.Range["B19", "C20"].Value = Convert.ToDecimal(label313.Text); xlWorkSheet.Range["D19", "E20"].Value = Convert.ToDecimal(label312.Text); @@ -4502,7 +4611,7 @@ namespace Mip xlWorkSheet.Range["D49", "E50"].Value = Convert.ToDecimal(label411.Text); } //material2 - if(checkBox20.Checked == true) + if (checkBox20.Checked == true) { xlWorkSheet.Range["F19", "G20"].Value = Convert.ToDecimal(label337.Text); xlWorkSheet.Range["H19", "I20"].Value = Convert.ToDecimal(label336.Text); @@ -4528,7 +4637,7 @@ namespace Mip xlWorkSheet.Range["H49", "I50"].Value = Convert.ToDecimal(label412.Text); } //material3 - if(checkBox26.Checked == true) + if (checkBox26.Checked == true) { xlWorkSheet.Range["J19", "K20"].Value = Convert.ToDecimal(label386.Text); xlWorkSheet.Range["L19", "M20"].Value = Convert.ToDecimal(label385.Text); @@ -4554,7 +4663,7 @@ namespace Mip xlWorkSheet.Range["L49", "M50"].Value = Convert.ToDecimal(label413.Text); } //material4 - if(checkBox32.Checked == true) + if (checkBox32.Checked == true) { xlWorkSheet.Range["N19", "O20"].Value = Convert.ToDecimal(label410.Text); xlWorkSheet.Range["P19", "Q20"].Value = Convert.ToDecimal(label409.Text); @@ -4579,7 +4688,7 @@ namespace Mip xlWorkSheet.Range["N49", "O50"].Value = Convert.ToDecimal(label388.Text); xlWorkSheet.Range["P49", "Q50"].Value = Convert.ToDecimal(label414.Text); } - + xlWorkSheet.Range["B17", "E17"].Value = comboBox6.Text; xlWorkSheet.Range["F17", "I17"].Value = comboBox7.Text; xlWorkSheet.Range["J17", "M17"].Value = comboBox8.Text; @@ -4599,7 +4708,7 @@ namespace Mip } else { - + } } @@ -4761,7 +4870,7 @@ namespace Mip private void button3_Click(object sender, EventArgs e) { - if(status == "Prijatá") + if (status == "Prijatá") { string cmd; cmd = "UPDATE `mip`.`tab-nacenovanie` SET `Status` = 'Zrušená' WHERE `IDNacenovanie`= " + IDN.ToString() + ";"; @@ -4776,10 +4885,10 @@ namespace Mip private void trackBar1_ValueChanged(object sender, EventArgs e) { pictureBox1.SizeMode = PictureBoxSizeMode.Zoom; - + if (trackBar1.Value > zMin && trackBar1.Value < 10) z = trackBar1.Value; - + pictureBox1.Size = new Size(Convert.ToInt32(sizeW * z), Convert.ToInt32(sizeH * z)); label445.Text = trackBar1.Value.ToString(); @@ -4816,25 +4925,86 @@ namespace Mip { string cmd; - cmd = @"UPDATE `tab-nacenovanie-sadzby` + cmd = $@"UPDATE `tab-nacenovanie-sadzby` SET - `chB35` = " + checkBox35.Checked + "," + - "`myNuD68` = " + myNumericUpDown45.Value.ToString().Replace(",", ".") + "," + - "`myNuD67` = " + myNumericUpDown46.Value.ToString().Replace(",", ".") + "," + - "`myNuD66` = " + myNumericUpDown47.Value.ToString().Replace(",", ".") + "," + - "`myNuD65` = " + myNumericUpDown48.Value.ToString().Replace(",", ".") + "," + - "`myNuD64` = " + myNumericUpDown49.Value.ToString().Replace(",", ".") + "," + - "`myNuD63` = " + myNumericUpDown50.Value.ToString().Replace(",", ".") + "," + - "`myNuD62` = " + myNumericUpDown51.Value.ToString().Replace(",", ".") + "," + - "`myNuD61` = " + myNumericUpDown52.Value.ToString().Replace(",", ".") + "," + - "`myNuD60` = " + myNumericUpDown53.Value.ToString().Replace(",", ".") + "," + - "`myNuD59` = " + myNumericUpDown54.Value.ToString().Replace(",", ".") + "," + - "`myNuD58` = " + myNumericUpDown55.Value.ToString().Replace(",", ".") + "," + - "`myNuD57` = " + myNumericUpDown56.Value.ToString().Replace(",", ".") + "," + - "`myNuD70` = " + myNumericUpDown69.Value.ToString().Replace(",", ".") + "," + - "`myNuD126` = " + myNumericUpDown127.Value.ToString().Replace(",", ".") + - " WHERE `IDNacenovanie`= 0;"; + `chB35` = { checkBox35.Checked }, + `myNuD68` = { myNumericUpDown45.Value.ToString().Replace(",", ".") }, + `myNuD67` = { myNumericUpDown46.Value.ToString().Replace(",", ".") }, + `myNuD66` = { myNumericUpDown47.Value.ToString().Replace(",", ".") }, + `myNuD65` = { myNumericUpDown48.Value.ToString().Replace(",", ".") }, + `myNuD64` = { myNumericUpDown49.Value.ToString().Replace(",", ".") }, + `myNuD63` = { myNumericUpDown50.Value.ToString().Replace(",", ".") }, + `myNuD62` = { myNumericUpDown51.Value.ToString().Replace(",", ".") }, + `myNuD61` = { myNumericUpDown52.Value.ToString().Replace(",", ".") }, + `myNuD60` = { myNumericUpDown53.Value.ToString().Replace(",", ".") }, + `myNuD59` = { myNumericUpDown54.Value.ToString().Replace(",", ".") }, + `myNuD58` = { myNumericUpDown55.Value.ToString().Replace(",", ".") }, + `myNuD57` = { myNumericUpDown56.Value.ToString().Replace(",", ".") }, + `myNuD70` = { myNumericUpDown69.Value.ToString().Replace(",", ".") }, + `myNuD126` = { myNumericUpDown127.Value.ToString().Replace(",", ".") }, + `myNuD139` = { myNumericUpDown141.Value.ToString().Replace(",", ".") }, + `myNuD138` = { myNumericUpDown140.Value.ToString().Replace(",", ".") }, + `myNuD137` = { myNumericUpDown136.Value.ToString().Replace(",", ".") } + WHERE `IDNacenovanie`= 0;"; classSQL.SQL(cmd); } + + private void myNumericUpDown135_ValueChanged(object sender, EventArgs e) + { + RefreshAll(); + } + + private void myNumericUpDown132_ValueChanged(object sender, EventArgs e) + { + RefreshAll(); + } + + private void myNumericUpDown134_ValueChanged(object sender, EventArgs e) + { + RefreshAll(); + } + + private void myNumericUpDown131_ValueChanged(object sender, EventArgs e) + { + RefreshAll(); + } + + private void myNumericUpDown133_ValueChanged(object sender, EventArgs e) + { + RefreshAll(); + } + + private void myNumericUpDown130_ValueChanged(object sender, EventArgs e) + { + RefreshAll(); + } + + private void label573_TextChanged(object sender, EventArgs e) + { + Label lbl = sender as Label; + if (lbl.Text == "0,000") lbl.BackColor = Color.Empty; + else lbl.BackColor = Color.Goldenrod; + } + + private void label572_TextChanged(object sender, EventArgs e) + { + Label lbl = sender as Label; + if (lbl.Text == "0,000") lbl.BackColor = Color.Empty; + else lbl.BackColor = Color.Goldenrod; + } + + private void label571_TextChanged(object sender, EventArgs e) + { + Label lbl = sender as Label; + if (lbl.Text == "0,000") lbl.BackColor = Color.Empty; + else lbl.BackColor = Color.Goldenrod; + } + + private void label556_TextChanged(object sender, EventArgs e) + { + Label lbl = sender as Label; + if (lbl.Text == "0,000") lbl.BackColor = Color.Empty; + else lbl.BackColor = Color.Goldenrod; + } } }