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

문자편집기 창 별도 추가했음,

Browse Source 
휴가내역 정렬 수정
This commit is contained in:
chi
2020-06-05 13:10:14 +09:00
parent a844e35d0b
commit bd442b73a8
20 changed files with 2697 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SubProject/FBS0000/Holiday/fHolyday.cs
View File

@@ -103,10 +103,13 @@ namespace FBS0000
//잔량계산
double sumdr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.termDr);
double sumdr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.termDr); //전체발생수량
double sumdrN = this.dsMSSQL.vHoliday_uselist.Where(t => t.cate == "10").Sum(t => t.termDr); //일반발생
double sumdrE = this.dsMSSQL.vHoliday_uselist.Where(t => t.cate != "10").Sum(t => t.termDr); //기타발생
double sumcr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.term);
double jan = sumdr - sumcr;
sbGen.Text = sumdr.ToString("N0");
sbGen.Text = string.Format("{0}+{1}",sumdrN, sumdrE);
sbUse.Text = sumcr.ToString("N0");
sbJan.Text = jan.ToString("N0");
if (jan < 0) sbJan.ForeColor = Color.Red;
@@ -159,7 +162,7 @@ namespace FBS0000
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsMSSQL.vHoliday_uselistRow;
if(dr.cate == "0")
if(dr.cate == "10" || dr.cate=="11")
{
var f = new fHolyday_Add(dr.idx);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)