cramoutn 값이 99억까지 가능하게 함

2025-01-17 10:28:44 +09:00
parent c80a03a81b
commit 42a6fd35e4
21 changed files with 4572 additions and 2372 deletions
--- a/SubProject/FPJ0000/Project/fPartList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs
--- a/SubProject/FPJ0000/Project/fPartList.cs
+++ b/SubProject/FPJ0000/Project/fPartList.cs
@@ -1,4 +1,5 @@
-using System;
+using AR;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -126,6 +127,22 @@ namespace FPJ0000
        }

        string sortkey = string.Empty;
+
+        void RefreshPrjectData()
+        {
+            try
+            {
+                //프로젝트 정보 채우기
+                this.ta.FillByIDX(this.dsPRJ.Projects, this.ProjectIndex);
+
+
+            }
+            catch (Exception ex)
+            {
+                FCOMMON.Util.MsgE(ex.Message);
+            }
+        }
+
        void RefreshData()
        {
            if (dsPRJ.HasChanges())
@@ -134,33 +151,27 @@ namespace FPJ0000
                if (dlg != System.Windows.Forms.DialogResult.Yes) return;
            }

-            try
+            RefreshPrjectData();
+
+            //order by 절은 다시 생성한다.
+            var SSQl = " SELECT  * FROM ProjectsPart WHERE Project  = @prj";
+            if (radSortGrp.Checked)
            {
-                //프로젝트 정보 채우기
-                this.ta.FillByIDX(this.dsPRJ.Projects, this.ProjectIndex);
-
-                //order by 절은 다시 생성한다.
-                var SSQl = " SELECT  * FROM ProjectsPart WHERE Project  = @prj";
-                if (radSortGrp.Checked)
-                {
-                    sortkey = "itemgroup asc,option1 asc ,no asc,itemname asc";
-                    //SSQl += " order by itemgroup,option1,no,itemname";
-                }
-                else if (radSortNo.Checked) sortkey = "no";
-                else sortkey = "qtyin";
-
-                SSQl += " order by " + sortkey;
-
-                this.dsPRJ.ProjectsPart.Clear();
-                var cmd = new System.Data.SqlClient.SqlCommand(SSQl, taPart.Connection);
-                cmd.Parameters.Add("prj", SqlDbType.Int).Value = this.ProjectIndex;
-                var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
-                da.Fill(this.dsPRJ.ProjectsPart);
-            }
-            catch (Exception ex)
-            {
-                FCOMMON.Util.MsgE(ex.Message);
+                sortkey = "itemgroup asc,option1 asc ,no asc,itemname asc";
+                //SSQl += " order by itemgroup,option1,no,itemname";
            }
+            else if (radSortNo.Checked) sortkey = "no";
+            else sortkey = "qtyin";
+
+            SSQl += " order by " + sortkey;
+
+            this.dsPRJ.ProjectsPart.Clear();
+            var cmd = new System.Data.SqlClient.SqlCommand(SSQl, taPart.Connection);
+            cmd.Parameters.Add("prj", SqlDbType.Int).Value = this.ProjectIndex;
+            var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
+            da.Fill(this.dsPRJ.ProjectsPart);
+
+

            //로딩후에 sid 와 suuply 를 조회해준다.
            //foreach (dsPRJ.ProjectsPartRow dr in this.dsPRJ.ProjectsPart.Rows)
@@ -243,8 +254,8 @@ namespace FPJ0000
                        row.ForeColor = Color.Gray;
                        row.BackColor = Color.WhiteSmoke;

-                        
-                       if(v_sid == "109028759")
+
+                        if (v_sid == "109028759")
                        {

                        }
@@ -331,7 +342,7 @@ namespace FPJ0000
                    }
                    else
                    {
-                        if(sidinfo.Request > 0)
+                        if (sidinfo.Request > 0)
                        {
                            구매요청 += 1;
                            row.ForeColor = Color.Black;
@@ -436,12 +447,20 @@ namespace FPJ0000
                s2 += dr.amtn;
            }

+            var drli = this.dsPRJ.Projects.FirstOrDefault();
+            if(drli != null)
+            {
+                var cramount = drli.cramount;
+                var jan1 = cramount - s1;
+                var jan2 = cramount - s2;
+                lbSum.Text = $"1대 금액 {s1:N0}(남음:{jan1:N0}원) / N대 금액 {s2:N0}(남음:{jan2:N0}원)";
+            }
+            else
+            {
+                lbSum.Text = $"1대 금액 {s1:N0}원 / N대 금액 {s2:N0}원";
+            }

-            //decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
-            //decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
-
-
-            lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", s1, s2);
+            
        }


