From 6e091f62186622283ef7425ea29b270b6f21f14a Mon Sep 17 00:00:00 2001
From: chi <chikyun.kim@amkor.co.kr>
Date: Thu, 28 Dec 2023 10:24:51 +0900
Subject: [PATCH] ..

---
 Project/Properties/AssemblyInfo.cs            |   4 +-
 SubProject/FBS0000/Holiday/rHolyData.rdlc     |   4 +-
 SubProject/FCOMMON/DataBaseManager.cs         |  23 +-
 .../FEQ0000/PurchaseCR/fPurchaseCR_Add.cs     |  11 +-
 .../FEQ0000/PurchaseNR/fPurchase_Add.cs       |  12 +-
 .../OtConfirm/fHolyRequest.Designer.cs        |  51 ++--
 .../FPJ0000/OtConfirm/fHolyRequest.resx       |   8 +-
 .../FPJ0000/OtConfirm/fHolyRequestAdd.cs      |  11 +-
 .../FPJ0000/Project/fProjectList.Designer.cs  | 221 +++++++++---------
 SubProject/FPJ0000/Project/fProjectList.cs    |  27 ++-
 SubProject/FPJ0000/Project/fProjectList.resx  |  12 +
 11 files changed, 217 insertions(+), 167 deletions(-)

diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index ff54957..28f03e5 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.12.17.2230")]
-[assembly: AssemblyFileVersion("23.12.17.2230")]
+[assembly: AssemblyVersion("23.12.28.1022")]
+[assembly: AssemblyFileVersion("23.12.28.1022")]
diff --git a/SubProject/FBS0000/Holiday/rHolyData.rdlc b/SubProject/FBS0000/Holiday/rHolyData.rdlc
index 0bb42c0..7677105 100644
--- a/SubProject/FBS0000/Holiday/rHolyData.rdlc
+++ b/SubProject/FBS0000/Holiday/rHolyData.rdlc
@@ -68,7 +68,6 @@
                       </Style>
                     </Textbox>
                     <ColSpan>7</ColSpan>
-                    <rd:Selected>true</rd:Selected>
                   </CellContents>
                 </TablixCell>
                 <TablixCell />
@@ -908,6 +907,7 @@
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontWeight>Normal</FontWeight>
+                                <Format>N1</Format>
                                 <Color>#333333</Color>
                               </Style>
                             </TextRun>
@@ -1281,6 +1281,7 @@
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontWeight>Normal</FontWeight>
+                                <Format>N1</Format>
                                 <Color>#333333</Color>
                               </Style>
                             </TextRun>
@@ -1463,7 +1464,6 @@
           </Paragraphs>
           <rd:DefaultName>Textbox88</rd:DefaultName>
           <Top>0.17625cm</Top>
-          <Left>0cm</Left>
           <Height>0.6cm</Height>
           <Width>27.95916cm</Width>
           <Style>
diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs
index 67c98f0..3ed32d7 100644
--- a/SubProject/FCOMMON/DataBaseManager.cs
+++ b/SubProject/FCOMMON/DataBaseManager.cs
@@ -34,7 +34,7 @@ namespace FCOMMON
 
         public static List<string> GetItemStorageList()
         {
-            
+
 
             var cn = getCn();
             cn.Open();
@@ -46,7 +46,7 @@ namespace FCOMMON
             try
             {
                 var rdr = cmd.ExecuteReader();
-                while(rdr.Read())
+                while (rdr.Read())
                 {
                     retval.Add(rdr[0].ToString());
                 }
@@ -310,7 +310,7 @@ namespace FCOMMON
                 " where prgmName = 'Amkor K4-EET GroupWare'";
                 return ExecuteScalar(sql);
             }
-            catch 
+            catch
             {
                 return string.Empty;
             }
@@ -528,7 +528,13 @@ namespace FCOMMON
             var dt = DateTime.Parse(pdate);
             var dtys = dt.Year.ToString("0000") + "-01-01";
 
-            string sql = "select isnull(cate,'--'), isnull(sum(termdr),0), isnull(sum(term),0), isnull(sum(termdr)-sum(term),0) , isnull(sum(drtime),0),isnull(sum(crtime),0), isnull(sum(drtime)-sum(crtime),0) as JanTime" +
+            string sql = "select isnull(cate,'--'), " +
+                " isnull(sum(termdr),0), " +
+                " isnull(sum(term),0), " +
+                " isnull(sum(termdr)-sum(term),0) ," +
+                " round(isnull(sum(drtime),0),2)," +
+                " round(isnull(sum(crtime),0),2)," +
+                " round(isnull(sum(drtime)-sum(crtime),0),2) as JanTime" +
                 " from Holyday " +
                 " where gcode=@gcode and  uid = @uid and sdate  between @sdate and @edate group by cate order by cate";
 
@@ -543,6 +549,8 @@ namespace FCOMMON
             var rdr = cmd.ExecuteReader();
             while (rdr.Read())
             {
+                var drtime = (double)rdr[4];
+                var crtime = (double)rdr[5];
                 retval.Add(rdr[0].ToString(), $"{rdr[1]}|{rdr[2]}|{rdr[3]}|{rdr[4]}|{rdr[5]}|{rdr[6]}");
             }
 
@@ -1073,7 +1081,7 @@ namespace FCOMMON
             {
                 return ExecuteScalar(slq);
             }
-            catch 
+            catch
             {
                 return string.Empty;
             }
@@ -1087,11 +1095,12 @@ namespace FCOMMON
             try
             {
                 return ExecuteScalar(slq);
-            }catch 
+            }
+            catch
             {
                 return string.Empty;
             }
-            
+
         }
 
         public static System.Data.DataTable getUserProjectList(string userName)
diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs
index 2e7925e..285f995 100644
--- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs
+++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs
@@ -103,6 +103,8 @@ namespace FEQ0000
 
             //담당자목록
             var userList = FCOMMON.DBM.getUserList(); //.getGroupList("name", "Users", "[level] > 0 and [level] < 10");
+            cmbReceive.Items.Clear();
+            cmbReceive.Items.Add("-- 없음 --");
             foreach (var user in userList)
             {
                 this.cmbReceive.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value));
@@ -145,9 +147,9 @@ namespace FEQ0000
             }
             else cmbRequest.Text = dr.request;
 
