..

2023-06-22 10:07:11 +09:00
parent 772cf9faeb
commit b04b79b5f5
27 changed files with 4487 additions and 4575 deletions
--- 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.06.11.2350")]
-[assembly: AssemblyFileVersion("23.06.11.2350")]
+[assembly: AssemblyVersion("23.06.22.0930")]
+[assembly: AssemblyFileVersion("23.06.22.0930")]
--- a/SubProject/FCOMMON/DataBaseManager.cs
+++ b/SubProject/FCOMMON/DataBaseManager.cs
@@ -763,7 +763,7 @@ namespace FCOMMON
            where = string.Format(where, GroupCode);
            return getTwoColumnList("Common", "code", "memo", where, "code");
        }
-        public static string getCodeSavlue(string GroupCode, string code)
+        public static string getCodeSvalue(string GroupCode, string code)
        {
            var cn = getCn();
            cn.Open();
@@ -779,6 +779,22 @@ namespace FCOMMON
            cn.Dispose();
            return data.ToString();
        }
+        public static float getCodeFvalue(string GroupCode, string code)
+        {
+            var cn = getCn();
+            cn.Open();
+            var sql = "select isnull(FValue,0)" +
+                      " from Common" +
+                      " where gcode='" + FCOMMON.info.Login.gcode + "' and  Grp = '{0}' and code = '{1}'";
+
+            sql = string.Format(sql, GroupCode, code);
+            var cmd = new SqlCommand(sql, cn);
+            var data = cmd.ExecuteScalar();
+            cmd.Dispose();
+            cn.Close();
+            cn.Dispose();
+            return float.Parse(data.ToString());
+        }

        public struct sCodeData
        {
--- a/SubProject/FCOMMON/Util_Form.cs
+++ b/SubProject/FCOMMON/Util_Form.cs
@@ -27,7 +27,7 @@ namespace FCOMMON
        /// <param name="pathlist"></param>
        public static void OpenSharedPath(List<string> subdir, params string[] pathlist)
        {
-            var serverpath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var serverpath = FCOMMON.DBM.getCodeSvalue("55", "01");
            //var serverpath = FCOMMON.info.datapath;
            if (System.IO.Directory.Exists(serverpath) == false)
            {
--- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
@@ -970,7 +970,7 @@ namespace FEQ0000

        private void button7_Click(object sender, EventArgs e)
        {
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "02");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "02");
            if (datapath.isEmpty())
            {
                FCOMMON.Util.MsgE("견적서 기본폴더 공용코드 55-02 값을 입력하세요");
--- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs
+++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs
@@ -869,7 +869,7 @@ namespace FEQ0000

        private void button7_Click(object sender, EventArgs e)
        {
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "02");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "02");
            if (datapath.isEmpty())
            {
                FCOMMON.Util.MsgE("견적서 기본폴더 공용코드 55-02 값을 입력하세요");
--- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs
@@ -29,6 +29,8 @@
        private void InitializeComponent()
        {
            this.panel1 = new System.Windows.Forms.Panel();
+            this.linkLabel2 = new System.Windows.Forms.LinkLabel();
+            this.linkLabel1 = new System.Windows.Forms.LinkLabel();
            this.btSave = new System.Windows.Forms.Button();
            this.cmbUser = new System.Windows.Forms.ComboBox();
            this.label4 = new System.Windows.Forms.Label();
@@ -41,8 +43,7 @@
            this.btRefresh = new System.Windows.Forms.Button();
            this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
-            this.linkLabel1 = new System.Windows.Forms.LinkLabel();
-            this.linkLabel2 = new System.Windows.Forms.LinkLabel();
+            this.progressBar1 = new System.Windows.Forms.ProgressBar();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
@@ -70,6 +71,28 @@
            this.panel1.Size = new System.Drawing.Size(1102, 58);
            this.panel1.TabIndex = 1;
            // 
+            // linkLabel2
+            // 
+            this.linkLabel2.AutoSize = true;
+            this.linkLabel2.Location = new System.Drawing.Point(475, 12);
+            this.linkLabel2.Name = "linkLabel2";
+            this.linkLabel2.Size = new System.Drawing.Size(41, 12);
+            this.linkLabel2.TabIndex = 15;
+            this.linkLabel2.TabStop = true;
+            this.linkLabel2.Text = "이전달";
+            this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
+            // 
+            // linkLabel1
+            // 
+            this.linkLabel1.AutoSize = true;
+            this.linkLabel1.Location = new System.Drawing.Point(522, 12);
+            this.linkLabel1.Name = "linkLabel1";
+            this.linkLabel1.Size = new System.Drawing.Size(41, 12);
+            this.linkLabel1.TabIndex = 14;
+            this.linkLabel1.TabStop = true;
+            this.linkLabel1.Text = "다음달";
+            this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+            // 
            // btSave
            // 
            this.btSave.Dock = System.Windows.Forms.DockStyle.Right;
@@ -169,7 +192,7 @@
            this.fpSpread1.Name = "fpSpread1";
            this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
            this.fpSpread1_Sheet1});
-            this.fpSpread1.Size = new System.Drawing.Size(1102, 592);
+            this.fpSpread1.Size = new System.Drawing.Size(1102, 566);
            this.fpSpread1.TabIndex = 4;
            // 
            // fpSpread1_Sheet1
@@ -177,27 +200,13 @@
            this.fpSpread1_Sheet1.Reset();
            this.fpSpread1_Sheet1.SheetName = "Sheet1";
            // 
-            // linkLabel1
+            // progressBar1
            // 
-            this.linkLabel1.AutoSize = true;
-            this.linkLabel1.Location = new System.Drawing.Point(522, 12);
-            this.linkLabel1.Name = "linkLabel1";
-            this.linkLabel1.Size = new System.Drawing.Size(41, 12);
-            this.linkLabel1.TabIndex = 14;
-            this.linkLabel1.TabStop = true;
-            this.linkLabel1.Text = "다음달";
-            this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
-            // 
-            // linkLabel2
-            // 
-            this.linkLabel2.AutoSize = true;
-            this.linkLabel2.Location = new System.Drawing.Point(475, 12);
-            this.linkLabel2.Name = "linkLabel2";
-            this.linkLabel2.Size = new System.Drawing.Size(41, 12);
-            this.linkLabel2.TabIndex = 15;
-            this.linkLabel2.TabStop = true;
-            this.linkLabel2.Text = "이전달";
-            this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
+            this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.progressBar1.Location = new System.Drawing.Point(0, 624);
+            this.progressBar1.Name = "progressBar1";
+            this.progressBar1.Size = new System.Drawing.Size(1102, 26);
+            this.progressBar1.TabIndex = 5;
            // 
            // fJobChartMenu
            // 
@@ -205,6 +214,7 @@
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1102, 650);
            this.Controls.Add(this.fpSpread1);
+            this.Controls.Add(this.progressBar1);
            this.Controls.Add(this.panel1);
            this.Name = "fJobChartMenu";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -236,5 +246,6 @@
        private System.Windows.Forms.Button btSave;
        private System.Windows.Forms.LinkLabel linkLabel2;
        private System.Windows.Forms.LinkLabel linkLabel1;
+        private System.Windows.Forms.ProgressBar progressBar1;
    }
 }
--- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
@@ -109,6 +109,11 @@ namespace FPJ0000.JobReport_
        {
            var db = new EEEntities();

+            progressBar1.Value = 0;
+            progressBar1.Maximum = 10;
+
+
+            fpSpread1.Visible = false;

            //조회공정
            this.fpSpread1.Sheets[0].Cells[3, 2].Value = tbProcess.Text;
@@ -141,24 +146,25 @@ namespace FPJ0000.JobReport_

            //사용자목록을 가져온다
            List<vJobReportForUser> baseData;
+            var userCount = 0;
            if (cmbUser.SelectedIndex > 0)
            {
                //사용자번호 
                var UserNo = getUserID();// cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1);
-                baseData = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo).OrderBy(t => t.name).ToList();
+                userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo).GroupBy(t=>t.id).Count();
            }
            else if (tbProcess.SelectedIndex > 0)
            {
-                baseData = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).OrderBy(t => t.name).ToList();
+                userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).GroupBy(t => t.id).Count();
            }
            else
            {
-                baseData = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name).ToList();
+                userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).GroupBy(t => t.id).Count();
            }


            //사용자로 그룹해서 수량을 세명 , 사용자 숫자가 된다.
-            this.fpSpread1.Sheets[0].Cells[3, 7].Value = baseData.GroupBy(t => t.id).Count(); //인원수
+            this.fpSpread1.Sheets[0].Cells[3, 7].Value = userCount;// baseData.GroupBy(t => t.id).Count(); //인원수

            var col = 0;
            var row = 0;
@@ -260,8 +266,11 @@ namespace FPJ0000.JobReport_
            var orProcess = baseData.OrderBy(t => t.requestpart).GroupBy(t => t.requestpart);
            this.fpSpread1.Sheets[0].RowCount = 7 + orProcess.Count() + 1;

+            progressBar1.Value = 0;
+            progressBar1.Maximum = orProcess.Count();
            foreach (var item in orProcess)
            {
+                progressBar1.Value += 1;
                var RequestPart = item.FirstOrDefault().requestpart;
                this.fpSpread1.Sheets[0].Cells[row, 1].Value = RequestPart;

@@ -449,6 +458,9 @@ namespace FPJ0000.JobReport_

            this.fpSpread1.Sheets[0].RowCount = row + 1;

+            fpSpread1.Visible = true;
+
+            //FCOMMON.Util.MsgI("조회 완료");

        }

--- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.resx
+++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.resx
@@ -120,7 +120,4 @@
  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
-  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>
--- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
@@ -721,7 +721,7 @@
            dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
            dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
            dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType1.TimeDefault = new System.DateTime(2023, 3, 17, 22, 53, 4, 0);
+            dateTimeCellType1.TimeDefault = new System.DateTime(2023, 6, 21, 22, 53, 4, 0);
            this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1;
            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart";
            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -732,7 +732,7 @@
            dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
            dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
            dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType2.TimeDefault = new System.DateTime(2023, 3, 17, 22, 53, 4, 0);