@@ -901,19 +920,19 @@ namespace FPJ0000
        {
            using (var f = new Project.finputcurrency())
            {
-                if(f.ShowDialog() == DialogResult.OK)
+                if (f.ShowDialog() == DialogResult.OK)
                {
                    var cur = (decimal)f.Value;
                    var dlg = FCOMMON.Util.MsgQ("usd 단가가 입력된 자료의 단가를 자동 계산할까요?");
                    if (dlg != DialogResult.Yes) return;

-                    foreach(var dr in this.dsPRJ.ProjectsPart)
+                    foreach (var dr in this.dsPRJ.ProjectsPart)
                    {
                        if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) continue;
                        if (dr.IspriceDNull()) continue;
                        if (dr.priceD == 0) continue;
-                        dr.price = Math.Round(dr.priceD * cur,0);
-                        if(dr.IsqtyNull()==false)
+                        dr.price = Math.Round(dr.priceD * cur, 0);
+                        if (dr.IsqtyNull() == false)
                            dr.amt = dr.qty * dr.price;
                        if (dr.IsqtynNull() == false)
                            dr.amtn = dr.qtyn * dr.price;
@@ -924,5 +943,49 @@ namespace FPJ0000
                }
            }
        }
+
+
+
+        private void label1_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void tbOrderNo_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void panel2_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
+
+        private void tbIdx_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void nameTextBox_Click(object sender, EventArgs e)
+        {
+            var dr = this.dsPRJ.Projects.FirstOrDefault();
+            if (dr == null)
+            {
+                AR.UTIL.MsgE("프로젝트정보를 찾을 수 없습니다");
+                return;
+            }
+            using (var f = new fProjectData(dr))
+                if (f.ShowDialog() == DialogResult.OK)
+                {
+                    dr.EndEdit();
+                    var ta = new dsPRJTableAdapters.ProjectsTableAdapter();
+                    var cnt = this.ta.Update(dr);//.UpdateAll(this.dsMSSQL.Projects);t
+                    this.Validate();
+                    
+                }
+
+
+
+        }
    }
 }
--- a/SubProject/FPJ0000/Project/fPartList.resx
+++ b/SubProject/FPJ0000/Project/fPartList.resx
@@ -117,9 +117,6 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="pdateLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
  <metadata name="requestLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
@@ -144,6 +141,15 @@
  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="button4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -219,6 +225,12 @@
  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>100, 17</value>
  </metadata>
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>100, 17</value>
+  </metadata>
+  <metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
  <metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
@@ -360,20 +372,20 @@
  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF6XpmhrY
