From 211842b18223ddda5f0bef1a756266ce5b28ea0a Mon Sep 17 00:00:00 2001 From: "Culak-HP\\Culak" Date: Mon, 9 Nov 2020 21:16:51 +0100 Subject: [PATCH] Pridanie prepoctu objemu hranateho polotovaru s vypichom --- .vs/Mip_v1/v16/.suo | Bin 172544 -> 172544 bytes Mip/frmNacenovanie.Designer.cs | 34 ++++++++++++++++----------------- Mip/frmNacenovanie.cs | 6 +++--- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index eb29a678d2c08e439a83c719145fc57e9109e7bd..94ec7096fb8fa4035f6b564e8f830a1e8c8cde34 100644 GIT binary patch delta 5454 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 diff --git a/Mip/frmNacenovanie.Designer.cs b/Mip/frmNacenovanie.Designer.cs index 4e3c9ba..6cb3065 100644 --- a/Mip/frmNacenovanie.Designer.cs +++ b/Mip/frmNacenovanie.Designer.cs @@ -1182,7 +1182,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(1551, 130); + this.panel1.Size = new System.Drawing.Size(551, 130); this.panel1.TabIndex = 20; // // panel19 @@ -1443,7 +1443,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(1551, 0); + this.Výkres.Location = new System.Drawing.Point(551, 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"; @@ -1533,7 +1533,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(1474, 31); + this.button4.Location = new System.Drawing.Point(474, 31); this.button4.Margin = new System.Windows.Forms.Padding(1); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(75, 23); @@ -1590,7 +1590,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(1551, 56); + this.panel17.Size = new System.Drawing.Size(551, 56); this.panel17.TabIndex = 22; // // panel24 @@ -1601,7 +1601,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(1549, 31); + this.panel24.Size = new System.Drawing.Size(549, 31); this.panel24.TabIndex = 13; // // label14 @@ -1610,7 +1610,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(1000, 29); + this.label14.Size = new System.Drawing.Size(0, 29); this.label14.TabIndex = 1; this.label14.Text = "----"; // @@ -1641,7 +1641,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(1551, 735); + this.panel16.Size = new System.Drawing.Size(551, 735); this.panel16.TabIndex = 21; // // Polotovar @@ -1653,7 +1653,7 @@ 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(351, 0); + this.Polotovar.Location = new System.Drawing.Point(411, 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); @@ -2840,7 +2840,7 @@ 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(374, 0); + this.Materiál.Location = new System.Drawing.Point(434, 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); @@ -5222,12 +5222,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(397, 0); + this.Naceňovanie.Location = new System.Drawing.Point(457, 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(406, 728); + this.Naceňovanie.Size = new System.Drawing.Size(23, 728); this.Naceňovanie.TabIndex = 6; // // panel110 @@ -7045,12 +7045,12 @@ 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(803, 0); + this.Vyhodnocovanie.Location = new System.Drawing.Point(480, 0); this.Vyhodnocovanie.Margin = new System.Windows.Forms.Padding(1); this.Vyhodnocovanie.MaximumSize = new System.Drawing.Size(700, 728); this.Vyhodnocovanie.MinimumSize = new System.Drawing.Size(23, 728); this.Vyhodnocovanie.Name = "Vyhodnocovanie"; - this.Vyhodnocovanie.Size = new System.Drawing.Size(700, 728); + this.Vyhodnocovanie.Size = new System.Drawing.Size(23, 728); this.Vyhodnocovanie.TabIndex = 4; // // panel112 @@ -8662,7 +8662,7 @@ // // button22 // - this.button22.Location = new System.Drawing.Point(427, 18); + this.button22.Location = new System.Drawing.Point(383, 2); this.button22.Name = "button22"; this.button22.Size = new System.Drawing.Size(75, 23); this.button22.TabIndex = 3; @@ -8804,7 +8804,7 @@ 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(1503, 0); + this.Sadzby.Location = new System.Drawing.Point(503, 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); @@ -9481,7 +9481,7 @@ 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(1526, 0); + this.Počty.Location = new System.Drawing.Point(526, 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); @@ -11277,7 +11277,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1574, 921); + this.ClientSize = new System.Drawing.Size(574, 921); this.Controls.Add(this.panel16); this.Controls.Add(this.panel1); this.Controls.Add(this.panel17); diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index f786ff8..94ec2ed 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -654,7 +654,7 @@ namespace Mip } else { - decimal Objem = Convert.ToDecimal(l66) * Convert.ToDecimal(l65) * Convert.ToDecimal(l64) / Convert.ToDecimal(l6) / 1000000; + decimal Objem = (Convert.ToDecimal(l66) * Convert.ToDecimal(l65) * Convert.ToDecimal(l64) / Convert.ToDecimal(l6) / 1000000) - (decimal)dObjemVypichu; dObjemPouzMaterialu = Objem; } } @@ -781,9 +781,9 @@ namespace Mip 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(); - + if(ObjemPouzMaterialu()!= 0) decPomer = (double)ObjemVyrobku()/(double)ObjemPouzMaterialu(); - else decPomer =0; + else decPomer =0; form.label33.Text = "Využ. mat.: " + Math.Round(decPomer*100,4).ToString() + " %"; form.ResumeLayout(); }