diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 38b8686..b4d448f 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.10.19.1440")] -[assembly: AssemblyFileVersion("23.10.19.1440")] +[assembly: AssemblyVersion("23.10.26.2000")] +[assembly: AssemblyFileVersion("23.10.26.2000")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 4fb86a6..ea965f1 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -399,7 +399,7 @@ // 일반구매ToolStripMenuItem // this.일반구매ToolStripMenuItem.Name = "일반구매ToolStripMenuItem"; - this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.일반구매ToolStripMenuItem.Text = "일반 구매"; this.일반구매ToolStripMenuItem.Click += new System.EventHandler(this.일반구매ToolStripMenuItem_Click); // @@ -407,7 +407,7 @@ // this.cR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.cR구매ToolStripMenuItem.Name = "cR구매ToolStripMenuItem"; - this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.cR구매ToolStripMenuItem.Text = "CR 구매"; this.cR구매ToolStripMenuItem.Click += new System.EventHandler(this.cR구매ToolStripMenuItem_Click); // @@ -415,19 +415,19 @@ // this.sPR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Blue; this.sPR구매ToolStripMenuItem.Name = "sPR구매ToolStripMenuItem"; - this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.sPR구매ToolStripMenuItem.Text = "전자실 구매"; this.sPR구매ToolStripMenuItem.Click += new System.EventHandler(this.sPR구매ToolStripMenuItem_Click); // // toolStripMenuItem14 // this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem14.Size = new System.Drawing.Size(150, 6); // // 품목입고ToolStripMenuItem // this.품목입고ToolStripMenuItem.Name = "품목입고ToolStripMenuItem"; - this.품목입고ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.품목입고ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.품목입고ToolStripMenuItem.Text = "품목 입고"; this.품목입고ToolStripMenuItem.Click += new System.EventHandler(this.품목입고ToolStripMenuItem_Click); // @@ -447,7 +447,7 @@ // 목록ToolStripMenuItem // this.목록ToolStripMenuItem.Name = "목록ToolStripMenuItem"; - this.목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.목록ToolStripMenuItem.Size = new System.Drawing.Size(156, 24); this.목록ToolStripMenuItem.Text = "목록"; this.목록ToolStripMenuItem.Click += new System.EventHandler(this.목록ToolStripMenuItem_Click); // @@ -455,19 +455,19 @@ // this.담당자별현황ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.담당자별현황ToolStripMenuItem.Name = "담당자별현황ToolStripMenuItem"; - this.담당자별현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.담당자별현황ToolStripMenuItem.Size = new System.Drawing.Size(156, 24); this.담당자별현황ToolStripMenuItem.Text = "목록(챔피언)"; this.담당자별현황ToolStripMenuItem.Click += new System.EventHandler(this.담당자별현황ToolStripMenuItem_Click); // // toolStripMenuItem15 // this.toolStripMenuItem15.Name = "toolStripMenuItem15"; - this.toolStripMenuItem15.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem15.Size = new System.Drawing.Size(153, 6); // // layoutToolStripMenuItem // this.layoutToolStripMenuItem.Name = "layoutToolStripMenuItem"; - this.layoutToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.layoutToolStripMenuItem.Size = new System.Drawing.Size(156, 24); this.layoutToolStripMenuItem.Text = "Layout"; this.layoutToolStripMenuItem.Click += new System.EventHandler(this.layoutToolStripMenuItem_Click); // @@ -486,21 +486,21 @@ // 목록ToolStripMenuItem1 // this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; - this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24); + this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); this.목록ToolStripMenuItem1.Text = "목록"; this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click); // // 자동입력ToolStripMenuItem // this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem"; - this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.자동입력ToolStripMenuItem.Text = "자동입력"; this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click); // // 양식ToolStripMenuItem // this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem"; - this.양식ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.양식ToolStripMenuItem.Text = "양식"; this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click); // @@ -1118,7 +1118,7 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(1065, 594); + this.tabControl1.Size = new System.Drawing.Size(1062, 594); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); @@ -1135,9 +1135,9 @@ this.toolStripButton1, this.toolStripButton2, this.toolStripButton3}); - this.toolStrip1.Location = new System.Drawing.Point(1066, 28); + this.toolStrip1.Location = new System.Drawing.Point(1063, 28); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(29, 594); + this.toolStrip1.Size = new System.Drawing.Size(32, 594); this.toolStrip1.TabIndex = 35; this.toolStrip1.Text = "toolStrip1"; // @@ -1146,7 +1146,7 @@ this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem8.Text = "업무일지"; this.toolStripMenuItem8.ToolTipText = "업무일지"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); @@ -1156,7 +1156,7 @@ this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image"))); this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem7.Text = "구매신청"; this.toolStripMenuItem7.ToolTipText = "구매신청"; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); @@ -1166,7 +1166,7 @@ this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem6.Text = "프로젝트"; this.toolStripMenuItem6.ToolTipText = "프로젝트"; this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); @@ -1178,7 +1178,7 @@ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(26, 20); + this.toolStripButton1.Size = new System.Drawing.Size(29, 20); this.toolStripButton1.Text = "구매진행상황"; this.toolStripButton1.ToolTipText = "구매진행상황"; this.toolStripButton1.Visible = false; @@ -1190,7 +1190,7 @@ this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(26, 20); + this.toolStripButton2.Size = new System.Drawing.Size(29, 20); this.toolStripButton2.Text = "품목정보"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // @@ -1200,7 +1200,7 @@ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(26, 20); + this.toolStripButton3.Size = new System.Drawing.Size(29, 20); this.toolStripButton3.Text = "toolStripButton3"; this.toolStripButton3.ToolTipText = "휴가신청"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); diff --git a/Project/fMain.resx b/Project/fMain.resx index 3fa72b9..9407417 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -452,14 +452,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/UzMn/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e - /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf8PtLr8vV7o9blnWyHc + /U7m/E+5XP8/92TF/3lzYj/UzM7/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e + /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3tzr/vV7o9blnWyHc gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ - Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bBgd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP6DhfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQDKX6rQcfcHQwAAAABJRU5ErkJggg== + Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr + 2d+jAdUG1LhtIjtQcP79BfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQC8v6rH00jEYwAAAABJRU5ErkJggg== diff --git a/SubProject/FCOMMON/fSFI.Designer.cs b/SubProject/FCOMMON/fSFI.Designer.cs index ca97197..d585b88 100644 --- a/SubProject/FCOMMON/fSFI.Designer.cs +++ b/SubProject/FCOMMON/fSFI.Designer.cs @@ -32,8 +32,6 @@ namespace FCOMMON this.radO = new System.Windows.Forms.RadioButton(); this.radM = new System.Windows.Forms.RadioButton(); this.panel1 = new System.Windows.Forms.Panel(); - this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); - this.label16 = new System.Windows.Forms.Label(); this.nudSFIOffice = new System.Windows.Forms.NumericUpDown(); this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); this.nudOsavetime = new System.Windows.Forms.NumericUpDown(); @@ -42,8 +40,7 @@ namespace FCOMMON this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.label15 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.nudShiftCnt = new System.Windows.Forms.NumericUpDown(); this.label11 = new System.Windows.Forms.Label(); @@ -63,14 +60,13 @@ namespace FCOMMON this.button1 = new System.Windows.Forms.Button(); this.label14 = new System.Windows.Forms.Label(); this.nudCnt = new System.Windows.Forms.NumericUpDown(); - this.label17 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSFIOffice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudOsavetime)).BeginInit(); this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudShiftCnt)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMSaveCnt)).BeginInit(); @@ -101,17 +97,15 @@ namespace FCOMMON this.radM.Location = new System.Drawing.Point(21, 200); this.radM.Margin = new System.Windows.Forms.Padding(6, 10, 6, 10); this.radM.Name = "radM"; - this.radM.Size = new System.Drawing.Size(258, 41); + this.radM.Size = new System.Drawing.Size(155, 41); this.radM.TabIndex = 0; - this.radM.Text = "MFG 인원(단위:분)"; + this.radM.Text = "MFG 인원"; this.radM.UseVisualStyleBackColor = true; this.radM.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); // // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.panel1.Controls.Add(this.numericUpDown3); - this.panel1.Controls.Add(this.label16); this.panel1.Controls.Add(this.nudSFIOffice); this.panel1.Controls.Add(this.numericUpDown2); this.panel1.Controls.Add(this.nudOsavetime); @@ -124,30 +118,6 @@ namespace FCOMMON this.panel1.Size = new System.Drawing.Size(720, 115); this.panel1.TabIndex = 2; // - // numericUpDown3 - // - this.numericUpDown3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.numericUpDown3.Location = new System.Drawing.Point(515, 57); - this.numericUpDown3.Maximum = new decimal(new int[] { - 999999999, - 0, - 0, - 0}); - this.numericUpDown3.Name = "numericUpDown3"; - this.numericUpDown3.Size = new System.Drawing.Size(147, 43); - this.numericUpDown3.TabIndex = 18; - this.numericUpDown3.Tag = ""; - this.numericUpDown3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(400, 60); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(109, 37); - this.label16.TabIndex = 17; - this.label16.Text = "Indirect"; - // // nudSFIOffice // this.nudSFIOffice.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); @@ -246,9 +216,9 @@ namespace FCOMMON // panel2 // this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.panel2.Controls.Add(this.label19); + this.panel2.Controls.Add(this.label18); this.panel2.Controls.Add(this.label17); - this.panel2.Controls.Add(this.numericUpDown1); - this.panel2.Controls.Add(this.label15); this.panel2.Controls.Add(this.label12); this.panel2.Controls.Add(this.nudShiftCnt); this.panel2.Controls.Add(this.label11); @@ -271,34 +241,20 @@ namespace FCOMMON this.panel2.Size = new System.Drawing.Size(720, 223); this.panel2.TabIndex = 2; // - // numericUpDown1 + // label17 // - this.numericUpDown1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.numericUpDown1.Location = new System.Drawing.Point(515, 169); - this.numericUpDown1.Maximum = new decimal(new int[] { - 999999999, - 0, - 0, - 0}); - this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(147, 43); - this.numericUpDown1.TabIndex = 16; - this.numericUpDown1.Tag = ""; - this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(400, 172); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(109, 37); - this.label15.TabIndex = 15; - this.label15.Text = "Indirect"; + this.label17.AutoSize = true; + this.label17.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label17.Location = new System.Drawing.Point(399, 76); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(26, 21); + this.label17.TabIndex = 17; + this.label17.Text = "분"; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(588, 67); + this.label12.Location = new System.Drawing.Point(523, 68); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(73, 37); this.label12.TabIndex = 14; @@ -307,7 +263,7 @@ namespace FCOMMON // nudShiftCnt // this.nudShiftCnt.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.nudShiftCnt.Location = new System.Drawing.Point(520, 64); + this.nudShiftCnt.Location = new System.Drawing.Point(455, 65); this.nudShiftCnt.Maximum = new decimal(new int[] { 999999999, 0, @@ -328,7 +284,7 @@ namespace FCOMMON // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(487, 67); + this.label11.Location = new System.Drawing.Point(424, 68); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(30, 37); this.label11.TabIndex = 12; @@ -339,14 +295,14 @@ namespace FCOMMON this.numericUpDown9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.numericUpDown9.DecimalPlaces = 2; this.numericUpDown9.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.numericUpDown9.Location = new System.Drawing.Point(264, 65); + this.numericUpDown9.Location = new System.Drawing.Point(233, 65); this.numericUpDown9.Maximum = new decimal(new int[] { 999999999, 0, 0, 0}); this.numericUpDown9.Name = "numericUpDown9"; - this.numericUpDown9.Size = new System.Drawing.Size(165, 43); + this.numericUpDown9.Size = new System.Drawing.Size(161, 43); this.numericUpDown9.TabIndex = 11; this.numericUpDown9.Tag = "m"; this.numericUpDown9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -372,9 +328,10 @@ namespace FCOMMON // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(400, 14); + this.label10.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label10.Location = new System.Drawing.Point(424, 16); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(194, 37); + this.label10.Size = new System.Drawing.Size(170, 32); this.label10.TabIndex = 8; this.label10.Text = "x Shift 당 횟수"; // @@ -399,16 +356,17 @@ namespace FCOMMON // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(8, 67); + this.label13.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label13.Location = new System.Drawing.Point(9, 70); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(250, 37); + this.label13.Size = new System.Drawing.Size(220, 32); this.label13.TabIndex = 6; this.label13.Text = "1 Shift 당 개선절감"; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(6, 14); + this.label9.Location = new System.Drawing.Point(17, 14); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(212, 37); this.label9.TabIndex = 6; @@ -434,7 +392,7 @@ namespace FCOMMON // numericUpDown5 // this.numericUpDown5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.numericUpDown5.Location = new System.Drawing.Point(466, 120); + this.numericUpDown5.Location = new System.Drawing.Point(460, 120); this.numericUpDown5.Maximum = new decimal(new int[] { 999999999, 0, @@ -471,9 +429,10 @@ namespace FCOMMON // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(668, 123); + this.label5.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label5.Location = new System.Drawing.Point(659, 139); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(44, 37); + this.label5.Size = new System.Drawing.Size(26, 21); this.label5.TabIndex = 2; this.label5.Text = "분"; this.label5.Click += new System.EventHandler(this.label1_Click); @@ -481,7 +440,7 @@ namespace FCOMMON // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(122, 172); + this.label6.Location = new System.Drawing.Point(124, 172); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(105, 37); this.label6.TabIndex = 2; @@ -491,17 +450,18 @@ namespace FCOMMON // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(400, 123); + this.label7.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label7.Location = new System.Drawing.Point(399, 139); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(64, 37); + this.label7.Size = new System.Drawing.Size(26, 21); this.label7.TabIndex = 2; - this.label7.Text = "분 /"; + this.label7.Text = "분"; this.label7.Click += new System.EventHandler(this.label1_Click); // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(6, 123); + this.label8.Location = new System.Drawing.Point(8, 123); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(221, 37); this.label8.TabIndex = 2; @@ -548,14 +508,24 @@ namespace FCOMMON 0}); this.nudCnt.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); // - // label17 + // label18 // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(435, 70); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(44, 37); - this.label17.TabIndex = 17; - this.label17.Text = "분"; + this.label18.AutoSize = true; + this.label18.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label18.Location = new System.Drawing.Point(399, 28); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(26, 21); + this.label18.TabIndex = 18; + this.label18.Text = "분"; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(424, 125); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(28, 37); + this.label19.TabIndex = 19; + this.label19.Text = "/"; // // fSFI // @@ -577,13 +547,11 @@ namespace FCOMMON this.Load += new System.EventHandler(this.fSFI_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSFIOffice)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudOsavetime)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudShiftCnt)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMSaveCnt)).EndInit(); @@ -616,7 +584,6 @@ namespace FCOMMON private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; private System.Windows.Forms.NumericUpDown numericUpDown9; - private System.Windows.Forms.NumericUpDown nudShiftCnt; private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; @@ -628,10 +595,9 @@ namespace FCOMMON public System.Windows.Forms.NumericUpDown nudMsavetime; private System.Windows.Forms.Label label14; private System.Windows.Forms.NumericUpDown nudCnt; - private System.Windows.Forms.NumericUpDown numericUpDown1; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.NumericUpDown numericUpDown3; - private System.Windows.Forms.Label label16; private System.Windows.Forms.Label label17; + public System.Windows.Forms.NumericUpDown nudShiftCnt; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label label18; } } \ No newline at end of file diff --git a/SubProject/FCOMMON/fSFI.cs b/SubProject/FCOMMON/fSFI.cs index 2f0957b..8b08ece 100644 --- a/SubProject/FCOMMON/fSFI.cs +++ b/SubProject/FCOMMON/fSFI.cs @@ -13,7 +13,7 @@ namespace FCOMMON { public partial class fSFI : Form { - public fSFI(string sfi_type, float time, float cnt, double shiftcount, int itemcnt) + public fSFI(string sfi_type, double time, double cnt, double shiftcount, int itemcnt) { InitializeComponent(); if (sfi_type == "M") @@ -107,14 +107,14 @@ namespace FCOMMON { //offcie update var sfi = (double)nudSFIOffice.Value; - numericUpDown3.Value = (decimal)(sfi * 1.25); + //numericUpDown3.Value = (decimal)(sfi * 1.25); } private void numericUpDown4_ValueChanged(object sender, EventArgs e) { //mfg update var sfi = (double)nudSFIMFG.Value; - numericUpDown1.Value = (decimal)(sfi * 1.25); + //numericUpDown1.Value = (decimal)(sfi * 1.25); } } } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs index ac05f18..78ba7a8 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs @@ -101,6 +101,7 @@ namespace FEQ0000 e.Row["pumamt"] = 0; e.Row["request"] = FCOMMON.info.Login.nameK; e.Row["receive"] = "";// FCOMMON.info.Login.nameK; + e.Row["place"] = "전자실"; } private void __Load(object sender, EventArgs e) @@ -430,6 +431,8 @@ namespace FEQ0000 else newdr.request = FCOMMON.info.Login.no; + newdr.place = "전자실"; + var t1 = DBM.getCodeList("65"); var t2 = DBM.getCodeList("66"); if (t1.Count == 1) @@ -447,6 +450,7 @@ namespace FEQ0000 repeat = f.repeatAdd; + if (dlg == System.Windows.Forms.DialogResult.OK) { //존재하지 않는 sid 는 추가를 해준다. diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs index 0a86db7..a3c7dc5 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs @@ -593,12 +593,14 @@ this.tbStorage.ImeMode = System.Windows.Forms.ImeMode.Alpha; this.tbStorage.Items.AddRange(new object[] { "NR", - "SPR"}); + "SPR", + "전자실"}); this.tbStorage.Location = new System.Drawing.Point(345, 233); this.tbStorage.Margin = new System.Windows.Forms.Padding(4); this.tbStorage.Name = "tbStorage"; this.tbStorage.Size = new System.Drawing.Size(129, 28); this.tbStorage.TabIndex = 52; + this.tbStorage.SelectedIndexChanged += new System.EventHandler(this.tbStorage_SelectedIndexChanged); // // cmbRemark // diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs index 4bb032c..78cc40c 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs @@ -166,6 +166,8 @@ namespace FEQ0000 dtInDate.Value = DateTime.Parse(dr.indate); } + + //if (dr.IsedateNull() || dr.edate.isEmpty()) //{ // this.chkExp.Checked = false; @@ -230,7 +232,7 @@ namespace FEQ0000 tbSupplyIndex.Text = dr.supplyidx.ToString(); cmbState.Text = dr.state; - + tbStorage.Text = dr.place; tbSC.Text = dr.sc; tbPO.Text = dr.po; @@ -831,6 +833,9 @@ namespace FEQ0000 else tbPumPrice.Text = "0"; } - + private void tbStorage_SelectedIndexChanged(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index e92b70b..4f06724 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -286,6 +286,12 @@ fProjectConnect.cs + + Form + + + rJobReportType.cs + Form @@ -658,6 +664,10 @@ fProjectConnect.cs + + + rJobReportType.cs + rJobReportPrjSche.cs diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index 089db06..3e72f4f 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -78,6 +78,7 @@ this.toolStripButton11 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton12 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton13 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton14 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.개인별프로젝트스케쥴현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -357,6 +358,7 @@ this.toolStripButton11, this.toolStripButton12, this.toolStripButton13, + this.toolStripButton5, this.toolStripButton14, this.toolStripButton1, this.개인별프로젝트스케쥴현황ToolStripMenuItem}); @@ -407,6 +409,16 @@ this.toolStripButton13.Text = "일/개인별 요약"; this.toolStripButton13.Click += new System.EventHandler(this.toolStripButton13_Click); // + // toolStripButton5 + // + this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(144, 20); + this.toolStripButton5.Text = "업무형태별 집계/비율"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click_1); + // // toolStripButton14 // this.toolStripButton14.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -459,7 +471,7 @@ this.편집ToolStripMenuItem, this.삭제ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(226, 274); + this.cm.Size = new System.Drawing.Size(224, 274); // // columnSizeToolStripMenuItem // @@ -469,14 +481,14 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(223, 36); this.columnSizeToolStripMenuItem.Text = "Column Size"; // // autoToolStripMenuItem // this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image"))); this.autoToolStripMenuItem.Name = "autoToolStripMenuItem"; - this.autoToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.autoToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.autoToolStripMenuItem.Text = "Auto"; this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click); // @@ -484,7 +496,7 @@ // this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image"))); this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.resetToolStripMenuItem.Text = "Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // @@ -492,7 +504,7 @@ // this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -500,64 +512,64 @@ // this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.loadToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.loadToolStripMenuItem.Text = "Load"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); // // exportListToolStripMenuItem // this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; - this.exportListToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.exportListToolStripMenuItem.Size = new System.Drawing.Size(223, 36); this.exportListToolStripMenuItem.Text = "Export List"; this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(222, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(220, 6); // // refreshToolStripMenuItem // this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem"; - this.refreshToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.refreshToolStripMenuItem.Size = new System.Drawing.Size(223, 36); this.refreshToolStripMenuItem.Text = "Refresh"; this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(222, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(220, 6); // // partListToolStripMenuItem // this.partListToolStripMenuItem.Name = "partListToolStripMenuItem"; - this.partListToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.partListToolStripMenuItem.Size = new System.Drawing.Size(223, 36); this.partListToolStripMenuItem.Text = "PartList"; this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(222, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(220, 6); // // 복사ToolStripMenuItem // this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem"; - this.복사ToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.복사ToolStripMenuItem.Size = new System.Drawing.Size(223, 36); this.복사ToolStripMenuItem.Text = "복사"; this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click); // // 편집ToolStripMenuItem // this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem"; - this.편집ToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.편집ToolStripMenuItem.Size = new System.Drawing.Size(223, 36); this.편집ToolStripMenuItem.Text = "편집"; this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click); // // 삭제ToolStripMenuItem // this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(225, 36); + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(223, 36); this.삭제ToolStripMenuItem.Text = "삭제"; this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); // @@ -567,6 +579,7 @@ this.tam.EETGW_JobReport_AutoInputTableAdapter = null; this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_Project_LayoutTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; @@ -581,6 +594,7 @@ this.tam.ProjectsTableAdapter = null; this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.vEETGW_Project_LayoutListTableAdapter = null; // // ta // @@ -721,7 +735,7 @@ dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType1.TimeDefault = new System.DateTime(2023, 6, 21, 22, 53, 4, 0); + dateTimeCellType1.TimeDefault = new System.DateTime(2023, 10, 24, 22, 53, 4, 0); this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -732,7 +746,7 @@ dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType2.TimeDefault = new System.DateTime(2023, 6, 21, 22, 53, 4, 0); + dateTimeCellType2.TimeDefault = new System.DateTime(2023, 10, 24, 22, 53, 4, 0); this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -928,7 +942,7 @@ // 태그자료만조회ToolStripMenuItem // this.태그자료만조회ToolStripMenuItem.Name = "태그자료만조회ToolStripMenuItem"; - this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.태그자료만조회ToolStripMenuItem.Text = "태그자료만 조회"; this.태그자료만조회ToolStripMenuItem.Click += new System.EventHandler(this.태그자료만조회ToolStripMenuItem_Click); // @@ -1088,5 +1102,6 @@ private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripMenuItem 개인별프로젝트스케쥴현황ToolStripMenuItem; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton toolStripButton5; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index f36a018..f198ab7 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -842,5 +842,11 @@ namespace FPJ0000 var f = new JobReport_.rJobReportPrjSche(); f.Show(); } + + private void toolStripButton5_Click_1(object sender, EventArgs e) + { + var f = new JobReport_.rJobReportType(); + f.Show(); + } } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index 87b499f..827f239 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -141,7 +141,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -150,7 +150,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -159,7 +159,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -170,7 +170,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wQAADsEBuJFr7QAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -193,7 +193,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + wQAADsEBuJFr7QAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -243,20 +243,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSamFRL0pTmxrY - zVTMdDqnaGqiC4NsMY3MS2iiQoUoRS8qtItObWpuc7rhtMz7bd4FL0vd5RzdOfPbc86WGgj94MPz4jnf - D+f3PUfATcBDdeyVQr0qtEj/O1Cup8hJ8xRzp4EOLeyig5/pBs7LtKXHwt4f4EN7J+hJh3bZQq8ODI+z - ZtsmzNZdVi0cNIYXLcj5MovIohG7KFV50B11TUi+bnlwdJLtmnbAMMPAMMtAP81AN7UF9fgmmoZs2GSA - +hEKOZ9mEP9igPpHEihvojbsW+iZY9E7x5CTQTcv2YJmYhPfhuxE4ETPIgvDggN5yln4PWh7x4cjin1N - t+Rh29KKG4gvv4ny5hrk1hbDT+4FX4Io7xwCFD4oqS/hV7HSDJbW7AgQaxheEF7o97GtvwENY69Rrs/i - JTFlwch6G420mkhIKq8irjIO9X1LaBiw4uuvDayTngIVHTQvEJWKDvrI01n9aDve9CtQoE7lJbEVISR8 - DUkvE6GdsPGrtI5RUJEe1mwOBOZ2ugTcBOVr6IwqMYwTOlQa7uNpSyYiii8htiwMxmk7jKRYrmDtpKsT - MxEEKPYILjySO85kH0V0qQg9k13Ia0+GQpmByOf+qFF/xs95BkZSbNeUA52EZYsDfo/dglMyD6lQdgRp - 1VG4XRGEqJLLvCRDGQ1ZbSJ5E39w9z2zLLq5T0ywkCK903UugVB2aF4oO0we8oAwywPXC/yR8koM7ZAK - eapsJH8QQ1IRDiMRGMi/oScC2uEkAvXuChfTO+jFdRp98yyPZnQB96qSkECC0spIZFbf3bnjsG+xRFC3 - K+Bsc+Zdwf+wcSsk7hGczfhu1/SObO/38H6Mm6adJ2Lqre44KTKpxTSzYbdofow5TSsUTMsUJtysWB08 - XPNWmsXw+JSToqh1zzuNg+64QHA6qTnFW9LUclKqMntL6+gdElx4/UVSR3tKGteOxzW2eomV8QKBQPAH - StmfpCX1GtcAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSSqmoF6WpTQ3s + Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc05pxtukTkv0znvgpel7nKO7pz57TlnSw2EfvDhefGc + 74fz+54j4Cb4oTLhSqlGEVGm+R0i1VDkpHnKuVNLR5T202HP1IbzElXlscj3B/jQ3gl90qtattKrhmEj + a7FvwmLbZdXKQWN00YqCL7OIKRtzCDPlBz1R94QXq5cNoxNs/7QT2hkG2lkGmmkG6qktKCc20TZixyYD + NI9RKPg0g+QXBuofSYi0jdpwbEE/x+LHHENOBgO8ZAs9pk18G3EQgQv6RRbaBSeK5LMIfND1jg9HlweY + b0kjt8U1N5BcfRPV7Q0obCxHoNQHAQRh0TkEy06jormCX8VGM1hacyA4vofhBVGlgR+7hlrQMv4a1Zo8 + XhJfFYa8t3HIaoiBqPYqkmqT0Dy4hBaDDV9/bWCd9BQi66V5gbBSeNBfms1qjN14MyRDiTKTlyTUhJPw + NaS9TIXKZOdX6RynoCA9rNmdCCnscwu4CS3uoXPqEqEzqVGrvY+nHbmILr+EhKpI6KYd0JFiuYJVk+5O + LEQQLNsjuPBI6jyTfxRxlULoJ/tR1J0OmTwHMc+D0KD8jJ/zDHSk2P4pJ/oIy1YnAh97BKckXmI/yRFk + 1cfidk0oYisu85IceRwkjankTYLA3etnWQxwn5hgJUX6ZqvdAj/JoXk/yWHykBf88rxwvSQIGa8SoRpR + oEiRj/QPiRDVREFHBFryb2iIgHa6iEC5u8LF7F56cZ3G4DzL02NcwL26NKSQoLg2Brn1d3fuOBxbLBE0 + 7Qo425xlV/A/7NwKqXsEZ3O+O7p1I9v7PbwfRpPZdSK+2eaJkyLTOswzGw5rt37MZV6hYF6mYPKwYnPy + cM3baBbDxkkXRVHr3ndahz1xgcA/rT3DV9TWcVKssPiKm+gdUtz4/EXURHuLWteOJ7V2+iTKkwUCgeAP + E1qff5A1Ne4AAAAASUVORK5CYII= @@ -290,6 +290,17 @@ hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 + qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO + b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY + hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 + 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon + GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== @@ -439,7 +450,7 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18 8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5 - c+a7mZRkkklGQu5saSus3RyK3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24 + c+a7mZRkkklGQu5saSus3RyM3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24 VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS /dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18 @@ -451,7 +462,7 @@ 3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs 613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH - UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AKb0PpQCSEV4AAAAAElFTkSuQmCC + UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AHvBPpKbf2MsAAAAAElFTkSuQmCC diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs index 609e01c..0ebf15b 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs @@ -43,8 +43,8 @@ System.Windows.Forms.Label label8; System.Windows.Forms.Label label9; System.Windows.Forms.Label label10; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport_Add)); System.Windows.Forms.Label label11; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport_Add)); this.lbSummary = new System.Windows.Forms.Label(); this.tbHrs = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -107,7 +107,7 @@ // hrsLabel // hrsLabel.AutoSize = true; - hrsLabel.Location = new System.Drawing.Point(15, 120); + hrsLabel.Location = new System.Drawing.Point(19, 124); hrsLabel.Name = "hrsLabel"; hrsLabel.Size = new System.Drawing.Size(53, 12); hrsLabel.TabIndex = 19; @@ -116,25 +116,27 @@ // typeLabel // typeLabel.AutoSize = true; - typeLabel.Location = new System.Drawing.Point(374, 38); + typeLabel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + typeLabel.Location = new System.Drawing.Point(374, 35); typeLabel.Name = "typeLabel"; - typeLabel.Size = new System.Drawing.Size(53, 12); + typeLabel.Size = new System.Drawing.Size(74, 21); typeLabel.TabIndex = 11; typeLabel.Text = "업무형태"; // // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(14, 39); + label1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + label1.Location = new System.Drawing.Point(-2, 35); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(53, 12); + label1.Size = new System.Drawing.Size(74, 21); label1.TabIndex = 7; label1.Text = "요청부서"; // // projectLabel // projectLabel.AutoSize = true; - projectLabel.Location = new System.Drawing.Point(16, 63); + projectLabel.Location = new System.Drawing.Point(19, 70); projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); projectLabel.Name = "projectLabel"; projectLabel.Size = new System.Drawing.Size(53, 12); @@ -144,7 +146,7 @@ // label4 // label4.AutoSize = true; - label4.Location = new System.Drawing.Point(531, 12); + label4.Location = new System.Drawing.Point(578, 10); label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label4.Name = "label4"; label4.Size = new System.Drawing.Size(41, 12); @@ -154,7 +156,7 @@ // stateLabel // stateLabel.AutoSize = true; - stateLabel.Location = new System.Drawing.Point(320, 12); + stateLabel.Location = new System.Drawing.Point(320, 10); stateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); stateLabel.Name = "stateLabel"; stateLabel.Size = new System.Drawing.Size(29, 12); @@ -164,7 +166,7 @@ // label5 // label5.AutoSize = true; - label5.Location = new System.Drawing.Point(27, 12); + label5.Location = new System.Drawing.Point(31, 10); label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label5.Name = "label5"; label5.Size = new System.Drawing.Size(41, 12); @@ -174,25 +176,27 @@ // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(188, 38); + label3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + label3.Location = new System.Drawing.Point(186, 35); label3.Name = "label3"; - label3.Size = new System.Drawing.Size(41, 12); + label3.Size = new System.Drawing.Size(58, 21); label3.TabIndex = 9; label3.Text = "패키지"; // // label6 // label6.AutoSize = true; - label6.Location = new System.Drawing.Point(582, 38); + label6.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + label6.Location = new System.Drawing.Point(683, 35); label6.Name = "label6"; - label6.Size = new System.Drawing.Size(53, 12); + label6.Size = new System.Drawing.Size(42, 21); label6.TabIndex = 13; - label6.Text = "업무분류"; + label6.Text = "분류"; // // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(155, 120); + label2.Location = new System.Drawing.Point(155, 124); label2.Name = "label2"; label2.Size = new System.Drawing.Size(53, 12); label2.TabIndex = 21; @@ -235,11 +239,21 @@ label10.TabIndex = 24; label10.Text = "기술분류"; // + // label11 + // + label11.AutoSize = true; + label11.ForeColor = System.Drawing.Color.DimGray; + label11.Location = new System.Drawing.Point(19, 82); + label11.Name = "label11"; + label11.Size = new System.Drawing.Size(147, 12); + label11.TabIndex = 25; + label11.Text = "* 비용은 자동 계산 됩니다"; + // // lbSummary // this.lbSummary.AutoSize = true; this.lbSummary.ForeColor = System.Drawing.Color.SlateGray; - this.lbSummary.Location = new System.Drawing.Point(70, 157); + this.lbSummary.Location = new System.Drawing.Point(70, 159); this.lbSummary.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbSummary.Name = "lbSummary"; this.lbSummary.Size = new System.Drawing.Size(339, 12); @@ -250,7 +264,7 @@ // this.tbHrs.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hrs", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2")); this.tbHrs.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbHrs.Location = new System.Drawing.Point(72, 110); + this.tbHrs.Location = new System.Drawing.Point(72, 111); this.tbHrs.Name = "tbHrs"; this.tbHrs.Size = new System.Drawing.Size(77, 39); this.tbHrs.TabIndex = 20; @@ -314,10 +328,11 @@ // cmbType // this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbType.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbType.FormattingEnabled = true; - this.cmbType.Location = new System.Drawing.Point(431, 34); + this.cmbType.Location = new System.Drawing.Point(454, 31); this.cmbType.Name = "cmbType"; - this.cmbType.Size = new System.Drawing.Size(142, 20); + this.cmbType.Size = new System.Drawing.Size(223, 29); this.cmbType.TabIndex = 12; this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged); // @@ -325,9 +340,9 @@ // this.btSave.BackColor = System.Drawing.Color.SkyBlue; this.btSave.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btSave.Location = new System.Drawing.Point(829, 6); + this.btSave.Location = new System.Drawing.Point(867, 6); this.btSave.Name = "btSave"; - this.btSave.Size = new System.Drawing.Size(151, 163); + this.btSave.Size = new System.Drawing.Size(113, 191); this.btSave.TabIndex = 28; this.btSave.Text = "확인"; this.btSave.UseVisualStyleBackColor = false; @@ -335,7 +350,7 @@ // // dtPdate // - this.dtPdate.Location = new System.Drawing.Point(73, 8); + this.dtPdate.Location = new System.Drawing.Point(73, 6); this.dtPdate.Margin = new System.Windows.Forms.Padding(4); this.dtPdate.Name = "dtPdate"; this.dtPdate.Size = new System.Drawing.Size(178, 21); @@ -349,7 +364,7 @@ this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbUser.FormattingEnabled = true; this.cmbUser.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.cmbUser.Location = new System.Drawing.Point(588, 8); + this.cmbUser.Location = new System.Drawing.Point(627, 6); this.cmbUser.Margin = new System.Windows.Forms.Padding(4); this.cmbUser.Name = "cmbUser"; this.cmbUser.Size = new System.Drawing.Size(234, 20); @@ -361,7 +376,7 @@ this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true)); this.tbOt.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbOt.ForeColor = System.Drawing.Color.Red; - this.tbOt.Location = new System.Drawing.Point(213, 110); + this.tbOt.Location = new System.Drawing.Point(213, 111); this.tbOt.Name = "tbOt"; this.tbOt.Size = new System.Drawing.Size(77, 39); this.tbOt.TabIndex = 22; @@ -371,7 +386,7 @@ // // tbWW // - this.tbWW.Location = new System.Drawing.Point(253, 8); + this.tbWW.Location = new System.Drawing.Point(253, 6); this.tbWW.Margin = new System.Windows.Forms.Padding(4); this.tbWW.Name = "tbWW"; this.tbWW.ReadOnly = true; @@ -382,40 +397,42 @@ // // cmbProcess // - this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbProcess.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbProcess.FormattingEnabled = true; - this.cmbProcess.Location = new System.Drawing.Point(641, 34); + this.cmbProcess.Location = new System.Drawing.Point(731, 31); this.cmbProcess.Name = "cmbProcess"; - this.cmbProcess.Size = new System.Drawing.Size(181, 20); + this.cmbProcess.Size = new System.Drawing.Size(130, 29); this.cmbProcess.TabIndex = 14; // // cmbState // this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.cmbState.FormattingEnabled = true; - this.cmbState.Location = new System.Drawing.Point(353, 8); + this.cmbState.Location = new System.Drawing.Point(353, 6); this.cmbState.Margin = new System.Windows.Forms.Padding(4); this.cmbState.Name = "cmbState"; - this.cmbState.Size = new System.Drawing.Size(160, 20); + this.cmbState.Size = new System.Drawing.Size(217, 20); this.cmbState.TabIndex = 4; this.cmbState.SelectedIndexChanged += new System.EventHandler(this.chkform_indexchan); // // cmbPackage // this.cmbPackage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbPackage.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbPackage.FormattingEnabled = true; - this.cmbPackage.Location = new System.Drawing.Point(235, 34); + this.cmbPackage.Location = new System.Drawing.Point(239, 31); this.cmbPackage.Name = "cmbPackage"; - this.cmbPackage.Size = new System.Drawing.Size(131, 20); + this.cmbPackage.Size = new System.Drawing.Size(131, 29); this.cmbPackage.TabIndex = 10; // // cmbRequest // this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbRequest.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbRequest.FormattingEnabled = true; - this.cmbRequest.Location = new System.Drawing.Point(72, 35); + this.cmbRequest.Location = new System.Drawing.Point(72, 31); this.cmbRequest.Name = "cmbRequest"; - this.cmbRequest.Size = new System.Drawing.Size(108, 20); + this.cmbRequest.Size = new System.Drawing.Size(108, 29); this.cmbRequest.TabIndex = 8; // // chkAutoAdd @@ -435,9 +452,9 @@ this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.tbProject.Font = new System.Drawing.Font("굴림", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbProject.FormattingEnabled = true; - this.tbProject.Location = new System.Drawing.Point(73, 58); + this.tbProject.Location = new System.Drawing.Point(73, 65); this.tbProject.Name = "tbProject"; - this.tbProject.Size = new System.Drawing.Size(679, 23); + this.tbProject.Size = new System.Drawing.Size(714, 23); this.tbProject.TabIndex = 16; // // richTextBoxEx1 @@ -513,7 +530,7 @@ // // tbProjectIndex // - this.tbProjectIndex.Location = new System.Drawing.Point(754, 58); + this.tbProjectIndex.Location = new System.Drawing.Point(793, 65); this.tbProjectIndex.Name = "tbProjectIndex"; this.tbProjectIndex.Size = new System.Drawing.Size(68, 23); this.tbProjectIndex.TabIndex = 25; @@ -530,9 +547,9 @@ this.grpkisul.Controls.Add(label9); this.grpkisul.Controls.Add(this.cmb_kisullv); this.grpkisul.Controls.Add(label8); - this.grpkisul.Location = new System.Drawing.Point(615, 87); + this.grpkisul.Location = new System.Drawing.Point(661, 92); this.grpkisul.Name = "grpkisul"; - this.grpkisul.Size = new System.Drawing.Size(207, 110); + this.grpkisul.Size = new System.Drawing.Size(200, 105); this.grpkisul.TabIndex = 29; this.grpkisul.TabStop = false; this.grpkisul.Text = "기술료"; @@ -592,7 +609,7 @@ // this.lbTitleTip.AutoSize = true; this.lbTitleTip.ForeColor = System.Drawing.Color.SlateGray; - this.lbTitleTip.Location = new System.Drawing.Point(72, 87); + this.lbTitleTip.Location = new System.Drawing.Point(72, 94); this.lbTitleTip.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbTitleTip.Name = "lbTitleTip"; this.lbTitleTip.Size = new System.Drawing.Size(339, 12); @@ -618,6 +635,7 @@ this.tam.EETGW_JobReport_AutoInputTableAdapter = null; this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_Project_LayoutTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; @@ -632,16 +650,7 @@ this.tam.ProjectsTableAdapter = null; this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // - // label11 - // - label11.AutoSize = true; - label11.ForeColor = System.Drawing.Color.DimGray; - label11.Location = new System.Drawing.Point(19, 82); - label11.Name = "label11"; - label11.Size = new System.Drawing.Size(147, 12); - label11.TabIndex = 25; - label11.Text = "* 비용은 자동 계산 됩니다"; + this.tam.vEETGW_Project_LayoutListTableAdapter = null; // // fJobReport_Add // diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index e12a37b..e95a962 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -252,6 +252,13 @@ namespace FPJ0000.JobReport_ } } + //231026 + if(cmbProcess.Text.isEmpty()) + { + if (cmbProcess.Items.Count == 1) + cmbProcess.SelectedIndex = 0; + } + this.Show(); Application.DoEvents(); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx index 2c44efa..feefda7 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx @@ -159,6 +159,9 @@ False + + False + 100, 17 @@ -184,9 +187,6 @@ 416, 17 - - False - 164, 17 diff --git a/SubProject/FPJ0000/JobReport_/rJobChart.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobChart.Designer.cs index 2dd8abf..18292bd 100644 --- a/SubProject/FPJ0000/JobReport_/rJobChart.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobChart.Designer.cs @@ -30,14 +30,24 @@ { this.components = new System.ComponentModel.Container(); Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource(); - this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer(); - this.dsPRJ = new FPJ0000.dsPRJ(); this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsPRJ = new FPJ0000.dsPRJ(); + this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer(); this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); - ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); this.SuspendLayout(); // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsPRJ; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // reportViewer1 // this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -47,19 +57,10 @@ this.reportViewer1.LocalReport.ReportEmbeddedResource = "FPJ0000.JobReport.rJobChart.rdlc"; this.reportViewer1.Location = new System.Drawing.Point(0, 0); this.reportViewer1.Name = "reportViewer1"; - this.reportViewer1.Size = new System.Drawing.Size(721, 586); + this.reportViewer1.ServerReport.BearerToken = null; + this.reportViewer1.Size = new System.Drawing.Size(989, 629); this.reportViewer1.TabIndex = 0; // - // dsPRJ - // - this.dsPRJ.DataSetName = "dsPRJ"; - this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bs - // - this.bs.DataMember = "JobReport"; - this.bs.DataSource = this.dsPRJ; - // // ta // this.ta.ClearBeforeFill = true; @@ -68,13 +69,13 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(721, 586); + this.ClientSize = new System.Drawing.Size(989, 629); this.Controls.Add(this.reportViewer1); this.Name = "rJobChart"; this.Text = "작업 분포"; this.Load += new System.EventHandler(this.rJobReport_Load); - ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); this.ResumeLayout(false); } diff --git a/SubProject/FPJ0000/JobReport_/rJobReportType.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportType.Designer.cs new file mode 100644 index 0000000..891b77b --- /dev/null +++ b/SubProject/FPJ0000/JobReport_/rJobReportType.Designer.cs @@ -0,0 +1,370 @@ +namespace FPJ0000.JobReport_ +{ + partial class rJobReportType + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsReport = new FPJ0000.dsReport(); + this.panel1 = new System.Windows.Forms.Panel(); + this.linkLabel13 = new System.Windows.Forms.LinkLabel(); + this.linkLabel14 = new System.Windows.Forms.LinkLabel(); + this.linkLabel9 = new System.Windows.Forms.LinkLabel(); + this.linkLabel10 = new System.Windows.Forms.LinkLabel(); + this.linkLabel11 = new System.Windows.Forms.LinkLabel(); + this.linkLabel12 = new System.Windows.Forms.LinkLabel(); + this.linkLabel5 = new System.Windows.Forms.LinkLabel(); + this.linkLabel6 = new System.Windows.Forms.LinkLabel(); + this.linkLabel7 = new System.Windows.Forms.LinkLabel(); + this.linkLabel8 = new System.Windows.Forms.LinkLabel(); + this.linkLabel3 = new System.Windows.Forms.LinkLabel(); + this.linkLabel4 = new System.Windows.Forms.LinkLabel(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.label3 = new System.Windows.Forms.Label(); + this.dte = new System.Windows.Forms.DateTimePicker(); + this.label2 = new System.Windows.Forms.Label(); + this.dts = new System.Windows.Forms.DateTimePicker(); + this.btRefresh = new System.Windows.Forms.Button(); + this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // bs + // + this.bs.DataMember = "vJobReportForUser"; + this.bs.DataSource = this.dsReport; + // + // dsReport + // + this.dsReport.DataSetName = "dsReport"; + this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.linkLabel13); + this.panel1.Controls.Add(this.linkLabel14); + this.panel1.Controls.Add(this.linkLabel9); + this.panel1.Controls.Add(this.linkLabel10); + this.panel1.Controls.Add(this.linkLabel11); + this.panel1.Controls.Add(this.linkLabel12); + this.panel1.Controls.Add(this.linkLabel5); + this.panel1.Controls.Add(this.linkLabel6); + this.panel1.Controls.Add(this.linkLabel7); + this.panel1.Controls.Add(this.linkLabel8); + this.panel1.Controls.Add(this.linkLabel3); + this.panel1.Controls.Add(this.linkLabel4); + this.panel1.Controls.Add(this.linkLabel2); + this.panel1.Controls.Add(this.linkLabel1); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.dte); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.dts); + this.panel1.Controls.Add(this.btRefresh); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Padding = new System.Windows.Forms.Padding(5); + this.panel1.Size = new System.Drawing.Size(1114, 58); + this.panel1.TabIndex = 7; + // + // linkLabel13 + // + this.linkLabel13.AutoSize = true; + this.linkLabel13.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel13.Location = new System.Drawing.Point(494, 33); + this.linkLabel13.Name = "linkLabel13"; + this.linkLabel13.Size = new System.Drawing.Size(51, 19); + this.linkLabel13.TabIndex = 27; + this.linkLabel13.TabStop = true; + this.linkLabel13.Text = "하반기"; + this.linkLabel13.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel14 + // + this.linkLabel14.AutoSize = true; + this.linkLabel14.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel14.Location = new System.Drawing.Point(494, 9); + this.linkLabel14.Name = "linkLabel14"; + this.linkLabel14.Size = new System.Drawing.Size(51, 19); + this.linkLabel14.TabIndex = 26; + this.linkLabel14.TabStop = true; + this.linkLabel14.Text = "상반기"; + this.linkLabel14.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel14_LinkClicked); + this.linkLabel14.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel9 + // + this.linkLabel9.AutoSize = true; + this.linkLabel9.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel9.Location = new System.Drawing.Point(449, 33); + this.linkLabel9.Name = "linkLabel9"; + this.linkLabel9.Size = new System.Drawing.Size(39, 19); + this.linkLabel9.TabIndex = 24; + this.linkLabel9.TabStop = true; + this.linkLabel9.Text = "12월"; + this.linkLabel9.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel10 + // + this.linkLabel10.AutoSize = true; + this.linkLabel10.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel10.Location = new System.Drawing.Point(410, 33); + this.linkLabel10.Name = "linkLabel10"; + this.linkLabel10.Size = new System.Drawing.Size(39, 19); + this.linkLabel10.TabIndex = 23; + this.linkLabel10.TabStop = true; + this.linkLabel10.Text = "11월"; + this.linkLabel10.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel11 + // + this.linkLabel11.AutoSize = true; + this.linkLabel11.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel11.Location = new System.Drawing.Point(371, 33); + this.linkLabel11.Name = "linkLabel11"; + this.linkLabel11.Size = new System.Drawing.Size(39, 19); + this.linkLabel11.TabIndex = 22; + this.linkLabel11.TabStop = true; + this.linkLabel11.Text = "10월"; + this.linkLabel11.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel12 + // + this.linkLabel12.AutoSize = true; + this.linkLabel12.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel12.Location = new System.Drawing.Point(332, 33); + this.linkLabel12.Name = "linkLabel12"; + this.linkLabel12.Size = new System.Drawing.Size(39, 19); + this.linkLabel12.TabIndex = 21; + this.linkLabel12.TabStop = true; + this.linkLabel12.Text = "09월"; + this.linkLabel12.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel5 + // + this.linkLabel5.AutoSize = true; + this.linkLabel5.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel5.Location = new System.Drawing.Point(293, 33); + this.linkLabel5.Name = "linkLabel5"; + this.linkLabel5.Size = new System.Drawing.Size(39, 19); + this.linkLabel5.TabIndex = 20; + this.linkLabel5.TabStop = true; + this.linkLabel5.Text = "08월"; + this.linkLabel5.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel6 + // + this.linkLabel6.AutoSize = true; + this.linkLabel6.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel6.Location = new System.Drawing.Point(254, 33); + this.linkLabel6.Name = "linkLabel6"; + this.linkLabel6.Size = new System.Drawing.Size(39, 19); + this.linkLabel6.TabIndex = 19; + this.linkLabel6.TabStop = true; + this.linkLabel6.Text = "07월"; + this.linkLabel6.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel7 + // + this.linkLabel7.AutoSize = true; + this.linkLabel7.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel7.Location = new System.Drawing.Point(449, 9); + this.linkLabel7.Name = "linkLabel7"; + this.linkLabel7.Size = new System.Drawing.Size(39, 19); + this.linkLabel7.TabIndex = 18; + this.linkLabel7.TabStop = true; + this.linkLabel7.Text = "06월"; + this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); + this.linkLabel7.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel8 + // + this.linkLabel8.AutoSize = true; + this.linkLabel8.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel8.Location = new System.Drawing.Point(410, 9); + this.linkLabel8.Name = "linkLabel8"; + this.linkLabel8.Size = new System.Drawing.Size(39, 19); + this.linkLabel8.TabIndex = 17; + this.linkLabel8.TabStop = true; + this.linkLabel8.Text = "05월"; + this.linkLabel8.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel3 + // + this.linkLabel3.AutoSize = true; + this.linkLabel3.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel3.Location = new System.Drawing.Point(371, 9); + this.linkLabel3.Name = "linkLabel3"; + this.linkLabel3.Size = new System.Drawing.Size(39, 19); + this.linkLabel3.TabIndex = 16; + this.linkLabel3.TabStop = true; + this.linkLabel3.Text = "04월"; + this.linkLabel3.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel4 + // + this.linkLabel4.AutoSize = true; + this.linkLabel4.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel4.Location = new System.Drawing.Point(332, 9); + this.linkLabel4.Name = "linkLabel4"; + this.linkLabel4.Size = new System.Drawing.Size(39, 19); + this.linkLabel4.TabIndex = 15; + this.linkLabel4.TabStop = true; + this.linkLabel4.Text = "03월"; + this.linkLabel4.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel2 + // + this.linkLabel2.AutoSize = true; + this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel2.Location = new System.Drawing.Point(293, 9); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(39, 19); + this.linkLabel2.TabIndex = 14; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "02월"; + this.linkLabel2.Click += new System.EventHandler(this.linkLabel13_Click); + // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.linkLabel1.Location = new System.Drawing.Point(254, 9); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(39, 19); + this.linkLabel1.TabIndex = 13; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "01월"; + this.linkLabel1.Click += new System.EventHandler(this.linkLabel13_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(40, 36); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(14, 12); + this.label3.TabIndex = 9; + this.label3.Text = "~"; + // + // dte + // + this.dte.Location = new System.Drawing.Point(68, 32); + this.dte.Name = "dte"; + this.dte.Size = new System.Drawing.Size(180, 21); + this.dte.TabIndex = 8; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(10, 12); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.TabIndex = 7; + this.label2.Text = "검색기간"; + // + // dts + // + this.dts.Location = new System.Drawing.Point(68, 8); + this.dts.Name = "dts"; + this.dts.Size = new System.Drawing.Size(180, 21); + this.dts.TabIndex = 6; + // + // btRefresh + // + this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; + this.btRefresh.Location = new System.Drawing.Point(1034, 5); + this.btRefresh.Name = "btRefresh"; + this.btRefresh.Size = new System.Drawing.Size(75, 48); + this.btRefresh.TabIndex = 2; + this.btRefresh.Text = "새로고침"; + this.btRefresh.UseVisualStyleBackColor = true; + this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); + // + // reportViewer1 + // + this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill; + reportDataSource2.Name = "DataSet1"; + reportDataSource2.Value = this.bs; + this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2); + this.reportViewer1.LocalReport.ReportEmbeddedResource = "FPJ0000.JobReport_.rJobReportType.rdlc"; + this.reportViewer1.Location = new System.Drawing.Point(0, 58); + this.reportViewer1.Name = "reportViewer1"; + this.reportViewer1.ServerReport.BearerToken = null; + this.reportViewer1.Size = new System.Drawing.Size(1114, 641); + this.reportViewer1.TabIndex = 8; + // + // rJobReportType + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1114, 699); + this.Controls.Add(this.reportViewer1); + this.Controls.Add(this.panel1); + this.Name = "rJobReportType"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "업무형태별 집계"; + this.Load += new System.EventHandler(this.rJobReport_Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + private dsReport dsReport; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.LinkLabel linkLabel9; + private System.Windows.Forms.LinkLabel linkLabel10; + private System.Windows.Forms.LinkLabel linkLabel11; + private System.Windows.Forms.LinkLabel linkLabel12; + private System.Windows.Forms.LinkLabel linkLabel5; + private System.Windows.Forms.LinkLabel linkLabel6; + private System.Windows.Forms.LinkLabel linkLabel7; + private System.Windows.Forms.LinkLabel linkLabel8; + private System.Windows.Forms.LinkLabel linkLabel3; + private System.Windows.Forms.LinkLabel linkLabel4; + private System.Windows.Forms.LinkLabel linkLabel2; + private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DateTimePicker dte; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.DateTimePicker dts; + private System.Windows.Forms.Button btRefresh; + private System.Windows.Forms.LinkLabel linkLabel13; + private System.Windows.Forms.LinkLabel linkLabel14; + private Microsoft.Reporting.WinForms.ReportViewer reportViewer1; + private System.Windows.Forms.BindingSource bs; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportType.cs b/SubProject/FPJ0000/JobReport_/rJobReportType.cs new file mode 100644 index 0000000..1951474 --- /dev/null +++ b/SubProject/FPJ0000/JobReport_/rJobReportType.cs @@ -0,0 +1,150 @@ +using NetOffice.OutlookApi; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace FPJ0000.JobReport_ +{ + public partial class rJobReportType : Form + { + Boolean binit = false; + public rJobReportType() + { + InitializeComponent(); + this.WindowState = FormWindowState.Maximized; + this.dts.Value = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01")); + this.dte.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")).AddMonths(1).AddDays(-1); + + } + + private void rJobReport_Load(object sender, EventArgs e) + { + //this.tbProcess.Items.Clear(); + //tbProcess.Items.Add("--전체--"); + //var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); + //var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode); + //foreach (dsReport.ProcessListRow dr in dtProcessList.Rows) + // tbProcess.Items.Add(dr.processs); + + //this.tbProcess.Text = FCOMMON.info.Login.process; + //if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; + + ////사용자 목록을 선택한다 + //UpdateUserList(); + + this.Show(); + System.Windows.Forms.Application.DoEvents(); + + //this.tbMon.Text = DateTime.Now.ToString("yyyy-MM"); + refrehData(); + binit = true; + } + //void UpdateUserList() + //{ + // var ta = new dsPRJTableAdapters.vJobReportForUserListTableAdapter(); + + // cmbUser.Items.Clear(); + + // //일반사용자 목록 가져온다 + // dsPRJ.vJobReportForUserListDataTable userlist; + + // if (tbProcess.SelectedIndex <= 0) + // { + // //공정구분없이 전체사용자를 가져온다 + // userlist = ta.GetData(FCOMMON.info.Login.gcode, "%"); + // // db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name).GroupBy(t => t.name); + // } + // else + // { + // userlist = ta.GetData(FCOMMON.info.Login.gcode, tbProcess.Text); + // //db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).OrderBy(t => t.name).GroupBy(t => t.name); + // } + + // //if (tbProcess.SelectedIndex != 0) userlist = userlist.Where(t => t.processs == tbProcess.Text); //해당 공정의 인원만 처리한다 + + // foreach (var dr in userlist) + // { + // //var dr = item.First(); + // cmbUser.Items.Add(String.Format("[{0}] {1}", dr.id, dr.name)); + // } + + // if (tbProcess.SelectedIndex > 0) + // cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK); + + // if (cmbUser.SelectedIndex < 0) cmbUser.SelectedIndex = 0; //기본전체로 선택해준다. + //} + + void refrehData() + { + + //근문일수,시간 + var vSD = dts.Value.ToShortDateString(); + var vED = dte.Value.ToShortDateString(); + + //string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); + var taH = new dsReportTableAdapters.vJobReportForUserTableAdapter(); + + //var username = cmbUser.Text.Trim(); + + //var uid = username.Substring(1, username.IndexOf("]") - 1);// "395552"; + var uid = "%"; + + taH.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid); + //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); + //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; + //this.reportViewer1.RefreshReport(); + + this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); + this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; + this.reportViewer1.RefreshReport(); + } + + private void btRefresh_Click(object sender, EventArgs e) + { + refrehData(); + } + + //private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) + //{ + // if (binit == false) return; + // UpdateUserList(); + //} + + private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + + } + + private void linkLabel13_Click(object sender, EventArgs e) + { + var lnk = sender as LinkLabel; + if (lnk.Text.Equals("상반기")) + { + dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-01-01"); + dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-05-31"); + } + else if (lnk.Text.Equals("하반기")) + { + dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-06-01"); + dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-12-31"); + } + else + { + if (int.TryParse(lnk.Text.Substring(0, 2), out int mon) == false) return; + dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-" + mon.ToString("00" + "-01")); + dte.Value = dts.Value.AddMonths(1).AddDays(-1); + } + } + + private void linkLabel14_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + + } + + } +} diff --git a/SubProject/FPJ0000/JobReport_/rJobReportType.rdlc b/SubProject/FPJ0000/JobReport_/rJobReportType.rdlc new file mode 100644 index 0000000..0a06770 --- /dev/null +++ b/SubProject/FPJ0000/JobReport_/rJobReportType.rdlc @@ -0,0 +1,781 @@ + + + + + + + + + 4.49792cm + + + 2.5cm + + + 2.5cm + + + + + 0.635cm + + + + + true + true + + + + + 형태 + + + + + + + Textbox17 + + + LightSteelBlue + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 시간(시) + + + + + + + Textbox36 + + + LightSteelBlue + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + 비율(%) + + + + + + + Textbox43 + + + LightSteelBlue + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.71438cm + + + + + true + true + + + + + =Fields!type.Value + + + + + + + type1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!hrs.Value) + + + + + + + hrs1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =(Sum(Fields!hrs.Value) / Sum(Fields!hrs.Value, "DataSet1"))*100.0 + + + + + + + Textbox44 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + 소계 + + + + + + + Textbox31 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!hrs.Value) + + + + + + + Textbox38 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =(Sum(Fields!hrs.Value) / Sum(Fields!hrs.Value, "DataSet1"))*100.0 + + + + + + + Textbox45 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + + + + + + + + Textbox41 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!hrs.Value) + + + + + + + hrs2 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =(Sum(Fields!hrs.Value) / Sum(Fields!hrs.Value, "DataSet1"))*100.0 + + + + + + + Textbox46 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + 5cm + + + true + true + + + + + 분류 + + + + + + + Textbox19 + + + LightSteelBlue + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + After + + + + =Fields!svalue.Value + + =Fields!svalue.Value + + + + + =Fields!svalue.Value + + + + 5cm + + + true + true + + + + + =Fields!svalue.Value + + + + + + + svalue11 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!type.Value + + + + + Before + + + + + + 5cm + + + true + true + + + + + 합계 + + + + + + + Textbox40 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + Before + + + + DataSet1 + 2.54938cm + 14.49792cm + + + + + + 1.00369in +