연차현황추가
This commit is contained in:
@@ -134,7 +134,7 @@ namespace FBS0000
|
||||
|
||||
try
|
||||
{
|
||||
this.ta.Fill(this.dsMSSQL.Holyday, dtSD.Text, FCOMMON.info.Login.gcode, seluid, dtED.Text);
|
||||
this.ta.Fill(this.dsMSSQL.Holyday, dtSD.Text, FCOMMON.info.Login.gcode, seluid, dtED.Text,"%");
|
||||
this.dsMSSQL.Holyday.AcceptChanges();
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -181,7 +181,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;
|
||||
|
||||
Reference in New Issue
Block a user