+            dateTimeCellType2.TimeDefault = new System.DateTime(2023, 6, 21, 22, 53, 4, 0);
            this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2;
            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd";
            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -928,7 +928,7 @@
            // 태그자료만조회ToolStripMenuItem
            // 
            this.태그자료만조회ToolStripMenuItem.Name = "태그자료만조회ToolStripMenuItem";
-            this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+            this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.태그자료만조회ToolStripMenuItem.Text = "태그자료만 조회";
            this.태그자료만조회ToolStripMenuItem.Click += new System.EventHandler(this.태그자료만조회ToolStripMenuItem_Click);
            // 
--- a/SubProject/FPJ0000/JobReport_/fJobReport.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs
@@ -262,9 +262,13 @@ namespace FPJ0000


            //사용자 목록다중선택으로 인해 처리
-            var sql = "SELECT *, dbo.getUserName(uid) AS username,  dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue";
+            var sql = "SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description," +
+                        "remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot," +
+                        "dbo.getWorkWeek(pdate) AS ww, process, tag," +
+                        "dbo.getCodeSValue(gcode, '15', type) AS svalue," +
+                        "otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otwuid, ottime";
            sql += " FROM JobReport";
-            sql += " WHERE(pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)";
+            sql += " WHERE (gcode = @gcode) and (pdate BETWEEN @sd AND @ed)";
            if (request != "%")
            {
                //사용자가 지정되어있다
@@ -294,6 +298,7 @@ namespace FPJ0000
            var da = new System.Data.SqlClient.SqlDataAdapter(cmd);

            dsMSSQL.JobReport.Clear();
+            dsMSSQL.JobReport.AcceptChanges();
            da.Fill(this.dsMSSQL.JobReport);
            dsMSSQL.JobReport.AcceptChanges();

--- a/SubProject/FPJ0000/JobReport_/fJobReport.resx
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx
@@ -243,20 +243,20 @@
  <data name="toolStripButton10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSapFRL0pTmxrY
-        zVTMvM0pmprowiBbTCPzEpqoUCFK0YsK7aJTm5rbnG44S3OZlznvgpel7nKO7pz57TlnSw2EfvDhefGc
-        74fz+54j4Cbovir+UolOGV6q+x0s01HkpHnKuFNPh5f00qFPtMazUk3FkYi3+/jQ7gl51K1ZstIrxhET
-        a7FvwGLbYcXKQePXghX5n2YQXTriEGUo9nui7gkr0i4Nj5nZ3ikn9NMM9DMMdFMMtJObUI1voHXYjg0G
-        aBqhkP9hGknPjNQ/kmBZK7Xu2ET/LItvsww5GfTxkk2oTRv4MuwgAhf6F1jo550oVMwg4F7nGz4cVeZv
-        viGL2JJUX0NS1XVUtdWjoKEMATIf+BNEhWcQJD+F8qZyfhUbzWBx1YGgRDXDCyJLAt53DjWjeewlqnS5
-        vCSuMhS5r2ORWR8Ncc1lJNYkomlwEc1GGz7/WMca6SlY3k3zAlGFaL+fLIvVjXbh1ZAcxaoMXhJfHUbC
-        V5D6PAUak51fpWOMgpL0sGp3Irigxy3gJqRITWfXJsBg0qJGfxeP23MQVXYB8ZURMEw5YCDFcgVrJtyd
-        WIggSL5LcO6BzOmXdxixFSL0T/SisCsNckU2op8Gol71EQNzDAyk2N5JJ3oIS1YnAh56BCekXhKh9BAy
-        62JwszoEMeUXeUm2IhbShhTyJoHg7vtnWPRxn5hgJUX6ZmndAqH0wJxQepA85AVhrheuFgci/UUCNMNK
-        FCrzkPYuAeLqSBiIQE/+DR0R0E4XEah2Vjif1U0vrNEYnGN51KPzuFObimQSlNREI6fu9vYdh2OTJYLG
-        HQFnm7XsCP6HnVshZZfgdPZXh+b76NZeD++FaXLadSyuyeaJkyJT283T6w6rZmDcZV6mYF6iYPKwbHPy
-        cM3baBYjpikXRVFr3rdafnriAsHJ1LZ0X3Fr+3GJ0uIraaS3SXbj8xdxI+0tblk9mtjS4ZOgSBIIBII/
-        aFuft/aGoE8AAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSamFRL0pTmxrY
+        zVTMdDqnaGqiC4NsMY3MS2iiQoUoRS8qtItObWpuc7rhtMz7bd4FL0vd5RzdOfPbc86WGgj94MPz4jnf
+        D+f3PUfATcBDdeyVQr0qtEj/O1Cup8hJ8xRzp4EOLeyig5/pBs7LtKXHwt4f4EN7J+hJh3bZQq8ODI+z
+        ZtsmzNZdVi0cNIYXLcj5MovIohG7KFV50B11TUi+bnlwdJLtmnbAMMPAMMtAP81AN7UF9fgmmoZs2GSA
+        +hEKOZ9mEP9igPpHEihvojbsW+iZY9E7x5CTQTcv2YJmYhPfhuxE4ETPIgvDggN5yln4PWh7x4cjin1N
+        t+Rh29KKG4gvv4ny5hrk1hbDT+4FX4Io7xwCFD4oqS/hV7HSDJbW7AgQaxheEF7o97GtvwENY69Rrs/i
+        JTFlwch6G420mkhIKq8irjIO9X1LaBiw4uuvDayTngIVHTQvEJWKDvrI01n9aDve9CtQoE7lJbEVISR8
+        DUkvE6GdsPGrtI5RUJEe1mwOBOZ2ugTcBOVr6IwqMYwTOlQa7uNpSyYiii8htiwMxmk7jKRYrmDtpKsT
+        MxEEKPYILjySO85kH0V0qQg9k13Ia0+GQpmByOf+qFF/xs95BkZSbNeUA52EZYsDfo/dglMyD6lQdgRp
+        1VG4XRGEqJLLvCRDGQ1ZbSJ5E39w9z2zLLq5T0ywkCK903UugVB2aF4oO0we8oAwywPXC/yR8koM7ZAK
+        eapsJH8QQ1IRDiMRGMi/oScC2uEkAvXuChfTO+jFdRp98yyPZnQB96qSkECC0spIZFbf3bnjsG+xRFC3
+        K+Bsc+Zdwf+wcSsk7hGczfhu1/SObO/38H6Mm6adJ2Lqre44KTKpxTSzYbdofow5TSsUTMsUJtysWB08
+        XPNWmsXw+JSToqh1zzuNg+64QHA6qTnFW9LUclKqMntL6+gdElx4/UVSR3tKGteOxzW2eomV8QKBQPAH
+        StmfpCX1GtcAAAAASUVORK5CYII=
 </value>
  </data>
  <data name="toolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -417,41 +417,41 @@
  <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANPSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx
+        C/giaowRQSiibC0Uyg6CyqKSuEaEQvdCK7tPqAmokWDUiFGgyCrHO+k0oT609w4JvvQk9/n+MjPn/ifX
+        wx133BGQh8dfX3hwzGy9f7QfDUfIOtyH+kN9qEvoRW18L+4d7MHdAz24s5+sfd2o2duN6rgu3N7TharY
+        TlTu7kTFrlcojyEr2oKyKAtKIy0oiTCjONyMIkkHlGFkhbajMKQdBcEma36QIZHf3nWWGQdFkAm5gaYJ
+        fnvXWW5cfqAJeQFG8Nu7zv/AycUswCXgyqLNUEbokSdpQ4FEh6LwDiqc3N9AD1zKkyuM1KL/8UfMTs2j
+        p/ED5CEaKpxsJwNQKI57cu2V77A4xfFaKlzuDj09UAiuONKER5e6sfBngacBP0cmIQtTUeFy/BiArLjS
+        qA5UnTJgemKWpwFzM/OoOWuEIthIhcv21dED2XCkFLFafH8/ztNseSHtR16wjhqX5cMApMVxR4kiXIO3
+        ms88y5auhiFy8KqZcJneLEBKXGG4HqYKx1IM94+S766VGZfppaUH0uCKIkgpLjqWYuzLbxTGqcl3Z2DG
+        3drOAHSFK4nkS2Gd42m2UlSfMYIMfUG4m54aeqAzHDe+FGE6DHV85Wm2PEvpgzxIKxiXsY0B6AzHzdb8
+        UB0G2x2BT5N7IQvUCsbdEKnpgc5w3OBXSkwoP6F3fMXT86g8TUBivSBc+lYGoDOcffArQvRoTOxyKMkv
+        UhJ5TCtk/jpmnHRLGz3QFc4+W2VBGuhL3/A8Wz71jSJT3MyMS9vMAqTA2c+5LLEKA20jPM8WS+0gMnxb
+        mHBpm1rpgbQ4rhDyAANyJCp8GxrjebY8SepBhncrNS51IwOQFmdvK/fNKRM0mBpf9LNASlN6kqC81FS4
+        6xsYgCw4e1uz/NSoP2d2KM2P4QlIfZqocCnrVfRAVpy9EBk+KmiUAzzPluyIFipc8joGoBCcvRBS75fo
+        JH8zM5NzsNQNIlXURIW7traFHigUZy+E1LMFKaLnBNeMdFEbFS5pDQtwCTjaQvyLS1rdTA/8H7irqxiA
+        BGddbtzllU30Vx/cRQ53V7KcuCsrms7z27vjjjv08fD4CwlIPe+HvHrCAAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs
@@ -548,6 +548,7 @@
            this.textBox1.Font = new System.Drawing.Font("굴림", 9F);
            this.textBox1.Location = new System.Drawing.Point(77, 55);
            this.textBox1.Name = "textBox1";
+            this.textBox1.ReadOnly = true;
            this.textBox1.Size = new System.Drawing.Size(108, 21);
            this.textBox1.TabIndex = 22;
            this.textBox1.Text = "0.000";
--- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
@@ -298,7 +298,7 @@ namespace FPJ0000.JobReport_
            {
                //신규자료가 아니라면 7일간만 편집을 허용한다
                var enableBlock = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.jobreport_editblock);
-                if(enableBlock)
+                if (enableBlock)
                {
                    var writedate = DateTime.Now - DateTime.Parse(dr.pdate);
                    if (writedate.TotalDays > 7)
@@ -601,16 +601,23 @@ namespace FPJ0000.JobReport_
            this.dr.process = cmbProcess.Text;
            this.dr.tag = tbTag.Text.Trim();

-            if (getKisulInput)
-            {
-                this.dr.kisuldiv = cmb_kisuldiv.Text;
-                this.dr.kisullv = cmb_kisullv.Text;
-                this.dr.kisulamt = Decimal.Parse(textBox1.Text);
-            }

            if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
            else this.dr.hrs = 0;

+
+            if (getKisulInput)
+            {
+                //기술금액을 계산해야함
+                var price = FCOMMON.DBM.getCodeFvalue("51", cmb_kisullv.Text);
+                var amt = (dr.hrs + dr.ot) * price;
+
+                this.dr.kisuldiv = cmb_kisuldiv.Text;
+                this.dr.kisullv = cmb_kisullv.Text;
+                this.dr.kisulamt =(Decimal)amt; // Decimal.Parse(textBox1.Text);
+                textBox1.Text = amt.ToString();
+            }
+
            //this.dr.description = richTextBox1.Text.Trim();

            //MessageBox.Show(richTextBox1.Text);
--- a/SubProject/FPJ0000/Note/fNote.cs
+++ b/SubProject/FPJ0000/Note/fNote.cs
@@ -435,7 +435,7 @@ namespace FPJ0000.Note
            //        serverpath);
            //    return;
            //}
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var path = System.IO.Path.Combine(datapath,"Data","Note", dr.guid);
            if (System.IO.Directory.Exists(path) == false)
            {
--- a/SubProject/FPJ0000/Note/fNote_Add.cs
+++ b/SubProject/FPJ0000/Note/fNote_Add.cs
@@ -210,7 +210,7 @@ namespace FPJ0000.Note

        private void button1_Click_1(object sender, EventArgs e)
        {
-            var serverpath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var serverpath = FCOMMON.DBM.getCodeSvalue("55", "01");
           // var serverpath = FCOMMON.info.datapath;  // @"\\10.131.32.29\Data\Project";
            if (System.IO.Directory.Exists(serverpath) == false)
            {
--- a/SubProject/FPJ0000/Project/fPartList.cs
+++ b/SubProject/FPJ0000/Project/fPartList.cs
@@ -767,7 +767,7 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
--- a/SubProject/FPJ0000/Project/fProjectData.cs
+++ b/SubProject/FPJ0000/Project/fProjectData.cs
@@ -400,7 +400,7 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
@@ -520,7 +520,7 @@ namespace FPJ0000
                if (tbPath.Text.StartsWith("/")) tbPath.Text = tbPath.Text.Replace("/", "\\");
                else tbPath.Text = "\\" + tbPath.Text;
            }
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine("Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
--- a/SubProject/FPJ0000/Project/fProjectLayout.cs
+++ b/SubProject/FPJ0000/Project/fProjectLayout.cs
@@ -527,7 +527,7 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
--- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
@@ -30,37 +30,37 @@
        {
            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.NumberCellType numberCellType2 = 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.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.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 textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
-            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.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.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.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.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            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.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
+            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.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            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 numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            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.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.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.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType();
            this.bn = new System.Windows.Forms.BindingNavigator(this.components);
            this.bs = new System.Windows.Forms.BindingSource(this.components);
            this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -189,6 +189,12 @@
            this.button1 = new System.Windows.Forms.Button();
            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
            this.label17 = new System.Windows.Forms.Label();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.label31 = new System.Windows.Forms.Label();
+            this.sbDateMemo = new System.Windows.Forms.Label();
+            this.rtMemo = new System.Windows.Forms.RichTextBox();
+            this.bsHistD = new System.Windows.Forms.BindingSource(this.components);
+            this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter();
            ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
            this.bn.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -206,6 +212,8 @@
            this.toolStrip2.SuspendLayout();
            this.panel1.SuspendLayout();
            this.tableLayoutPanel3.SuspendLayout();
+            this.panel5.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bsHistD)).BeginInit();
            this.SuspendLayout();
            // 
            // bn
@@ -728,185 +736,185 @@
            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;
+            numberCellType10.DecimalPlaces = 0;
+            numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType10.MaximumValue = 2147483647D;
+            numberCellType10.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType10;
            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;
-            numberCellType2.DecimalPlaces = 0;
-            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType2.MaximumValue = 2147483647D;
-            numberCellType2.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2;
+            numberCellType11.DecimalPlaces = 0;
+            numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType11.MaximumValue = 2147483647D;
+            numberCellType11.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType11;
            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno";
            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo";
            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType23;
            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process";
            this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment";
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType24;
            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite";
            this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site";
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType25;
            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant";
            this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant";
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType26;
            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage";
            this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG";
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType27;
            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine";
            this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line";
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType28;
            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part";
            this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team";
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType29;
            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name";
            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
            this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title";
            this.fpSpread1_Sheet1.Columns.Get(8).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(9).CellType = numberCellType3;
+            numberCellType12.DecimalPlaces = 0;
+            numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType12.MaximumValue = 2147483647D;
+            numberCellType12.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType12;
            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate";
            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수(%)";
            this.fpSpread1_Sheet1.Columns.Get(9).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(10).CellType = numberCellType4;
+            numberCellType13.DecimalPlaces = 0;
+            numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType13.MaximumValue = 2147483647D;
+            numberCellType13.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType13;
            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj";
            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(10).Label = "완료(%)";
            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType30;
            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status";
            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status";
            this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status";
            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType31;
            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "kdate";
            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(12).Label = "검토\r\n기한";
            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType32;
            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "sdate";
            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(13).Label = "Start Date";
            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(13).Width = 52F;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType33;
            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ddate";
            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(14).Label = "Due Date";
            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType34;
            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "edate";
            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(15).Label = "Done Date";
            this.fpSpread1_Sheet1.Columns.Get(15).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(16).CellType = numberCellType5;
+            numberCellType14.DecimalPlaces = 0;
+            numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType14.MaximumValue = 2147483647D;
+            numberCellType14.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType14;
            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "cnt";
            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(16).Label = "Q\'ty";
            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(16).Width = 42F;
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType6;
+            numberCellType15.MaximumValue = 999999999999999D;
+            numberCellType15.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType15;
            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costo";
            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(17).Label = "Outsourced Cost ($K)/Set\r\n";
            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F;
-            numberCellType7.MaximumValue = 999999999999999D;
-            numberCellType7.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType7;
+            numberCellType16.MaximumValue = 999999999999999D;
+            numberCellType16.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType16;
            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costn";
            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(18).Label = "In-house Cost ($K/Set)";
            this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F;
            this.fpSpread1_Sheet1.Columns.Get(19).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(19).CellType = numberCellType8;
+            numberCellType17.MaximumValue = 999999999999999D;
+            numberCellType17.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType17;
            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "coste";
            this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
            this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(19).Label = "Cost Save ($k)/Set";
            this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(19).Width = 67F;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType35;
            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "orderno";
            this.fpSpread1_Sheet1.Columns.Get(20).Label = "SCR/CF";
            this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType36;
            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_champion";
            this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(21).Label = "Champion";
            this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType37;
            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_software";
            this.fpSpread1_Sheet1.Columns.Get(22).Label = "S/W";
            this.fpSpread1_Sheet1.Columns.Get(23).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType38;
            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_design";
            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(23).Label = "Design";
            this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType39;
            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_epanel";
            this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(24).Label = "ePanel";
            this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType40;
            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory";
            this.fpSpread1_Sheet1.Columns.Get(25).Label = "History";
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType41;
            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo";
            this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo";
            this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType42;
            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset";
            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset";
            this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType43;
            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model";
            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#";
            this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType44;
            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial";
            this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#";
            this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType9.DecimalPlaces = 0;
-            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType9.MaximumValue = 2147483647D;
-            numberCellType9.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType9;
+            numberCellType18.DecimalPlaces = 0;
+            numberCellType18.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType18.MaximumValue = 2147483647D;
+            numberCellType18.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType18;
            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "jasmin";
            this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(30).Label = "자스민";
@@ -1059,9 +1067,12 @@
            // 
            // tableLayoutPanel1
            // 
-            this.tableLayoutPanel1.ColumnCount = 2;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel1.ColumnCount = 3;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.tableLayoutPanel1.Controls.Add(this.rtMemo, 2, 1);
+            this.tableLayoutPanel1.Controls.Add(this.panel5, 2, 0);
            this.tableLayoutPanel1.Controls.Add(this.panel4, 1, 0);
            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
            this.tableLayoutPanel1.Controls.Add(this.richTextBox1, 0, 1);
@@ -1071,7 +1082,7 @@
            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
            this.tableLayoutPanel1.RowCount = 2;
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
            this.tableLayoutPanel1.Size = new System.Drawing.Size(1585, 139);
            this.tableLayoutPanel1.TabIndex = 11;
            // 
@@ -1080,10 +1091,10 @@
            this.panel4.Controls.Add(this.label11);
            this.panel4.Controls.Add(this.label4);
            this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel4.Location = new System.Drawing.Point(792, 0);
+            this.panel4.Location = new System.Drawing.Point(475, 0);
            this.panel4.Margin = new System.Windows.Forms.Padding(0);
            this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(793, 25);
+            this.panel4.Size = new System.Drawing.Size(634, 25);
            this.panel4.TabIndex = 0;
            // 
            // label11
@@ -1091,7 +1102,7 @@
            this.label11.Dock = System.Windows.Forms.DockStyle.Fill;
            this.label11.Location = new System.Drawing.Point(0, 0);
            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(693, 25);
+            this.label11.Size = new System.Drawing.Size(534, 25);
            this.label11.TabIndex = 14;
            this.label11.Text = "주간 진행 내용";
            this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1102,7 +1113,7 @@
            this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true));
            this.label4.Dock = System.Windows.Forms.DockStyle.Right;
            this.label4.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label4.Location = new System.Drawing.Point(693, 0);
+            this.label4.Location = new System.Drawing.Point(534, 0);
            this.label4.Margin = new System.Windows.Forms.Padding(0);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(100, 25);
@@ -1125,7 +1136,7 @@
            this.label2.Location = new System.Drawing.Point(0, 0);
            this.label2.Margin = new System.Windows.Forms.Padding(0);
            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(792, 25);
+            this.label2.Size = new System.Drawing.Size(475, 25);
            this.label2.TabIndex = 0;
            this.label2.Text = "요청 사항";
            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1138,7 +1149,7 @@
            this.richTextBox1.Location = new System.Drawing.Point(3, 28);
            this.richTextBox1.Name = "richTextBox1";
            this.richTextBox1.ReadOnly = true;
-            this.richTextBox1.Size = new System.Drawing.Size(786, 108);
+            this.richTextBox1.Size = new System.Drawing.Size(469, 108);
            this.richTextBox1.TabIndex = 1;
            this.richTextBox1.Text = "";
            // 
@@ -1148,10 +1159,10 @@
            this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true));
            this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.richTextBox2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.richTextBox2.Location = new System.Drawing.Point(795, 28);
