Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warn clear

Browse Source
This commit is contained in:
ChiKyun Kim
2025-07-15 09:56:28 +09:00
parent 479a736b80
commit 2b322542f1
26 changed files with 53 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
View File

@@ -323,8 +323,8 @@ namespace FPJ0000.JobReport_
//ETC영역계산
{
//전체합산데이터와, 2~10까지의 데이터가 일치하지 않으면 그것이 ETC이다
var etchr = item.Where(t => t.hrs != null).Sum(t => (float)t.hrs);
var etcot = item.Where(t => t.ot != null).Sum(t => (float)t.ot);
var etchr = item.Sum(t => (float)t.hrs);
var etcot = item.Sum(t => (float)t.ot);
//현재데이터의 hrs의 합
var subtotal = 0f;

1
SubProject/FPJ0000/JobReport_/fJobProcessSelect.Designer.cs generated
View File

@@ -707,7 +707,6 @@
private System.Windows.Forms.TreeView treeView1;
private System.Windows.Forms.Button btRefreshTreeview;
private System.Windows.Forms.Label lbWarningManager;
private System.Windows.Forms.DataGridViewTextBoxColumn svalue2DataGridViewTextBoxColumn;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.GroupBox groupBox4;

6
SubProject/FPJ0000/JobReport_/rJobReportPrj.cs
View File

@@ -134,7 +134,7 @@ namespace FPJ0000.JobReport_
var TotHrs = dsReport.JobProjectTimes.Sum(t => t.hrs);
//데이터를 추가한다.
bool addholy = false;
//bool addholy = false;
foreach (var dr in dsReport.JobProjectTimes.OrderByDescending(t => t.PrjStatus + t.PrjName).GroupBy(t => t.PrjName))
{
var pidx = dr.Key;
@@ -151,13 +151,13 @@ namespace FPJ0000.JobReport_
{
row.Add("--");
row.Add("미팅");
addholy = true;
//addholy = true;
}
else if (dr.Key == "휴가")
{
row.Add("--");
row.Add("휴가");
addholy = true;
//addholy = true;
}
else
{