-        zVTMvM0pmtrQhUG2mEbmJVyiQhdRioIK7aJTm7c5pxvOyFymNu8X8LLUXc5x50y/PedsqYHQDz48L57z
-        /XB+33ME3ATf1cRfKNarw0v0v4VyPUVOmqeUOw10eHEvHfpIZzot0yp9It7u4UM7J+RBt3bRSi+bTCaX
-        xb4Oi22bZSsHjZ/zVuR9mkZ0ybBDlKHa64m6J6xQt8iFeycZGKZYGKZZ6CdZ6Cac0PxaR/OQHess0DBM
-        Ie/DFJKemKh/JEJ5M7XmcKJ/xoWvMyw5WfTxEie6zOv4MuQggg30z7tgmGNQoJpG4J3213w4qjRg/Jo8
-        YlNSeQVJFVdR0VKL/LpSBMp9EUAQFZxCsOI4yhrK+FVsNIuFFQeC47pYXhBZHPi+fbARjaPPUaHP4SVx
-        5aHIeRWLzNpoiKsuIrEqEQ0DC2g02fD5+xpWSU9CRTfNC0RK0V4feZZLP9KJl4MKFGkyeEl8ZRgJX0Lq
-        0xRozXZ+lbZRCmrSw4qdgTC/xy3gJqSwi5ZWJ8Bo1qHKcBsPW7MRVXoO8eURME46YCTFcgVrx9ydWIgg
-        WLFDcOaenDmRexCxShH6x3pR0JkGhUqK6MdBqNV8xLdZFkZSbO8Egx7CopVB4H2P4KjMS+IvO4DMmhhc
-        rwxBTNl5XiJVxUJWl0LeJAjcff+0C33cJyZYSZF+WTq3wF+2b9Zftp885AX/HC9cLgpC+rMEaIfUKFDn
-        Iu1dAsSVkTASgYH8G3oioJkNItBsr3A2q5ueX6UxMOvi6RqZw63qVCSToKQqGtk1N7fuOBxOFxHUbws4
-        24xlW/A/7NwKKTsEJ6UdDuWLN5u7PbwbHR0dG4fjGmyeOCkytXV8as1h5S7GlyiML1Iwe1iyMTxc8zba
-        HaYoatX7RtMPT1wgOJbaku4nbm49IlFb/CT19BbJbnz/Iq6nvcVNK4cSm9p8E1RJAoFA8AcA2Z4MAUEQ
-        ugAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pzNjWw
+        m6mYeZtTNDXRhUG2mEamLjTR0QVRjF5UaJc5tXmbc7rhjMxlavN+AS9L3eUc3Zl+e87ZcgZCP/jwvHjO
+        98P5fc/hsSO4r0m4VKpXR5Tpf4dI9RQ5aQ45exroiNI+OuyJznRWoq3wi3y7jwvtntBHPdolK71iMplc
+        FvsGLDYvK1YWGj8XrCj4NIOYshGHMFO13xN1T3ixbokN9005YZhmYJhhoJ9ioJvchObXBlqG7dhgAOUI
+        hYIP00h+ZqL+kYRIW6h1xyYGZl34OsuQk0E/J9lEt3kDX4YdRLCFgQUXDPNOFKlmEHSv4w0XjpYHTtyQ
+        Rm6Lq68hueo6qlrrUNggR5DUH4EEYdEZCGQnUa4s51ax0QwWVx0QxHcznCCqNOh9x1ATmsZeoUqfx0ni
+        K8OQ9zoOWXUxECkuI0mRBOXgIppMNnz+vo410lOIrIfmBMIK4X4/abZLP9qF+iEZSjSZnCShOpyEryDt
+        RSq0Zju3SvsYBTXpYdXuREhhr1vATmhxN51TkwijWQeF4S4et+UiWn4BCZWRME45YCTFsgVrx92dWIhA
+        INslOPdA6jyVfxhxFUIMjPehqCsdMlUOYp4Go07zEd/mGBhJsX2TTvQSlqxOBD30CI5LfMR8ySFk1cbi
+        ZnUoYssvcpIcVRwkDankTYLB3g/MuNDPfmKClRQZkK1zC/iSA3N8yUHykA/4eT64WhKMjJeJ0A6rUaTO
+        R/q7RIiqo2AkAgP5N/REQDu3iEDjXeF8dg+9sEZjcM7F0T06jzs1aUghQbEiBrm1t3fuWBybLiJo9ApY
+        26zFK/gfdnaF1F2C0zmdDvnz+u29Ht6Lzs7OraPxSpsnTopMa5uYXndY2YuJZQoTSxTMHpZtTg62eRvt
+        DlMUteZ7q/mHJ87jnUhrzQgQtbQdE6stAeJGeocUN/5/ETXSvqLm1SNJze3+iapkHo/H+wP4Hp4AQQts
+        cwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -406,30 +418,6 @@
        4PP5KGnqmfqFyWSisPDEcgfLVReWv7hBcOReQMgN4abq6g/2gDQWZmd8fHzY4XB8lcjD7IOMe+/68LkW
        ZORzJCpe3FIpzsKcmJjQSr8lG1epVML8/DxLWqPRYGRkBLdfXYddfAaLOMjIlszgZQfnGB0dhdFohE6n
        u+SAVypMDx09cIrPmTLtdL7I4F/AK69Z+1SK72SbdjpzHMf9Asu3+BhNj8g8AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="전체선택ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAABGJJREFUWEfd
-        mE1vG0UYxy3BDfgYvAhQ+xW44PiVnJDagmi4NEcghIBUDhyIa+/aqeCQhENzaDn10kpQ9QBtAyrx7toc
-        CJUSKIW0SK1UCTWJ1y4Qh+X5ObOKsxnH3o0dRP/SX+udZ56Zxzszz8vEHlkM5e3DyYL1brZUuZwp2itJ
-        w64nCuUm5He25PyGLJEvj9FXqQ0WrxSuP5XM2xNp0/59eOr72omzvzz88Mv7XuHauvdp+S9vutJskd+0
-        nRTZ6LlbjeHT1VqqaN9JGtb4Sx9de1IN1z/IoI8n89Z40rRrb84t1yevrHqz1c2eOSOc/HrVG5lbdhmD
-        L8+Yavj9IZ5beC5jOj+/9tmNWvFbV2tAGJrfuN7RmRu1dNH5KVG4/qyaJhpSpjWcMh33g4v3NnWT7Yfv
-        X7i7ydjxfDmrpguHRME+nik59VNX17UT9IOnrq55sjp12ddvqGl7A18O41gO3cD9JHNgZNxYyKjp9wZ7
-        jk8/yC8XZO7KmpcybTeVs59RZujByeJADGLPdePExXtN+TDLe57uITn+clrXdQMcBI/NLrqpvD2mzNmJ
-        lhMWH9UPVxKV5rzrpQx7XevMiRA4YZ0i/Hxx07v5xz9e/W+vBVeevJ+Tdl1/GEVn5Iw4c4k4yqxtEL5y
-        4u11Sgz4cGNrkiBo100YRQcScdIl57YyawsEc2IrIUmnxL8Gd1a3/z1P3gHyfuhAbMhOVd345HcvKvNY
-        XmucwK9TgCwNYMna23kHyNvbYRQdn2JLQ+L128q8WCw7VblMVqLrDH2EkfkItneTQbIgSdUuKfNk/xUr
-        K/n5zo7Zh07WiT7CymBegoQYeEuZJ6HNsF1yOF1n6EMn60QfYWXwk4U/vaRp1ZR5JAbl5rTT1HaGPnSy
-        TvQRVgannQ0vUbA2lHn/AwOjLHEQ7bJ2ebC9mwzuWuIohySIdlm7PNjeTQZ3HRKqL462rjP0EUbmI9je
-        TQZPfhFwMxQxoxEcNfQRbN+Pox49e7ORMqy3lHlySEzrEKVhL6EuOKGP9jao0+HZU6grVd2hvPOCMm8L
-        mVJlhUCtUyKGdgr8PsLo7JUsfPzVg93JAiDFoW7VKUEG5F/7SxdELzo8ee9kHDx+ZsklcVZmbYMkkYT1
-        IAqlTjTma62ENW7+8IQyaycSZnns2Ox/k/Kz945ML7o7spggKFio+CmqdYMMku9duNuUuZdePX/+MWWO
-        HlxHbJWda9qBBkEy+aREs5cN62llxt7gOiItxfRB7EeDwr3oNCSrT6vpewPXERhJUa0buB/ky3GDIX74
-        dTVtOHAdQcU/0ec9yYFgz7Gsob9cEFxHUPEfnfmxRt2qmzAMcSVHZCwORM97rhs43QnDfgcfNTK35BJx
-        OoVFHemLDk6YMYYkznY9rVHQcuYScTKmfXt4qsoVcIMsiPSodQUsSS/kN21kJSck8Etm4mYkpSNCaG8N
-        BgGCOU5VYvilbNH5lf3kX6KTANNGykSfZM56Xqk9aojF/gULrkqYb3L8uAAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -460,6 +448,30 @@
        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="전체선택ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAABGJJREFUWEfd
