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

구매입력시 엔터키, 기본 일자 조회범위를 90일로 변경.

Browse Source
This commit is contained in:
chi
2024-03-15 17:13:01 +09:00
parent 24c4a426c0
commit a56c186845
25 changed files with 818 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
SubProject/FBS0000/Holiday/rHolidaySummary.cs
View File

@@ -40,7 +40,7 @@ namespace FBS0000
this.tbMon.Text = DateTime.Now.ToShortDateString();
refrehData();
// this.reportViewer1.RefreshReport();
// this.reportViewer1.RefreshReport();
}
void refrehData()
@@ -110,7 +110,8 @@ namespace FBS0000
else if (catename.StartsWith("이월")) newdr.orderno = 0;
else newdr.orderno = 2;
this.dsReport.holydatasum.AddholydatasumRow(newdr);
if (newdr.dr == 0 && newdr.drday == 0 && newdr.cr == 0 && newdr.crday == 0) newdr.Delete();
else this.dsReport.holydatasum.AddholydatasumRow(newdr);
}
}
this.dsReport.holydatasum.AcceptChanges();
@@ -173,7 +174,7 @@ namespace FBS0000
//최종합계추가
this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = "합계";
this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = "합계(대체/외출 제외)";
var grpstart2 = headercol;
foreach (var colname in subcols)
{
@@ -194,9 +195,9 @@ namespace FBS0000
var col = 0;
var druser = dr.First();
if(row % 2 == 0)
if (row % 2 == 0)
{
fpSpread1_Sheet1.Rows[row].BackColor = Color.FromArgb(80,Color.LightSkyBlue);
fpSpread1_Sheet1.Rows[row].BackColor = Color.FromArgb(80, Color.LightSkyBlue);
}
else fpSpread1_Sheet1.Rows[row].BackColor = Color.White;
@@ -261,12 +262,15 @@ namespace FBS0000
else cateColumn++;
if (cateName.StartsWith("대체") == false && cateName.StartsWith("외출") == false)
{
sum_이월 += 이월;
sum_발생 += 발생;
sum_사용 += 사용;
sum_잔여 += 잔여;
sum_초과 += 초과;
}
sum_이월 += 이월;
sum_발생 += 발생;
sum_사용 += 사용;
sum_잔여 += 잔여;
sum_초과 += 초과;
if (cateColumn > lastcol) lastcol = cateColumn;
}
@@ -303,8 +307,8 @@ namespace FBS0000
fpSpread1_Sheet1.SetFormula(row, 3, $"SUM(R1C4:R{row}C4)");
//0번컬럼은 색상을 초기화
for(int i = 0; i < fpSpread1_Sheet1.RowCount;i++)
fpSpread1_Sheet1.Cells[i,0].BackColor = Color.White;
for (int i = 0; i < fpSpread1_Sheet1.RowCount; i++)
fpSpread1_Sheet1.Cells[i, 0].BackColor = Color.White;
@@ -346,7 +350,7 @@ namespace FBS0000
title = fpSpread1_Sheet1.ColumnHeader.Cells[0, i].Text;
}
var title2 = fpSpread1_Sheet1.ColumnHeader.Cells[1, i].Text;
if(title != "년차" && title != "합계" && title2 == "초과")
if (title != "년차" && title != "합계" && title2 == "초과")
{
fpSpread1_Sheet1.Columns[i].Visible = false;
}