..

2023-06-22 10:07:11 +09:00
parent 772cf9faeb
commit b04b79b5f5
27 changed files with 4487 additions and 4575 deletions
--- 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>
        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
+        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
 </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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
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18
+        8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5
+        c+a7mZRkkklGQu5saSus3RyK3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
+        VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS
+        /dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L
+        A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18
+        CiBpIWzqIK7vCgwfcSzfo4Oo3s7CnOWnwp1ReMiBJLhYW61LfHh0vFXkCfn8phemPCcqMv3EOK2cAkiK
+        ixXClOVBpPaVyBPSwX6EPt1BjNPIaIAUuFghjNkOdEW6RZ4Qr60dOqWbCKeZx5ADaXF8IcxZ3LuW70TP
+        uz9KMwTcLQzjTKo7Ia5sLgWQFhdrqynDh0s7WQz2/y5Nf+8ArBvc0C/0xMWVznGTA6XgYm01qBg8PNIi
+        8oR0+D6iVGGPizs9mwIoFccXQq9kUFc0EvjS+4EDOuLiSma5yIFScUYliws7vH8dsXmdC1oFExd3aiYF
+        UAquXOWDQW3Hl7dRkSaUpHZPI0rljoS4kzOc5EBaHP+d0ygb8DrySaQJYSwvcFpuJ8IVT6cBUuK0qU40
+        3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs
+        613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN
+        t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH
+        UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AKb0PpQCSEV4AAAAAElFTkSuQmCC
 </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);
@@ -762,7 +769,7 @@ namespace FPJ0000.JobReport_
                                    this.richTextBoxEx1.rtb.ForeColor = Color.Black;
                                    this.richTextBoxEx1.rtb.AppendText(oldtext);
                                }
-                                    //this.richTextBoxEx1.Text += oldtext;
+                                //this.richTextBoxEx1.Text += oldtext;

                                //this.richTextBoxEx1.Text += oldtext;