-            if (cmbReceive.Items.Count > 0)
+            if (cmbReceive.Items.Count > 1)
             {
-                for (int i = 0; i < cmbReceive.Items.Count; i++)
+                for (int i = 1; i < cmbReceive.Items.Count; i++)
                 {
                     if (cmbReceive.Items[i].ToString().StartsWith("[" + dr.receive + "]"))
                     {
@@ -832,7 +834,10 @@ namespace FEQ0000
             if (cmbReceive.Text.IndexOf("]") != -1)
                 dr.receive = cmbReceive.Text.Substring(1, cmbReceive.Text.IndexOf("]") - 1);
             else
-                dr.receive = cmbReceive.Text.Trim();
+            {
+                if (cmbReceive.SelectedIndex < 1) dr.receive = string.Empty;
+                else dr.receive = cmbReceive.Text.Trim();
+            }
 
             //dr.process = cbProcess.Text;
             dr.sc = tbSC.Text;
diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs
index 94af187..00ad6b9 100644
--- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs
+++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs
@@ -143,6 +143,8 @@ namespace FEQ0000
 
             //담당자목록
             var userList = FCOMMON.DBM.getUserList(); //.getGroupList("name", "Users", "[level] > 0 and [level] < 10");
+            cmbReceive.Items.Clear();
+            cmbReceive.Items.Add("-- 없음 --");
             foreach (var user in userList)
             {
                 this.cmbReceive.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value));
@@ -195,9 +197,9 @@ namespace FEQ0000
             }
             else cmbRequest.Text = dr.request;
 
-            if (cmbReceive.Items.Count > 0)
+            if (cmbReceive.Items.Count > 1)
             {
-                for (int i = 0; i < cmbReceive.Items.Count; i++)
+                for (int i = 1; i < cmbReceive.Items.Count; i++)
                 {
                     if (cmbReceive.Items[i].ToString().StartsWith("[" + dr.receive + "]"))
                     {
@@ -907,7 +909,11 @@ namespace FEQ0000
             if (cmbReceive.Text.IndexOf("]") != -1)
                 dr.receive = cmbReceive.Text.Substring(1, cmbReceive.Text.IndexOf("]") - 1);
             else
-                dr.receive = cmbReceive.Text.Trim();
+            {
+                if (cmbReceive.SelectedIndex < 1) dr.receive = string.Empty;
+                else dr.receive = cmbReceive.Text.Trim();
+            }
+                
 
             dr.process = btProcess.Text;
             dr.sc = tbSC.Text;
diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs
index 4225ea9..7eacd31 100644
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs
@@ -77,6 +77,9 @@
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.dv1 = new arCtl.arDatagridView();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.외출완료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
             this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -94,9 +97,6 @@
             this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.외출완료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -525,6 +525,24 @@
             this.dv1.TabIndex = 3;
             this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError);
             // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.외출완료ToolStripMenuItem});
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26);
+            // 
+            // 외출완료ToolStripMenuItem
+            // 
+            this.외출완료ToolStripMenuItem.Name = "외출완료ToolStripMenuItem";
+            this.외출완료ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+            this.외출완료ToolStripMenuItem.Text = "외출 완료";
+            this.외출완료ToolStripMenuItem.Click += new System.EventHandler(this.외출완료ToolStripMenuItem_Click);
+            // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
+            // 
             // uidDataGridViewTextBoxColumn
             // 
             this.uidDataGridViewTextBoxColumn.DataPropertyName = "uid";
@@ -578,6 +596,7 @@
             dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             dataGridViewCellStyle3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold);
             dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
+            dataGridViewCellStyle3.Format = "N1";
             this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle3;
             this.HolyTimes.HeaderText = "대체시간";
             this.HolyTimes.Name = "HolyTimes";
@@ -667,24 +686,6 @@
             this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn";
             this.remarkDataGridViewTextBoxColumn.Width = 64;
             // 
-            // contextMenuStrip1
-            // 
-            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.외출완료ToolStripMenuItem});
-            this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26);
-            // 
-            // 외출완료ToolStripMenuItem
-            // 
-            this.외출완료ToolStripMenuItem.Name = "외출완료ToolStripMenuItem";
-            this.외출완료ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
-            this.외출완료ToolStripMenuItem.Text = "외출 완료";
-            this.외출완료ToolStripMenuItem.Click += new System.EventHandler(this.외출완료ToolStripMenuItem_Click);
-            // 
-            // ta
-            // 
-            this.ta.ClearBeforeFill = true;
-            // 
             // fHolyRequest
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -754,6 +755,10 @@
         private System.Windows.Forms.ToolStripLabel sbtime;
         private System.Windows.Forms.ToolStripButton toolStripButton8;
         private System.Windows.Forms.ToolStripButton toolStripButton7;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem 외출완료ToolStripMenuItem;
         private System.Windows.Forms.DataGridViewTextBoxColumn uidDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn;
@@ -771,9 +776,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Response;
         private System.Windows.Forms.DataGridViewTextBoxColumn HolyBackup;
         private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-        private System.Windows.Forms.ToolStripButton toolStripButton1;
-        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem 외출완료ToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx
index 2fe5b0d..bea0e0f 100644
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx
@@ -130,7 +130,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/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 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -159,7 +159,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/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
diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
index 2f099ca..218dacd 100644
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
@@ -527,7 +527,8 @@ namespace FPJ0000.OtConfirm
             if (uiddt == null) return;
             var uid = uiddt.ToString();
             if (uid.isEmpty()) return;
-
+            if (uid == "System.Data.DataRowView") return;
+            if (updateuserinfo.Equals(uid)) return;
 
             var basedate = DateTime.Now.AddDays(-1).ToShortDateString();
             holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, basedate);