+            this.richTextBox2.Location = new System.Drawing.Point(478, 28);
            this.richTextBox2.Name = "richTextBox2";
            this.richTextBox2.ReadOnly = true;
-            this.richTextBox2.Size = new System.Drawing.Size(787, 108);
+            this.richTextBox2.Size = new System.Drawing.Size(628, 108);
            this.richTextBox2.TabIndex = 1;
            this.richTextBox2.Text = "";
            this.richTextBox2.TextChanged += new System.EventHandler(this.richTextBox2_TextChanged);
@@ -1885,6 +1896,65 @@
            this.label17.Text = "구매 진행";
            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
            // 
+            // panel5
+            // 
+            this.panel5.Controls.Add(this.label31);
+            this.panel5.Controls.Add(this.sbDateMemo);
+            this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel5.Location = new System.Drawing.Point(1109, 0);
+            this.panel5.Margin = new System.Windows.Forms.Padding(0);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(476, 25);
+            this.panel5.TabIndex = 35;
+            // 
+            // label31
+            // 
+            this.label31.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label31.Location = new System.Drawing.Point(0, 0);
+            this.label31.Name = "label31";
+            this.label31.Size = new System.Drawing.Size(376, 25);
+            this.label31.TabIndex = 14;
+            this.label31.Text = "프로젝트 메모";
+            this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // sbDateMemo
+            // 
+            this.sbDateMemo.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.sbDateMemo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHistD, "pdate", true));
+            this.sbDateMemo.Dock = System.Windows.Forms.DockStyle.Right;
+            this.sbDateMemo.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.sbDateMemo.Location = new System.Drawing.Point(376, 0);
+            this.sbDateMemo.Margin = new System.Windows.Forms.Padding(0);
+            this.sbDateMemo.Name = "sbDateMemo";
+            this.sbDateMemo.Size = new System.Drawing.Size(100, 25);
+            this.sbDateMemo.TabIndex = 12;
+            this.sbDateMemo.Text = "--";
+            this.sbDateMemo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // rtMemo
+            // 
+            this.rtMemo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.rtMemo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHistD, "remark", true));
+            this.rtMemo.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.rtMemo.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.rtMemo.Location = new System.Drawing.Point(1112, 28);
+            this.rtMemo.Name = "rtMemo";
+            this.rtMemo.ReadOnly = true;
+            this.rtMemo.Size = new System.Drawing.Size(470, 108);
+            this.rtMemo.TabIndex = 35;
+            this.rtMemo.Text = "";
+            // 
+            // bsHistD
+            // 
+            this.bsHistD.DataMember = "EETGW_ProjecthistoryD";
+            this.bsHistD.DataSource = this.dsMSSQL;
+            this.bsHistD.Sort = "pdate desc";
+            this.bsHistD.CurrentChanged += new System.EventHandler(this.bsHistD_CurrentChanged);
+            // 
+            // taHistD
+            // 
+            this.taHistD.ClearBeforeFill = true;
+            // 
            // fProjectList
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1920,6 +1990,8 @@
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            this.tableLayoutPanel3.ResumeLayout(false);
+            this.panel5.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.bsHistD)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

