This commit is contained in:
chi
2023-12-28 10:24:51 +09:00
parent 6e925857b3
commit 6e091f6218
11 changed files with 217 additions and 167 deletions

View File

@@ -108,12 +108,12 @@ namespace FPJ0000
this.cmbSort.SelectedIndex = 0;
this.cmbYearS.Items.Clear();
this.cmbYearE.Items.Clear();
for (int i = 2010; i <= DateTime.Now.Year; i++)
for (int i = 2010; i <= DateTime.Now.Year+1; i++)
{
cmbYearS.Items.Add(i.ToString("0000"));
cmbYearE.Items.Add(i.ToString("0000"));
}
this.cmbYearS.Text = DateTime.Now.AddYears(-2).Year.ToString("0000");
this.cmbYearS.Text = DateTime.Now.Year.ToString("0000");
this.cmbYearE.Text = DateTime.Now.Year.ToString("0000");
refreshData();
@@ -221,11 +221,21 @@ namespace FPJ0000
if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우
//var dateField = "pdate";
//if (cmbDateType.SelectedIndex == 1) dateField = "edate";
//else if (cmbDateType.SelectedIndex == 2) dateField = "odate";
//State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
//만료,완료,출고
if (cmbDateType.SelectedIndex > 0)
{
var dateField = "";
if (cmbDateType.SelectedIndex == 1) dateField = "sdate";
else if (cmbDateType.SelectedIndex == 2) dateField = "ddate";
else if (cmbDateType.SelectedIndex == 3) dateField = "edate";
else if (cmbDateType.SelectedIndex == 4) dateField = "odate";
State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearS.Text + "-12-31' AND ";
}
// "ISNULL(usermain, '') LIKE @username OR " +
// "ISNULL(reqstaff, '') LIKE @username OR " +
// "ISNULL(usersub, '') LIKE @username) ";
@@ -1095,5 +1105,10 @@ namespace FPJ0000
}
else label8.BackColor = SystemColors.Control;
}
private void cmbDateType_SelectedIndexChanged(object sender, EventArgs e)
{
cmbYearS.Enabled = cmbDateType.SelectedIndex != 0;
}
}
}