@@ -537,19 +538,19 @@ namespace FPJ0000.OtConfirm
             foreach (var item in holydata)
             {
                 var val = item.Value.Split('|');
-                if (val[2] != "0")
+                if (val[0] != "0" || val[2] != "0")
                 {
                     var perc = 0f;
                     if (val[0] != "0") perc = float.Parse(val[1]) / float.Parse(val[0]);
                     if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
-                    richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc * 100:N1}%사용)");
+                    richTextBox1.AppendText($"[{item.Key}] {val[2]:N1}일 남음({perc * 100:N1}%사용)");
                 }
-                else if (val[5] != "0")
+                else if (val[3] != "0" || val[5] != "0")
                 {
                     var perc = 0f;
                     if (val[3] != "0") perc = float.Parse(val[4]) / float.Parse(val[3]);
                     if (richTextBox1.TextLength > 0) richTextBox1.AppendText(",");
-                    richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc * 100:N1}%사용)");
+                    richTextBox1.AppendText($"[{item.Key}] {val[5]:N1}시간 남음({perc * 100:N1}%사용)");
                 }
 
             }
diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
index 8b320b4..caf12b3 100644
--- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
@@ -30,44 +30,44 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList));
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType4 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType6 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -772,218 +772,218 @@
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F;
             this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
+            numberCellType11.DecimalPlaces = 0;
+            numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType11.MaximumValue = 2147483647D;
+            numberCellType11.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType11;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
             this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType26;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "category";
             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType27;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "userprocess";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType2.DecimalPlaces = 0;
-            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType2.MaximumValue = 2147483647D;
-            numberCellType2.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2;
+            numberCellType12.DecimalPlaces = 0;
+            numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType12.MaximumValue = 2147483647D;
+            numberCellType12.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType12;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "pno";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "Project\r\nNo";
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType28;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process";
             this.fpSpread1_Sheet1.Columns.Get(4).Label = "Process / Equipment";
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType29;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqSite";
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "Site";
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType30;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqPlant";
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "Plant";
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType31;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ReqPackage";
             this.fpSpread1_Sheet1.Columns.Get(7).Label = "PKG";
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType32;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "ReqLine";
             this.fpSpread1_Sheet1.Columns.Get(8).Label = "Line";
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType33;
             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "part";
             this.fpSpread1_Sheet1.Columns.Get(9).Label = "Request Team";
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType34;
             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name";
             this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(10).Label = "Project Title";
             this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType3.DecimalPlaces = 0;
-            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType3.MaximumValue = 2147483647D;
-            numberCellType3.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3;
+            numberCellType13.DecimalPlaces = 0;
+            numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType13.MaximumValue = 2147483647D;
+            numberCellType13.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType13;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "finishrate";
             this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(11).Label = "준수(%)";
             this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType4.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType4;
+            numberCellType14.DecimalPlaces = 0;
+            numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType14.MaximumValue = 2147483647D;
+            numberCellType14.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType14;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ProgressPrj";
             this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(12).Label = "완료(%)";
             this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType35;
             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "status";
             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "Status";
             this.fpSpread1_Sheet1.Columns.Get(13).Tag = "Status";
             this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType36;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "kdate";
             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(14).Label = "검토\r\n기한";
             this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType37;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "lasthistory_date";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Label = "업데이트";
             this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Width = 58F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType38;
             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "sdate";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Label = "Start Date";
             this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Width = 52F;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType39;
             this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ddate";
             this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(17).Label = "Due Date";
             this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType40;
             this.fpSpread1_Sheet1.Columns.Get(18).DataField = "edate";
             this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(18).Label = "Done Date";
             this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType5.DecimalPlaces = 0;
-            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType5.MaximumValue = 2147483647D;
-            numberCellType5.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5;
+            numberCellType15.DecimalPlaces = 0;
+            numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType15.MaximumValue = 2147483647D;
+            numberCellType15.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType15;
             this.fpSpread1_Sheet1.Columns.Get(19).DataField = "cnt";
             this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(19).Label = "Q\'ty";
             this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(19).Width = 42F;
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType6;
+            numberCellType16.MaximumValue = 999999999999999D;
+            numberCellType16.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType16;
             this.fpSpread1_Sheet1.Columns.Get(20).DataField = "costo";
             this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(20).Label = "Outsourced Cost ($K)/Set\r\n";
             this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F;