@@ -2055,5 +2127,11 @@
        private System.Windows.Forms.Label label29;
        private System.Windows.Forms.Label label30;
        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.Label label31;
+        private System.Windows.Forms.Label sbDateMemo;
+        private System.Windows.Forms.RichTextBox rtMemo;
+        private System.Windows.Forms.BindingSource bsHistD;
+        private dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter taHistD;
    }
 }
--- a/SubProject/FPJ0000/Project/fProjectList.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.cs
@@ -172,7 +172,7 @@ namespace FPJ0000
                " [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,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd,model,serial," +
+                " dbo.getScheduleProgress(idx) as ProgressPrj,'' AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd,model,serial," +
                " [championid], dbo.getProjectFinishRate(gcode, idx) AS finishrate," +
                " championid,designid,assemblyid,epanelid,softwareid,userAssembly," +
                "dbo.getUserName2(championid,usermanager) as name_champion," +
@@ -180,7 +180,7 @@ namespace FPJ0000
                "dbo.getUserName2(assemblyid,userAssembly) as name_assembly," +
                "dbo.getUserName2(epanelid,userhw2) as name_epanel," +
                "dbo.getUserName2(softwareid,usersub) as name_software," +
-                "ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate,jasmin,sfi" +
+                "ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate,jasmin,sfi,'' AS lasthistoryD" +
                " 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 ";