+        mE1vG0UYxy3BDfgYvAhQ+xW44PiVnJDagmi4NEcghIBUDhyIa+/aqeCQhENzaDn10kpQ9QBtAyrx7toc
+        CJUSKIW0SK1UCTWJ1y4Qh+X5ObOKsxnH3o0dRP/SX+udZ56Zxzszz8vEHlkM5e3DyYL1brZUuZwp2itJ
+        w64nCuUm5He25PyGLJEvj9FXqQ0WrxSuP5XM2xNp0/59eOr72omzvzz88Mv7XuHauvdp+S9vutJskd+0
+        nRTZ6LlbjeHT1VqqaN9JGtb4Sx9de1IN1z/IoI8n89Z40rRrb84t1yevrHqz1c2eOSOc/HrVG5lbdhmD
+        L8+Yavj9IZ5beC5jOj+/9tmNWvFbV2tAGJrfuN7RmRu1dNH5KVG4/qyaJhpSpjWcMh33g4v3NnWT7Yfv
+        X7i7ydjxfDmrpguHRME+nik59VNX17UT9IOnrq55sjp12ddvqGl7A18O41gO3cD9JHNgZNxYyKjp9wZ7
+        jk8/yC8XZO7KmpcybTeVs59RZujByeJADGLPdePExXtN+TDLe57uITn+clrXdQMcBI/NLrqpvD2mzNmJ
+        lhMWH9UPVxKV5rzrpQx7XevMiRA4YZ0i/Hxx07v5xz9e/W+vBVeevJ+Tdl1/GEVn5Iw4c4k4yqxtEL5y
+        4u11Sgz4cGNrkiBo100YRQcScdIl57YyawsEc2IrIUmnxL8Gd1a3/z1P3gHyfuhAbMhOVd345HcvKvNY
+        XmucwK9TgCwNYMna23kHyNvbYRQdn2JLQ+L128q8WCw7VblMVqLrDH2EkfkItneTQbIgSdUuKfNk/xUr
+        K/n5zo7Zh07WiT7CymBegoQYeEuZJ6HNsF1yOF1n6EMn60QfYWXwk4U/vaRp1ZR5JAbl5rTT1HaGPnSy
+        TvQRVgannQ0vUbA2lHn/AwOjLHEQ7bJ2ebC9mwzuWuIohySIdlm7PNjeTQZ3HRKqL462rjP0EUbmI9je
+        TQZPfhFwMxQxoxEcNfQRbN+Pox49e7ORMqy3lHlySEzrEKVhL6EuOKGP9jao0+HZU6grVd2hvPOCMm8L
+        mVJlhUCtUyKGdgr8PsLo7JUsfPzVg93JAiDFoW7VKUEG5F/7SxdELzo8ee9kHDx+ZsklcVZmbYMkkYT1
+        IAqlTjTma62ENW7+8IQyaycSZnns2Ox/k/Kz945ML7o7spggKFio+CmqdYMMku9duNuUuZdePX/+MWWO
+        HlxHbJWda9qBBkEy+aREs5cN62llxt7gOiItxfRB7EeDwr3oNCSrT6vpewPXERhJUa0buB/ky3GDIX74
+        dTVtOHAdQcU/0ec9yYFgz7Gsob9cEFxHUPEfnfmxRt2qmzAMcSVHZCwORM97rhs43QnDfgcfNTK35BJx
+        OoVFHemLDk6YMYYkznY9rVHQcuYScTKmfXt4qsoVcIMsiPSodQUsSS/kN21kJSck8Etm4mYkpSNCaG8N
+        BgGCOU5VYvilbNH5lf3kX6KTANNGykSfZM56Xqk9aojF/gULrkqYb3L8uAAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -474,4 +486,10 @@
  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>712, 18</value>
  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>614, 18</value>
+  </metadata>
+  <metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>863, 18</value>
+  </metadata>
 </root>
--- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs
--- a/SubProject/FPJ0000/Project/fProjectData.cs
+++ b/SubProject/FPJ0000/Project/fProjectData.cs
@@ -123,6 +123,7 @@ namespace FPJ0000
            this.cmbState.Text = dr.status;
            this.cmbReqTeam.Text = dr.part;
            this.tbDue.Text = dr.crdue;
+            this.nudCRAmount.Value = dr.cramount;

            this.cmbReqSite.Text = dr.ReqSite;
            this.cmbReqPlant.Text = dr.ReqPlant;
@@ -339,6 +340,7 @@ namespace FPJ0000
            //    var ucnt = taq.UpdateProjectCompleteMessage(rtBack.Rtf, rtDesc.Rtf, rtBef.Rtf, rtAft.Rtf, dr.idx);
            //}