-            numberCellType7.MaximumValue = 999999999999999D;
-            numberCellType7.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7;
+            numberCellType17.MaximumValue = 999999999999999D;
+            numberCellType17.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType17;
             this.fpSpread1_Sheet1.Columns.Get(21).DataField = "costn";
             this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Label = "In-house Cost ($K/Set)";
             this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F;
             this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType8.MaximumValue = 999999999999999D;
-            numberCellType8.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType8;
+            numberCellType18.MaximumValue = 999999999999999D;
+            numberCellType18.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType18;
             this.fpSpread1_Sheet1.Columns.Get(22).DataField = "coste";
             this.fpSpread1_Sheet1.Columns.Get(22).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(22).Label = "Cost Save ($k)/Set";
             this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(22).Width = 67F;
-            numberCellType9.MaximumValue = 999999999999999D;
-            numberCellType9.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType9;
+            numberCellType19.MaximumValue = 999999999999999D;
+            numberCellType19.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType19;
             this.fpSpread1_Sheet1.Columns.Get(23).DataField = "sfi";
             this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(23).Label = "SFI";
             this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(23).Width = 52F;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType41;
             this.fpSpread1_Sheet1.Columns.Get(24).DataField = "orderno";
             this.fpSpread1_Sheet1.Columns.Get(24).Label = "SCR/CF";
             this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType42;
             this.fpSpread1_Sheet1.Columns.Get(25).DataField = "name_champion";
             this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(25).Label = "Champion";
             this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType43;
             this.fpSpread1_Sheet1.Columns.Get(26).DataField = "name_software";
             this.fpSpread1_Sheet1.Columns.Get(26).Label = "S/W";
             this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType44;
             this.fpSpread1_Sheet1.Columns.Get(27).DataField = "name_design";
             this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(27).Label = "Design";
             this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType45;
             this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_epanel";
             this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).Label = "ePanel";
             this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType46;
             this.fpSpread1_Sheet1.Columns.Get(29).DataField = "lasthistory";
             this.fpSpread1_Sheet1.Columns.Get(29).Label = "History";
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType47;
             this.fpSpread1_Sheet1.Columns.Get(30).DataField = "memo";
             this.fpSpread1_Sheet1.Columns.Get(30).Label = "Memo";
             this.fpSpread1_Sheet1.Columns.Get(30).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType48;
             this.fpSpread1_Sheet1.Columns.Get(31).DataField = "asset";
             this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(31).Label = "Asset";
             this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType49;
             this.fpSpread1_Sheet1.Columns.Get(32).DataField = "model";
             this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(32).Label = "Model#";
             this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType50;
             this.fpSpread1_Sheet1.Columns.Get(33).DataField = "serial";
             this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(33).Label = "Serial#";
             this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType10.DecimalPlaces = 0;
-            numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType10.MaximumValue = 2147483647D;
-            numberCellType10.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType10;
+            numberCellType20.DecimalPlaces = 0;
+            numberCellType20.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType20.MaximumValue = 2147483647D;
+            numberCellType20.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType20;
             this.fpSpread1_Sheet1.Columns.Get(34).DataField = "jasmin";
             this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(34).Label = "자스민";
             this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType4;
             this.fpSpread1_Sheet1.Columns.Get(35).DataField = "bCost";
             this.fpSpread1_Sheet1.Columns.Get(35).Width = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType5;
             this.fpSpread1_Sheet1.Columns.Get(36).DataField = "bFanOut";
             this.fpSpread1_Sheet1.Columns.Get(36).Width = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType6;
             this.fpSpread1_Sheet1.Columns.Get(37).DataField = "bHighlight";
             this.fpSpread1_Sheet1.Columns.Get(37).Label = "Major Item";
             this.fpSpread1_Sheet1.Columns.Get(37).Tag = "Highlight";
