This commit is contained in:
chi
2020-12-11 17:53:47 +09:00
parent 0f44fbe9f8
commit bd41902254
60 changed files with 12425 additions and 2853 deletions

View File

@@ -52,7 +52,9 @@ namespace FPJ0000
private void __Load(object sender, EventArgs e)
{
this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
this.dtED.Text = DateTime.Now.ToShortDateString();
var sdate = DateTime.Parse(dtSD.Text);
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
@@ -190,7 +192,7 @@ namespace FPJ0000
}
}
void refreshData()
void refreshData(bool tagonly = false)
{
// string state = "%";
// if (cmbState.SelectedIndex > 0) state = cmbState.Text.Split(',')[0].Substring(1);
@@ -201,7 +203,7 @@ namespace FPJ0000
FCOMMON.Util.MsgE("담당자가 선택되지 않았습니다.");
return;
}
if (cmbUser.SelectedIndex > 0 && ( cmbUser.Text.IndexOf("(") == -1 || cmbUser.Text.IndexOf(")") == -1))
if (cmbUser.SelectedIndex > 0 && (cmbUser.Text.IndexOf("(") == -1 || cmbUser.Text.IndexOf(")") == -1))
{
FCOMMON.Util.MsgE("담당자 번호를 확인할 수 없습니다.(문의 T.8567)");
return;
@@ -211,7 +213,11 @@ namespace FPJ0000
if (cmbUser.SelectedIndex == 0) request = "%"; //전체검색 201028 - chi(임현대)
this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode);
if (tagonly == false)
this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode);
else
this.ta.FillByTagOnly(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode);
RefreshTime();
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
FormattingData();
@@ -316,7 +322,7 @@ namespace FPJ0000
private void btSearch_Click(object sender, EventArgs e)
{
refreshData();
}
private void toolStripLabel3_Click(object sender, EventArgs e)
@@ -363,7 +369,7 @@ namespace FPJ0000
else
{
search = search.Replace("'", "''");
var collist = new string[] { "requestpart", "package", "projectname", "process", "[type]", "description" };
var collist = new string[] { "requestpart", "package", "projectname", "process", "[type]", "description", "tag" };
string filter = ""; // "itemna like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?";
foreach (var col in collist)
{
@@ -562,5 +568,15 @@ namespace FPJ0000
var f = new JobReport.rJobReportUser();
f.Show();
}
private void btSearch_ButtonClick(object sender, EventArgs e)
{
refreshData();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
refreshData(true);
}
}
}