+            this.dr.cramount = nudCRAmount.Value;
            this.dr.crdue = tbDue.Text.Trim();
            this.dr.EndEdit();

@@ -761,5 +763,15 @@ namespace FPJ0000
            if (f.ShowDialog() == DialogResult.OK)
                rt.Rtf = f.richTextBoxEx1.Rtf;
        }
+
+        private void label10_Click(object sender, EventArgs e)
+        {
+            SelectDate(tbDue);
+        }
+
+        private void arLabel2_Click(object sender, EventArgs e)
+        {
+            
+        }
    }
 }
--- a/SubProject/FPJ0000/Project/fProjectData.resx
+++ b/SubProject/FPJ0000/Project/fProjectData.resx
@@ -168,9 +168,6 @@
  <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
-  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
  <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
@@ -201,6 +198,12 @@
  <metadata name="label18.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
+  <metadata name="label19.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label20.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>100, 17</value>
  </metadata>
@@ -214,7 +217,7 @@
  <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/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 +228,7 @@
  <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 +237,7 @@
  <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
        oAc0QjgAAAAASUVORK5CYII=
@@ -243,7 +246,7 @@
  <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/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
@@ -368,22 +371,22 @@
  <metadata name="bsEPanel.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>537, 56</value>
  </metadata>
-  <metadata name="bsAssembly.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>398, 56</value>
-  </metadata>
  <metadata name="bsDesignID.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>259, 56</value>
  </metadata>
  <metadata name="bsChampionID.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>120, 56</value>
  </metadata>
+  <metadata name="bsAssembly.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>398, 56</value>
+  </metadata>
  <metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>566, 17</value>
  </metadata>
  <data name="bindingNavigatorMoveFirstItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/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 +397,7 @@
  <data name="bindingNavigatorMovePreviousItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 +406,7 @@
  <data name="bindingNavigatorMoveNextItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
        oAc0QjgAAAAASUVORK5CYII=
@@ -412,7 +415,7 @@
  <data name="bindingNavigatorMoveLastItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/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 +426,7 @@
  <data name="btwADd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/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 +453,7 @@
  <data name="btwDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -468,7 +471,7 @@
  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/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 +482,7 @@
  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 +491,7 @@
  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
        oAc0QjgAAAAASUVORK5CYII=
@@ -497,7 +500,7 @@
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/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 +511,7 @@
  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/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 +538,7 @@
  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
--- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
@@ -57,6 +57,7 @@
            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = 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.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
            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();
@@ -65,7 +66,8 @@
            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 numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = 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();
@@ -702,6 +704,7 @@
            this.fpSpread1.Size = new System.Drawing.Size(1339, 261);
            this.fpSpread1.StatusBarVisible = true;
            this.fpSpread1.TabIndex = 2;
+            this.fpSpread1.SetViewportLeftColumn(0, 0, 13);
            // 
            // fpSpread1_Sheet1
            // 
@@ -709,7 +712,7 @@
            this.fpSpread1_Sheet1.SheetName = "Sheet1";
            // Formulas and custom names must be loaded with R1C1 reference style
            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.fpSpread1_Sheet1.ColumnCount = 40;
+            this.fpSpread1_Sheet1.ColumnCount = 42;
            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
@@ -732,22 +735,23 @@
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).StyleName = " ";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "Input\r\n($K)";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "Effect\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 3;
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Budget";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).ColumnSpan = 4;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Human Resource";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).ColumnSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "Comment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "Comment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).ColumnSpan = 4;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "Ext.Info";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "Cost Save";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "Fan Out";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).ColumnSpan = 4;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "Human Resource";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).ColumnSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "Comment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "Comment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 34).ColumnSpan = 4;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 34).Value = "Ext.Info";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).Value = "High\r\nLight";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).Value = "Cost Save";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 39).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 39).Value = "Major\r\nItem";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 39).Value = "Fan Out";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 40).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 40).Value = "High\r\nLight";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 41).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 41).Value = "Major\r\nItem";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Project\r\nNo";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Process / Equipment";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "Site";
@@ -771,19 +775,21 @@
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "Cost Save ($k)/Set";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "SFI";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "SCR/CF";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "Champion";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "S/W";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Design";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "ePanel";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "History";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 31).Value = "Memo";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 32).Value = "Asset";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 33).Value = "Model#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 34).Value = "Serial#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 35).Value = "자스민";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 36).Value = "Cost\r\nSave";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 37).Value = "Fan\r\nOut";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 38).Value = "High\r\nLight";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "CR\r\nDue";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "CR\r\nAmount";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Champion";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "S/W";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "Design";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 31).Value = "ePanel";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 32).Value = "History";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 33).Value = "Memo";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 34).Value = "Asset";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 35).Value = "Model#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 36).Value = "Serial#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 37).Value = "자스민";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 38).Value = "Cost\r\nSave";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 39).Value = "Fan\r\nOut";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 40).Value = "High\r\nLight";
            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)))));