@@ -1020,12 +1020,14 @@
             // 
             this.cmbDateType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbDateType.Items.AddRange(new object[] {
+            "기간조회안함",
             "시작일기준",
+            "만료일기준",
             "완료일기준",
             "출고일기준"});
             this.cmbDateType.Name = "cmbDateType";
             this.cmbDateType.Size = new System.Drawing.Size(121, 29);
-            this.cmbDateType.Visible = false;
+            this.cmbDateType.SelectedIndexChanged += new System.EventHandler(this.cmbDateType_SelectedIndexChanged);
             this.cmbDateType.Click += new System.EventHandler(this.cmbDateType_Click);
             // 
             // cmbYearS
@@ -1034,7 +1036,6 @@
             this.cmbYearS.DropDownWidth = 70;
             this.cmbYearS.Name = "cmbYearS";
             this.cmbYearS.Size = new System.Drawing.Size(100, 29);
-            this.cmbYearS.Visible = false;
             // 
             // toolStripLabel4
             // 
diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs
index 98131f3..e800548 100644
--- a/SubProject/FPJ0000/Project/fProjectList.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.cs
@@ -108,12 +108,12 @@ namespace FPJ0000
             this.cmbSort.SelectedIndex = 0;
             this.cmbYearS.Items.Clear();
             this.cmbYearE.Items.Clear();
-            for (int i = 2010; i <= DateTime.Now.Year; i++)
+            for (int i = 2010; i <= DateTime.Now.Year+1; i++)
             {
                 cmbYearS.Items.Add(i.ToString("0000"));
                 cmbYearE.Items.Add(i.ToString("0000"));
             }
-            this.cmbYearS.Text = DateTime.Now.AddYears(-2).Year.ToString("0000");
+            this.cmbYearS.Text = DateTime.Now.Year.ToString("0000");
             this.cmbYearE.Text = DateTime.Now.Year.ToString("0000");
             refreshData();
 
@@ -221,11 +221,21 @@ namespace FPJ0000
 
             if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and ";    //삭제보기 햇을 경우
 
-            //var dateField = "pdate";
-            //if (cmbDateType.SelectedIndex == 1) dateField = "edate";
-            //else if (cmbDateType.SelectedIndex == 2) dateField = "odate";
 
-            //State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
+            //만료,완료,출고
+            if (cmbDateType.SelectedIndex > 0)
+            {
+                var dateField = "";
+                if (cmbDateType.SelectedIndex == 1) dateField = "sdate";
+                else if (cmbDateType.SelectedIndex == 2) dateField = "ddate";
+                else if (cmbDateType.SelectedIndex == 3) dateField = "edate";
+                else if (cmbDateType.SelectedIndex == 4) dateField = "odate";
+                State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearS.Text + "-12-31' AND ";
+            }
+
+
+
+
             //   "ISNULL(usermain, '') LIKE @username OR " +
             //   "ISNULL(reqstaff, '') LIKE @username OR " +
             //   "ISNULL(usersub, '') LIKE @username) ";
@@ -1095,5 +1105,10 @@ namespace FPJ0000
             }
             else label8.BackColor = SystemColors.Control;
         }
+
+        private void cmbDateType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            cmbYearS.Enabled = cmbDateType.SelectedIndex != 0;
+        }
     }
 }
\ No newline at end of file
diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx
index 16520c6..e278007 100644
--- a/SubProject/FPJ0000/Project/fProjectList.resx
+++ b/SubProject/FPJ0000/Project/fProjectList.resx
@@ -290,6 +290,9 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>387, 17</value>
   </metadata>
@@ -347,6 +350,12 @@
   <metadata name="bsHistD.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>934, 17</value>
   </metadata>
+  <metadata name="bsHistD.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>934, 17</value>
+  </metadata>
+  <metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>561, 17</value>
+  </metadata>
   <metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>561, 17</value>
   </metadata>
@@ -356,6 +365,9 @@
   <metadata name="taHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>647, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>731, 17</value>
+  </metadata>
   <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>828, 17</value>
   </metadata>