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

출근부 데이터 변경 잔량 수식 변경

Browse Source
This commit is contained in:
chi
2023-08-30 17:18:19 +09:00
parent aff898194b
commit bd738a47bb
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SubProject/FBS0000/Holiday/WorkTable.cs
View File

@@ -69,7 +69,7 @@ namespace FBS0000
if (curDate.ToShortDateString() == ed.ToShortDateString()) break; if (curDate.ToShortDateString() == ed.ToShortDateString()) break;
} }
cols.AddRange(new string[] { "발생", "사용", "잔여" }); cols.AddRange(new string[] { $"발생\n~{sd.AddDays(-1).ToString("MM/dd")}", "사용", $"잔여\n~{ed.ToString("MM/dd")}" });
coltag.AddRange(new DateTime[] { initdate, initdate, initdate }); coltag.AddRange(new DateTime[] { initdate, initdate, initdate });
//열제목 설정 //열제목 설정
@@ -148,12 +148,13 @@ namespace FBS0000
fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade; fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade;
fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name; fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name;
if (item.empno == "77607") if (item.empno == "395552")
{ {
} }
//이월잔액 //이월잔액
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999"); var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999");
var jan = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), ed.ToShortDateString(), "999999");
var used = 0.0; var used = 0.0;
fpSpread1_Sheet1.Rows[rowindex].ResetBorder(); fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
@@ -255,6 +256,13 @@ namespace FBS0000
fpSpread1_Sheet1.Cells[rowindex, c].Tag = "1"; fpSpread1_Sheet1.Cells[rowindex, c].Tag = "1";
} }
//근태 시작일자가 조회시작일보다 적다면, 데이터가 걸쳐진 것이므로 회색으로 처리하자 2308320
if(dr.sdate.ToShortDateString().CompareTo(sd.ToShortDateString()) < 0)
{
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.DimGray;
fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.White;
}
if (string.IsNullOrEmpty(dr.contents) == false) if (string.IsNullOrEmpty(dr.contents) == false)
{ {
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents} 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}"; fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents} 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}";
@@ -343,10 +351,11 @@ namespace FBS0000
fpSpread1_Sheet1.Columns[c].Tag = ps; fpSpread1_Sheet1.Columns[c].Tag = ps;
} }
var jan = jand - used; used = (float)jand-(float)jan ;
fpSpread1_Sheet1.Cells[rowindex, c++].Value = jand > 0 ? jand.ToString() : string.Empty; //var jan = jand - used;
fpSpread1_Sheet1.Cells[rowindex, c++].Value = used > 0 ? used.ToString() : string.Empty; fpSpread1_Sheet1.Cells[rowindex, c++].Value = jand != 0 ? jand.ToString() : string.Empty;
fpSpread1_Sheet1.Cells[rowindex, c++].Value = jan > 0 ? jan.ToString() : string.Empty; fpSpread1_Sheet1.Cells[rowindex, c++].Value = used != 0 ? used.ToString() : string.Empty;
fpSpread1_Sheet1.Cells[rowindex, c++].Value = jan != 0 ? jan.ToString() : string.Empty;
rowindex += 1; rowindex += 1;
} // --users } // --users