From 8d610f526225e8fcadeeb9362410a2f0fed5806f Mon Sep 17 00:00:00 2001
From: chi <chikyun.kim@amkor.co.kr>
Date: Thu, 27 Jun 2024 17:28:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=85=EB=AC=B4=EB=B6=84=ED=8F=AC=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EB=AC=BC=20=EC=98=A4=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Project/Properties/AssemblyInfo.cs            |  4 ++--
 .../JobReport_/fJobChartMenu.Designer.cs      |  3 ++-
 .../FPJ0000/JobReport_/fJobChartMenu.cs       | 21 +++++++++++++++----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index aa9e57b..3c61a3f 100644
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("24.06.26.0000")]
-[assembly: AssemblyFileVersion("24.06.26.0000")]
+[assembly: AssemblyVersion("24.06.27.0000")]
+[assembly: AssemblyFileVersion("24.06.27.0000")]
diff --git a/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs
index 772c79f..71ed52c 100644
--- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.Designer.cs
@@ -96,6 +96,7 @@
             // btSave
             // 
             this.btSave.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btSave.Enabled = false;
             this.btSave.Location = new System.Drawing.Point(947, 5);
             this.btSave.Name = "btSave";
             this.btSave.Size = new System.Drawing.Size(75, 48);
@@ -176,6 +177,7 @@
             // btRefresh
             // 
             this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btRefresh.Enabled = false;
             this.btRefresh.Location = new System.Drawing.Point(1022, 5);
             this.btRefresh.Name = "btRefresh";
             this.btRefresh.Size = new System.Drawing.Size(75, 48);
@@ -217,7 +219,6 @@
             this.Controls.Add(this.progressBar1);
             this.Controls.Add(this.panel1);
             this.Name = "fJobChartMenu";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "작업 분포 확인";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.Load += new System.EventHandler(this.fJobChartMenu_Load);
diff --git a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
index 74d8447..f09c34a 100644
--- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
@@ -57,6 +57,8 @@ namespace FPJ0000.JobReport_
 
             //refrehData();
             binit = true;
+            btSave.Enabled = true;
+            btRefresh.Enabled = true;
         }
         void UpdateUserList()
         {
@@ -206,10 +208,21 @@ namespace FPJ0000.JobReport_
             foreach (var item in baseData.GroupBy(t => t.id)) //사용자별로 그룹을 해서
             {
                 var dr = item.FirstOrDefault();
-                this.fpSpread1.Sheets[2].Cells[row, 0].Value = dr.name;
-                this.fpSpread1.Sheets[2].Cells[row, 1].Value = dr.id;
-                this.fpSpread1.Sheets[2].Cells[row, 2].Value = item.Sum(t => t.hrs);
-                this.fpSpread1.Sheets[2].Cells[row, 3].Value = item.Sum(t => t.ot);
+                if (row <= this.fpSpread1.Sheets[2].RowCount)
+                    this.fpSpread1.Sheets[2].RowCount = Math.Max(100, row);
+
+                if(row < this.fpSpread1.Sheets[2].RowCount)
+                {
+                    this.fpSpread1.Sheets[2].Cells[row, 0].Value = dr.name;
+                    this.fpSpread1.Sheets[2].Cells[row, 1].Value = dr.id;
+                    this.fpSpread1.Sheets[2].Cells[row, 2].Value = item.Sum(t => t.hrs);
+                    this.fpSpread1.Sheets[2].Cells[row, 3].Value = item.Sum(t => t.ot);
+                }
+                else
+                {
+
+                }
+                
                 row += 1;
             }
             fpSpread1.Sheets[1].ColumnCount = 5;