@@ -575,6 +575,11 @@ namespace FPJ0000
            {

            }
+            try
+            {
+                taHistD.Fill(this.dsMSSQL.EETGW_ProjecthistoryD, dr.idx);
+            }
+            catch { }
        }

        private void button1_Click(object sender, EventArgs e)
@@ -764,7 +769,7 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
@@ -883,6 +888,28 @@ namespace FPJ0000
            }
            else label4.BackColor = SystemColors.Control;

+
+
+        }
+
+        private void bsHistD_CurrentChanged(object sender, EventArgs e)
+        {
+            var drv = this.bsHistD.Current as DataRowView;
+            if (drv == null)
+            {
+                sbDateMemo.BackColor = SystemColors.Control;
+                return;
+            }
+            var dr = drv.Row as dsPRJ.EETGW_ProjecthistoryDRow;
+
+            if (dr.IspdateNull()) sbDateMemo.BackColor = SystemColors.Control;
+            else if (DateTime.TryParse(dr.pdate, out DateTime dt_pdate))
+            {
+                var ts = DateTime.Now - dt_pdate;
+                if (ts.TotalDays > 7) sbDateMemo.BackColor = Color.Tomato;
+                else sbDateMemo.BackColor = Color.Lime;
+            }
+            else sbDateMemo.BackColor = SystemColors.Control;
        }
    }
 }
