This commit is contained in:
chi
2021-02-16 08:31:01 +09:00
parent 30b06c2d35
commit 1c52445f76
23 changed files with 985 additions and 378 deletions

View File

@@ -45,22 +45,6 @@ namespace FPJ0000
this.tbRequest.Text = FCOMMON.info.Login.nameK;
//분류 - 190905
var dt_cate = FCOMMON.DBM.getCodeTable("20");
cmbCate.Items.Clear();
cmbCate.Items.Add("--전체--");
foreach (DataRow dr in dt_cate.Rows)
cmbCate.Items.Add(dr["Value"].ToString());
cmbCate.SelectedIndex = 0;
this.cmbProcess.Items.Clear();
this.cmbProcess.Items.Add("전체");
var procesList = FCOMMON.DBM.getProcessList();
foreach (DataRow dr in procesList.Rows)
cmbProcess.Items.Add(dr["Value"].ToString());
cmbProcess.Text = FCOMMON.info.Login.process;
if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0;
//this.cmbSort.SelectedIndex = 0;
this.cmbYearS.Items.Clear();
@@ -98,6 +82,8 @@ namespace FPJ0000
void refreshData()
{
//수리지연추가 210208 - 장은철
if (this.dsMSSQL.EETGW_JobReport_EBoard.GetChanges() != null)
{
@@ -111,6 +97,20 @@ namespace FPJ0000
string State_where = " WHERE gcode=@gcode and pdate between ";
State_where += "'" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(uid, '')) LIKE @username ";
if (chkDelay.Checked)
{
var = DateTime.Now.AddDays(-int.Parse(tbSd.Text)); //일반기간
var 2 = DateTime.Now.AddDays(-int.Parse(tbSD2.Text)); //외주기간
State_where += string.Format("and isnull(수리완료일,'') = '' and ((isnull(분류,'') like '%외주%' and pdate <= '{0}') or (isnull(분류,'') not like '%외주%' and pdate <= '{1}'))", 2.ToShortDateString(), .ToShortDateString());
tbSd.BackColor = Color.Gold;
tbSD2.BackColor = Color.Gold;
}
else
{
tbSd.BackColor = Color.WhiteSmoke;
tbSD2.BackColor = Color.WhiteSmoke;
}
//if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(분류,'') = '" + cmbCate.Text + "'";
//if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(Process,'') = '" + cmbProcess.Text.Trim() + "'";
string State_order = " ORDER BY pdate desc,uid";
@@ -279,7 +279,8 @@ namespace FPJ0000
var f = new fEboardData(newdr);
f.Show();
f.FormClosed += (s1, e1) => {
f.FormClosed += (s1, e1) =>
{
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
@@ -414,7 +415,8 @@ namespace FPJ0000
var f = new fEboardData(newdr);
f.Show();
f.FormClosed += (s1, e1) => {
f.FormClosed += (s1, e1) =>
{
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
@@ -436,14 +438,15 @@ namespace FPJ0000
var dr = drv.Row as dsPRJ.EETGW_JobReport_EBoardRow;
var f = new fEboardData(dr);
f.Show();
f.FormClosed += (s1, e1) => {
f.FormClosed += (s1, e1) =>
{
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.Validate();
this.bs.EndEdit();
}
};
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -523,5 +526,11 @@ namespace FPJ0000
newdr.Site = "ATK";
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
}
private void toolStripButton4_Click(object sender, EventArgs e)
{
this.chkDelay.BackColor = chkDelay.Checked ? Color.Lime : SystemColors.Control;
this.refreshData();
}
}
}