@@ -949,80 +955,92 @@
            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType16;
            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "orderno";
            this.fpSpread1_Sheet1.Columns.Get(25).Label = "SCR/CF";
-            this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true;
            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType17;
-            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "name_champion";
+            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "crdue";
            this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(26).Label = "Champion";
+            this.fpSpread1_Sheet1.Columns.Get(26).Label = "CR\r\nDue";
            this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType18;
-            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "name_software";
-            this.fpSpread1_Sheet1.Columns.Get(27).Label = "S/W";
+            numberCellType11.MaximumValue = 999999999999999D;
+            numberCellType11.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "cramount";
+            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(27).Label = "CR\r\nAmount";
+            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 = textCellType19;
-            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_design";
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_champion";
            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(28).Label = "Design";
+            this.fpSpread1_Sheet1.Columns.Get(28).Label = "Champion";
            this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(29).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType20;
-            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "name_epanel";
-            this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(29).Label = "ePanel";
-            this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType21;
-            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "lasthistory";
-            this.fpSpread1_Sheet1.Columns.Get(30).Label = "History";
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType22;
-            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "memo";
-            this.fpSpread1_Sheet1.Columns.Get(31).Label = "Memo";
-            this.fpSpread1_Sheet1.Columns.Get(31).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType23;
-            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "asset";
-            this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(32).Label = "Asset";
-            this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType24;
-            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "model";
-            this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(33).Label = "Model#";
-            this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(34).CellType = textCellType25;
-            this.fpSpread1_Sheet1.Columns.Get(34).DataField = "serial";
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "name_software";
+            this.fpSpread1_Sheet1.Columns.Get(29).Label = "S/W";
+            this.fpSpread1_Sheet1.Columns.Get(30).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "name_design";
+            this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(30).Label = "Design";
+            this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(31).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "name_epanel";
+            this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(31).Label = "ePanel";
+            this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "lasthistory";
+            this.fpSpread1_Sheet1.Columns.Get(32).Label = "History";
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "memo";
+            this.fpSpread1_Sheet1.Columns.Get(33).Label = "Memo";
+            this.fpSpread1_Sheet1.Columns.Get(33).Width = 77F;
+            this.fpSpread1_Sheet1.Columns.Get(34).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(34).DataField = "asset";
            this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(34).Label = "Serial#";
+            this.fpSpread1_Sheet1.Columns.Get(34).Label = "Asset";
            this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType11.DecimalPlaces = 0;
-            numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType11.MaximumValue = 2147483647D;
-            numberCellType11.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(35).CellType = numberCellType11;
-            this.fpSpread1_Sheet1.Columns.Get(35).DataField = "jasmin";
+            this.fpSpread1_Sheet1.Columns.Get(35).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(35).DataField = "model";
            this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(35).Label = "자스민";