--- 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>
@@ -344,6 +347,12 @@
  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>455, 17</value>
  </metadata>
+  <metadata name="bsHistD.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1086, 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>
@@ -353,6 +362,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>
@@ -536,6 +548,9 @@
        B0X5B56Fg+LhPgWxAAAAAElFTkSuQmCC
 </value>
  </data>
+  <metadata name="taHistD.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>82</value>
  </metadata>
--- a/SubProject/FPJ0000/Project/fProjectListU.cs
+++ b/SubProject/FPJ0000/Project/fProjectListU.cs
@@ -778,7 +778,7 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
--- a/SubProject/FPJ0000/Project/fProjectSummary.cs
+++ b/SubProject/FPJ0000/Project/fProjectSummary.cs
@@ -618,7 +618,7 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine( "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
--- a/SubProject/FPJ0000/Util.cs
+++ b/SubProject/FPJ0000/Util.cs
@@ -22,7 +22,7 @@ namespace FPJ0000
        static void OpenPath(string group, string dataidx, Boolean openexplore = false)
        {
            //전자시 ㄹ업무일지 관련 폴더 열긴 -- 210708
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine(datapath, "Data", group);
            if (System.IO.Directory.Exists(serverpath) == false)
            {
@@ -73,7 +73,7 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
--- a/SubProject/FPJ0000/dsPRJ.Designer.cs
+++ b/SubProject/FPJ0000/dsPRJ.Designer.cs
--- a/SubProject/FPJ0000/dsPRJ.xsd
+++ b/SubProject/FPJ0000/dsPRJ.xsd
--- a/SubProject/FPJ0000/dsPRJ.xss
+++ b/SubProject/FPJ0000/dsPRJ.xss
@@ -4,13 +4,12 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="247" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="1159" ViewPortY="61" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:Projects" ZOrder="5" X="388" Y="651" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:ProjectsIOMap" ZOrder="12" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
    <Shape ID="DesignTable:ProjectsMailList" ZOrder="19" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:ProjectsPart" ZOrder="1" X="973" Y="68" Height="343" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:JobReport" ZOrder="3" X="1257" Y="66" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ProjectsPart" ZOrder="2" X="973" Y="68" Height="343" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:ProjectsHistory" ZOrder="18" X="1881" Y="31" Height="267" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
    <Shape ID="DesignTable:SPMaster" ZOrder="13" X="365" Y="305" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:EETGW_Note" ZOrder="16" X="810" Y="455" Height="248" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
@@ -20,11 +19,12 @@
    <Shape ID="DesignTable:EETGW_ProjectToDo" ZOrder="10" X="89" Y="808" Height="305" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:EETGW_JobReport_EBoard" ZOrder="9" X="33" Y="19" Height="324" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:EETGW_JobReport_AutoInput" ZOrder="15" X="702" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="2" X="1574" Y="32" Height="305" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="3" X="1574" Y="32" Height="305" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:EETGW_ProjectReson" ZOrder="11" X="1561" Y="590" Height="267" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
    <Shape ID="DesignTable:vJobReportForUserList" ZOrder="6" X="590" Y="464" Height="115" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
    <Shape ID="DesignTable:SCTable" ZOrder="8" X="76" Y="362" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="17" X="2138" Y="50" Height="68" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
+    <Shape ID="DesignTable:JobReport" ZOrder="1" X="1916" Y="400" Height="362" Width="259" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
  </Shapes>
  <Connectors />
 </DiagramLayout>