This commit is contained in:
chi
2022-04-20 15:09:23 +09:00
parent dd3fcf149f
commit b6607dde2d
23 changed files with 3858 additions and 3532 deletions

View File

@@ -147,7 +147,10 @@ namespace FBS0000
fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade;
fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name;
if (item.empno == "77607")
{
}
//이월잔액
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999");
var used = 0.0;
@@ -162,6 +165,7 @@ namespace FBS0000
var ps = (int[])fpSpread1_Sheet1.Columns[c].Tag;
var curDate = sd.AddDays(c - 4);
var bholy = false;
//이날짜가 휴일인지 체크한다.
@@ -217,7 +221,7 @@ namespace FBS0000
ps[2] += 1;
//근태기록에 자료가 있는지 확인한다.
var dr = dtHoly.Where(t => t.uid == item.empno && (t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault();
var dr = dtHoly.Where(t => t.uid == item.empno && (t.term > 0 || t.CrTime > 0) && (t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault();
if (dr != null && fpSpread1_Sheet1.Cells[rowindex, c].Tag == null) //휴일이 아니여야 한다
{