From c80a03a81b18cc952ad96bddf2503cde9aa2ab31 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 15 Jan 2025 08:40:21 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=82=A0=EC=A7=9C=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=EC=9D=84=20binding=20source=20=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=A7=81=EC=A0=91=EC=97=B0=EA=B2=B0=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SubProject/FCM0000/fCode.resx | 14 +- SubProject/FCOMMON/fBase.cs | 2 +- .../JobReport_/fJobReport_Add.Designer.cs | 4 + .../FPJ0000/JobReport_/fJobReport_Add.resx | 15 +-- .../FPJ0000/Project/fProjectData.Designer.cs | 124 ++++++++---------- SubProject/FPJ0000/Project/fProjectData.cs | 38 ++++-- SubProject/FPJ0000/Project/fProjectData.resx | 32 ++--- 7 files changed, 116 insertions(+), 113 deletions(-) diff --git a/SubProject/FCM0000/fCode.resx b/SubProject/FCM0000/fCode.resx index c149a42..236e1f6 100644 --- a/SubProject/FCM0000/fCode.resx +++ b/SubProject/FCM0000/fCode.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/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 @@ -142,7 +142,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -154,7 +154,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/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 @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -174,7 +174,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -183,7 +183,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/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 @@ -194,7 +194,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + vgAADr4B6kKxwAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= diff --git a/SubProject/FCOMMON/fBase.cs b/SubProject/FCOMMON/fBase.cs index 7f862ca..1dfa839 100644 --- a/SubProject/FCOMMON/fBase.cs +++ b/SubProject/FCOMMON/fBase.cs @@ -17,7 +17,7 @@ namespace FCOMMON { InitializeComponent(); this.KeyPreview = true; - UseFormSetting = true; + UseFormSetting = false; this.FormClosed += fBase_FormClosed; this.KeyDown += fBase_KeyDown; } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs index fde8319..c46812c 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs @@ -124,6 +124,7 @@ typeLabel.Size = new System.Drawing.Size(69, 20); typeLabel.TabIndex = 11; typeLabel.Text = "업무형태"; + this.toolTip1.SetToolTip(typeLabel, "업무형태 전용 UI를 사용하세요(공용코드:15)"); // // label1 // @@ -134,6 +135,7 @@ label1.Size = new System.Drawing.Size(69, 20); label1.TabIndex = 7; label1.Text = "요청부서"; + this.toolTip1.SetToolTip(label1, "공용코드:13"); // // projectLabel // @@ -166,6 +168,7 @@ stateLabel.Size = new System.Drawing.Size(39, 20); stateLabel.TabIndex = 3; stateLabel.Text = "상태"; + this.toolTip1.SetToolTip(stateLabel, "공용코드:12"); // // label5 // @@ -187,6 +190,7 @@ label3.Size = new System.Drawing.Size(54, 20); label3.TabIndex = 9; label3.Text = "패키지"; + this.toolTip1.SetToolTip(label3, "공용코드(14)"); // // label6 // diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx index f661366..671d26e 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx @@ -123,6 +123,9 @@ False + + 416, 17 + False @@ -165,12 +168,6 @@ 100, 17 - - 100, 17 - - - 17, 17 - 17, 17 @@ -184,16 +181,10 @@ } - - 416, 17 - 164, 17 226, 17 - - 416, 17 - \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 9310830..ffface3 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -75,7 +75,7 @@ this.costeTextBox = new System.Windows.Forms.TextBox(); this.cntTextBox = new System.Windows.Forms.TextBox(); this.remark_reqTextBox = new System.Windows.Forms.TextBox(); - this.tbXdate = new System.Windows.Forms.TextBox(); + this.tbDDate = new System.Windows.Forms.TextBox(); this.assetTextBox = new System.Windows.Forms.TextBox(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -113,6 +113,7 @@ this.cmbReqTeam = new System.Windows.Forms.ComboBox(); this.arLabel1 = new arCtl.arLabel(); this.panel1 = new System.Windows.Forms.Panel(); + this.chkMajor = new System.Windows.Forms.CheckBox(); this.textBox13 = new System.Windows.Forms.TextBox(); this.chkCostSave = new System.Windows.Forms.CheckBox(); this.chkHigh = new System.Windows.Forms.CheckBox(); @@ -144,13 +145,13 @@ this.arLabel3 = new arCtl.arLabel(); this.panel2 = new System.Windows.Forms.Panel(); this.linkLabel9 = new System.Windows.Forms.LinkLabel(); - this.textBox11 = new System.Windows.Forms.TextBox(); + this.tbKDate = new System.Windows.Forms.TextBox(); this.linkLabel8 = new System.Windows.Forms.LinkLabel(); - this.textBox9 = new System.Windows.Forms.TextBox(); + this.tbCdate = new System.Windows.Forms.TextBox(); this.linkLabel7 = new System.Windows.Forms.LinkLabel(); - this.textBox8 = new System.Windows.Forms.TextBox(); + this.tbQdate = new System.Windows.Forms.TextBox(); this.linkLabel6 = new System.Windows.Forms.LinkLabel(); - this.textBox7 = new System.Windows.Forms.TextBox(); + this.tbBdate = new System.Windows.Forms.TextBox(); this.linkLabel5 = new System.Windows.Forms.LinkLabel(); this.linkLabel4 = new System.Windows.Forms.LinkLabel(); this.linkLabel3 = new System.Windows.Forms.LinkLabel(); @@ -227,7 +228,6 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.taToDo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter(); - this.chkMajor = new System.Windows.Forms.CheckBox(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); usermainLabel = new System.Windows.Forms.Label(); @@ -613,7 +613,6 @@ // // tbSdate // - this.tbSdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); this.tbSdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; this.tbSdate.Location = new System.Drawing.Point(69, 28); this.tbSdate.Name = "tbSdate"; @@ -622,7 +621,6 @@ // // tbEdate // - this.tbEdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); this.tbEdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; this.tbEdate.Location = new System.Drawing.Point(69, 100); this.tbEdate.Name = "tbEdate"; @@ -709,14 +707,13 @@ this.remark_reqTextBox.Size = new System.Drawing.Size(569, 272); this.remark_reqTextBox.TabIndex = 49; // - // tbXdate + // tbDDate // - this.tbXdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); - this.tbXdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbXdate.Location = new System.Drawing.Point(346, 28); - this.tbXdate.Name = "tbXdate"; - this.tbXdate.Size = new System.Drawing.Size(190, 21); - this.tbXdate.TabIndex = 3; + this.tbDDate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbDDate.Location = new System.Drawing.Point(346, 28); + this.tbDDate.Name = "tbDDate"; + this.tbDDate.Size = new System.Drawing.Size(190, 21); + this.tbDDate.TabIndex = 3; // // assetTextBox // @@ -992,7 +989,6 @@ // // tbODate // - this.tbODate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); this.tbODate.ImeMode = System.Windows.Forms.ImeMode.Hangul; this.tbODate.Location = new System.Drawing.Point(346, 51); this.tbODate.Name = "tbODate"; @@ -1188,6 +1184,16 @@ this.panel1.TabIndex = 86; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // + // chkMajor + // + this.chkMajor.AutoSize = true; + this.chkMajor.Location = new System.Drawing.Point(326, 122); + this.chkMajor.Name = "chkMajor"; + this.chkMajor.Size = new System.Drawing.Size(56, 16); + this.chkMajor.TabIndex = 103; + this.chkMajor.Text = "Major"; + this.chkMajor.UseVisualStyleBackColor = true; + // // textBox13 // this.textBox13.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "category", true)); @@ -1571,20 +1577,20 @@ // this.panel2.BackColor = System.Drawing.Color.Gainsboro; this.panel2.Controls.Add(this.linkLabel9); - this.panel2.Controls.Add(this.textBox11); + this.panel2.Controls.Add(this.tbKDate); this.panel2.Controls.Add(this.linkLabel8); - this.panel2.Controls.Add(this.textBox9); + this.panel2.Controls.Add(this.tbCdate); this.panel2.Controls.Add(this.linkLabel7); - this.panel2.Controls.Add(this.textBox8); + this.panel2.Controls.Add(this.tbQdate); this.panel2.Controls.Add(this.linkLabel6); - this.panel2.Controls.Add(this.textBox7); + this.panel2.Controls.Add(this.tbBdate); this.panel2.Controls.Add(this.linkLabel5); this.panel2.Controls.Add(this.linkLabel4); this.panel2.Controls.Add(this.linkLabel3); this.panel2.Controls.Add(this.linkLabel2); this.panel2.Controls.Add(this.arLabel4); this.panel2.Controls.Add(this.tbSdate); - this.panel2.Controls.Add(this.tbXdate); + this.panel2.Controls.Add(this.tbDDate); this.panel2.Controls.Add(this.tbEdate); this.panel2.Controls.Add(this.tbODate); this.panel2.Location = new System.Drawing.Point(6, 454); @@ -1602,16 +1608,15 @@ this.linkLabel9.TabStop = true; this.linkLabel9.Text = "검토기한"; // - // textBox11 + // tbKDate // - this.textBox11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.textBox11.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "kdate", true)); - this.textBox11.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox11.Location = new System.Drawing.Point(346, 100); - this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(190, 21); - this.textBox11.TabIndex = 15; - this.textBox11.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbKDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.tbKDate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbKDate.Location = new System.Drawing.Point(346, 100); + this.tbKDate.Name = "tbKDate"; + this.tbKDate.Size = new System.Drawing.Size(190, 21); + this.tbKDate.TabIndex = 15; + this.tbKDate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // linkLabel8 // @@ -1624,14 +1629,13 @@ this.linkLabel8.Text = "고객승인"; this.linkLabel8.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel8_LinkClicked); // - // textBox9 + // tbCdate // - this.textBox9.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cdate", true)); - this.textBox9.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox9.Location = new System.Drawing.Point(346, 76); - this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(190, 21); - this.textBox9.TabIndex = 11; + this.tbCdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbCdate.Location = new System.Drawing.Point(346, 76); + this.tbCdate.Name = "tbCdate"; + this.tbCdate.Size = new System.Drawing.Size(190, 21); + this.tbCdate.TabIndex = 11; // // linkLabel7 // @@ -1644,14 +1648,13 @@ this.linkLabel7.Text = "Qual"; this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); // - // textBox8 + // tbQdate // - this.textBox8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "qdate", true)); - this.textBox8.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox8.Location = new System.Drawing.Point(69, 76); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(190, 21); - this.textBox8.TabIndex = 9; + this.tbQdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbQdate.Location = new System.Drawing.Point(69, 76); + this.tbQdate.Name = "tbQdate"; + this.tbQdate.Size = new System.Drawing.Size(190, 21); + this.tbQdate.TabIndex = 9; // // linkLabel6 // @@ -1664,14 +1667,13 @@ this.linkLabel6.Text = "Buy-Off"; this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked); // - // textBox7 + // tbBdate // - this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "bdate", true)); - this.textBox7.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox7.Location = new System.Drawing.Point(69, 52); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(190, 21); - this.textBox7.TabIndex = 5; + this.tbBdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbBdate.Location = new System.Drawing.Point(69, 52); + this.tbBdate.Name = "tbBdate"; + this.tbBdate.Size = new System.Drawing.Size(190, 21); + this.tbBdate.TabIndex = 5; // // linkLabel5 // @@ -2903,16 +2905,6 @@ // this.taToDo.ClearBeforeFill = true; // - // chkMajor - // - this.chkMajor.AutoSize = true; - this.chkMajor.Location = new System.Drawing.Point(326, 122); - this.chkMajor.Name = "chkMajor"; - this.chkMajor.Size = new System.Drawing.Size(56, 16); - this.chkMajor.TabIndex = 103; - this.chkMajor.Text = "Major"; - this.chkMajor.UseVisualStyleBackColor = true; - // // fProjectData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -2999,7 +2991,7 @@ private System.Windows.Forms.TextBox costeTextBox; private System.Windows.Forms.TextBox cntTextBox; private System.Windows.Forms.TextBox remark_reqTextBox; - private System.Windows.Forms.TextBox tbXdate; + private System.Windows.Forms.TextBox tbDDate; private System.Windows.Forms.TextBox assetTextBox; private System.Windows.Forms.BindingNavigator bn; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; @@ -3111,11 +3103,11 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox textBox6; private System.Windows.Forms.LinkLabel linkLabel6; - private System.Windows.Forms.TextBox textBox7; + private System.Windows.Forms.TextBox tbBdate; private System.Windows.Forms.LinkLabel linkLabel7; - private System.Windows.Forms.TextBox textBox8; + private System.Windows.Forms.TextBox tbQdate; private System.Windows.Forms.LinkLabel linkLabel8; - private System.Windows.Forms.TextBox textBox9; + private System.Windows.Forms.TextBox tbCdate; private System.Windows.Forms.ComboBox cmbChampion; private System.Windows.Forms.BindingSource bsChampionID; private DSComm dSComm; @@ -3135,7 +3127,7 @@ private System.Windows.Forms.TextBox tbPno; private System.Windows.Forms.ToolStripButton toolStripButton8; private System.Windows.Forms.LinkLabel linkLabel9; - private System.Windows.Forms.TextBox textBox11; + private System.Windows.Forms.TextBox tbKDate; private System.Windows.Forms.TextBox textBox12; private System.Windows.Forms.LinkLabel linkLabel10; private System.Windows.Forms.LinkLabel linkLabel11; diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index eaab64e..8b7743b 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -92,6 +92,15 @@ namespace FPJ0000 this.bs.DataSource = dr; // this.cmbUser.SelectedValue = dr.championid; + tbSdate.Text = dr.sdate; + tbDDate.Text = dr.ddate; + tbBdate.Text = dr.bdate; + tbODate.Text = dr.odate; + tbQdate.Text = dr.qdate; + tbCdate.Text = dr.cdate; + tbEdate.Text = dr.edate; + tbKDate.Text = dr.kdate; + //주간일지내역을 업데이트 refresh_History(); @@ -119,7 +128,7 @@ namespace FPJ0000 this.cmbReqPlant.Text = dr.ReqPlant; this.cmbReqPackage.Text = dr.ReqPackage; this.cmbReqLine.Text = dr.ReqLine; - + rtAft.Text = string.Empty; rtBef.Text = string.Empty; rtDesc.Text = string.Empty; @@ -160,14 +169,9 @@ namespace FPJ0000 } btIO.Enabled = btPart.Enabled; - //btWeek.Enabled = btPart.Enabled; btMailAddr.Enabled = btPart.Enabled; btPath.Enabled = btPart.Enabled; btSendMail.Enabled = btPart.Enabled; - - //if (dr.Issfi_typeNull() == false && dr.sfi_type == "M") - // tbSFI.Text = dr.sfic.ToString("N2"); - //else tbSFI.Text = dr.sfi.ToString("N2"); //일반사용자의경우에는 상태를 변경하지 못한다. @@ -254,7 +258,9 @@ namespace FPJ0000 string oldsta = string.Empty; private void btSave_Click(object sender, EventArgs e) { + this.bs.EndEdit(); this.Validate(); + oldsta = dr.status; this.dr.process = cmbReqProcess.Text; this.dr.status = cmbState.Text; @@ -270,6 +276,16 @@ namespace FPJ0000 this.dr.bmajoritem = chkMajor.Checked; this.dr.bFanOut = chkFanout.Checked; + this.dr.sdate = tbSdate.Text; + this.dr.ddate = tbDDate.Text; + this.dr.bdate = tbBdate.Text; + this.dr.odate = tbODate.Text; + this.dr.qdate = tbQdate.Text; + this.dr.cdate = tbCdate.Text; + this.dr.edate = tbEdate.Text; + this.dr.kdate = tbKDate.Text; + this.dr.EndEdit(); + if (tbSFI.Text.isEmpty() == false) { @@ -379,7 +395,7 @@ namespace FPJ0000 org = org.Replace("{champion}", userManagerTextBox.Text); org = org.Replace("{sdate}", tbSdate.Text); org = org.Replace("{edate}", tbEdate.Text); - org = org.Replace("{xdate}", tbXdate.Text); + org = org.Replace("{xdate}", tbDDate.Text); org = org.Replace("{odate}", tbODate.Text); return org; } @@ -567,7 +583,7 @@ namespace FPJ0000 private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - SelectDate(tbXdate); + SelectDate(tbDDate); } private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -654,17 +670,17 @@ namespace FPJ0000 private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - SelectDate(textBox7); + SelectDate(tbBdate); } private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - SelectDate(textBox8); + SelectDate(tbQdate); } private void linkLabel8_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - SelectDate(textBox9); + SelectDate(tbCdate); } private void toolStripButton8_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index 3aad62e..db06fff 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -214,7 +214,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/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 @@ -225,7 +225,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -234,7 +234,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -243,7 +243,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/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 @@ -383,7 +383,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/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 @@ -394,7 +394,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -403,7 +403,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -412,7 +412,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/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 @@ -423,7 +423,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/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 @@ -450,7 +450,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -468,7 +468,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/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 @@ -479,7 +479,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -488,7 +488,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -497,7 +497,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/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 @@ -508,7 +508,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/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 @@ -535,7 +535,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG