근태관리에 구분 넣음
This commit is contained in:
@@ -41,7 +41,7 @@ namespace FBS0000
|
||||
im.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
|
||||
im2.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
|
||||
|
||||
tbSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01";
|
||||
tbSD.Text = DateTime.Now.ToString("yyyy-01") + "-01";
|
||||
tbED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString();
|
||||
|
||||
//현재 사용자의 그룹명을 가져옴
|
||||
@@ -134,6 +134,8 @@ namespace FBS0000
|
||||
seluid = GetUIDValue();
|
||||
var sd = DateTime.Parse(tbSD.Text + " 00:00:00");
|
||||
var ed = DateTime.Parse(tbED.Text + " 23:59:59");
|
||||
sd = DateTime.Parse(ed.ToString("yyyy-01-01 00:00:00"));
|
||||
this.tbSD.Text = sd.ToShortDateString();
|
||||
|
||||
try
|
||||
{
|
||||
@@ -183,7 +185,7 @@ namespace FBS0000
|
||||
var fistdate = dr.sdate.ToString("yyyy-01-01");
|
||||
|
||||
//이 사용자의 이전까지의 잔량을 가져온다
|
||||
var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(),dr.idx.ToString("000000"));
|
||||
var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(), dr.idx.ToString("000000"));
|
||||
var yjanh = qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(), dr.idx.ToString("000000"));
|
||||
var jand = yjand + dr.termDr - dr.term;
|
||||
var janh = yjanh + dr.DrTime - dr.CrTime;
|
||||
@@ -193,6 +195,30 @@ namespace FBS0000
|
||||
//this.fpSpread1.ActiveSheet.Cells[i, col_janh].Value = janh;
|
||||
}
|
||||
|
||||
var sb = new System.Text.StringBuilder();
|
||||
|
||||
var grplist = dsMSSQL.Holyday.GroupBy(t => t.cate).ToList();
|
||||
foreach (var grp in grplist)
|
||||
{
|
||||
//일년치합산을 넣는다
|
||||
var totalJanH = grp.Sum(t => t.DrTime) - grp.Sum(t => t.CrTime);
|
||||
var totalJanD = grp.Sum(t => t.termDr) - grp.Sum(t => t.term);
|
||||
if (sb.Length > 0) sb.Append(" ");
|
||||
sb.Append($"[{grp.Key}] {totalJanD}:{totalJanH}");
|
||||
}
|
||||
var tUseH = dsMSSQL.Holyday.Sum(t => t.CrTime);
|
||||
var tUseD = dsMSSQL.Holyday.Sum(t => t.term);
|
||||
|
||||
var tGenH = dsMSSQL.Holyday.Sum(t => t.DrTime);
|
||||
var tGenD = dsMSSQL.Holyday.Sum(t => t.termDr);
|
||||
|
||||
this.sbUse.Text = $"{tUseD}:{tUseH}";
|
||||
this.sbGen.Text = $"{tGenD}:{tGenH}";
|
||||
this.sbJan.Text = sb.ToString();
|
||||
|
||||
sbUse.ForeColor = Color.Blue;
|
||||
sbGen.ForeColor = Color.Black;
|
||||
sbJan.ForeColor = Color.DarkMagenta;
|
||||
}
|
||||
private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
@@ -233,7 +259,7 @@ namespace FBS0000
|
||||
var col_janh = this.fpSpread1.ActiveSheet.Columns["janh"].Index;
|
||||
var col_yjanh = this.fpSpread1.ActiveSheet.Columns["yjanh"].Index;
|
||||
|
||||
var drUser= this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault();
|
||||
var drUser = this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault();
|
||||
var username = drUser == null ? string.Empty : drUser.name;
|
||||
fpSpread1.ActiveSheet.Cells[rowindex, col_name].Value = username;
|
||||
|
||||
@@ -243,7 +269,7 @@ namespace FBS0000
|
||||
var yjanh = 0;// qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, fistdate, newdr.sdate.ToShortDateString(), "999999");
|
||||
|
||||
|
||||
|
||||
|
||||
//var jand = yjand + dr.termDr - dr.term;
|
||||
//var janh = yjanh + dr.DrTime - dr.CrTime;
|
||||
this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjand].Value = yjand;
|
||||
@@ -487,14 +513,14 @@ namespace FBS0000
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void 현재사원원장보기ToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var drv = this.bs.Current as DataRowView;
|
||||
var dr = drv.Row as dsMSSQL.HolydayRow;
|
||||
this.tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
|
||||
this.tbED.Text = DateTime.Now.Year.ToString("0000") + "-12-31";
|
||||
var username = string.Format("[{0}] {1}",dr.uid,dr.UserName);
|
||||
var username = string.Format("[{0}] {1}", dr.uid, dr.UserName);
|
||||
this.cmbUser.Text = username;
|
||||
RefreshData();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user