+            this.fpSpread1_Sheet1.Columns.Get(35).Label = "Model#";
            this.fpSpread1_Sheet1.Columns.Get(35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(36).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(36).DataField = "bCost";
-            this.fpSpread1_Sheet1.Columns.Get(36).Label = "Cost\r\nSave";
-            this.fpSpread1_Sheet1.Columns.Get(36).Tag = "costsave";
-            this.fpSpread1_Sheet1.Columns.Get(36).Width = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(37).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(37).DataField = "bFanOut";
-            this.fpSpread1_Sheet1.Columns.Get(37).Label = "Fan\r\nOut";
-            this.fpSpread1_Sheet1.Columns.Get(37).Width = 44F;
+            this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType26;
+            this.fpSpread1_Sheet1.Columns.Get(36).DataField = "serial";
+            this.fpSpread1_Sheet1.Columns.Get(36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(36).Label = "Serial#";
+            this.fpSpread1_Sheet1.Columns.Get(36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType12.DecimalPlaces = 0;
+            numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType12.MaximumValue = 2147483647D;
+            numberCellType12.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(37).CellType = numberCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(37).DataField = "jasmin";
+            this.fpSpread1_Sheet1.Columns.Get(37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(37).Label = "자스민";
+            this.fpSpread1_Sheet1.Columns.Get(37).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(38).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(38).CellType = checkBoxCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(38).DataField = "bHighlight";
-            this.fpSpread1_Sheet1.Columns.Get(38).Label = "High\r\nLight";
-            this.fpSpread1_Sheet1.Columns.Get(38).Tag = "Highlight";
-            this.fpSpread1_Sheet1.Columns.Get(38).Width = 39F;
+            this.fpSpread1_Sheet1.Columns.Get(38).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(38).DataField = "bCost";
+            this.fpSpread1_Sheet1.Columns.Get(38).Label = "Cost\r\nSave";
+            this.fpSpread1_Sheet1.Columns.Get(38).Tag = "costsave";
+            this.fpSpread1_Sheet1.Columns.Get(38).Width = 44F;
            this.fpSpread1_Sheet1.Columns.Get(39).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(39).CellType = checkBoxCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(39).DataField = "bmajoritem";
-            this.fpSpread1_Sheet1.Columns.Get(39).Tag = "majoritem";
+            this.fpSpread1_Sheet1.Columns.Get(39).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(39).DataField = "bFanOut";
+            this.fpSpread1_Sheet1.Columns.Get(39).Label = "Fan\r\nOut";
+            this.fpSpread1_Sheet1.Columns.Get(39).Width = 44F;
+            this.fpSpread1_Sheet1.Columns.Get(40).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(40).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(40).DataField = "bHighlight";
+            this.fpSpread1_Sheet1.Columns.Get(40).Label = "High\r\nLight";
+            this.fpSpread1_Sheet1.Columns.Get(40).Tag = "Highlight";
+            this.fpSpread1_Sheet1.Columns.Get(40).Width = 39F;
+            this.fpSpread1_Sheet1.Columns.Get(41).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(41).CellType = checkBoxCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(41).DataField = "bmajoritem";
+            this.fpSpread1_Sheet1.Columns.Get(41).Tag = "majoritem";
            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
            this.fpSpread1_Sheet1.DataSource = this.bs;
            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
--- a/SubProject/FPJ0000/Project/fProjectList.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.cs
@@ -224,7 +224,7 @@ namespace FPJ0000
                "dbo.getUserName2(epanelid,userhw2) as name_epanel," +
                "dbo.getUserName2(softwareid,usersub) as name_software,category," +
                "ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate,jasmin,sfi,'' AS lasthistoryD," +
-                "(select max(pdate) from ProjectsHistory where pidx = Projects.idx) as lasthistory_date,dbo.getLastProjectScheduleNo(gcode,idx) as lastSchNo" +
+                "(select max(pdate) from ProjectsHistory where pidx = Projects.idx) as lasthistory_date,dbo.getLastProjectScheduleNo(gcode,idx) as lastSchNo,cramount" +
                " FROM Projects";
            //string State_Select = " SELECT  [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects";
            string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and ";
@@ -399,8 +399,12 @@ namespace FPJ0000

            try
            {
-                this.ta.Update(this.dsMSSQL.Projects);//.UpdateAll(this.dsMSSQL.Projects);
-                dsMSSQL.Projects.AcceptChanges();
+                var cnt = this.ta.Update(this.dsMSSQL.Projects);//.UpdateAll(this.dsMSSQL.Projects);
+                if(cnt == 0)
+                {
+                    util.MsgI("변경된 내용이 없습니다");
+                }
+                else dsMSSQL.Projects.AcceptChanges();
                FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
            }
            catch (Exception ex)