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

190724

Browse Source
This commit is contained in:
chikyun.kim
2019-07-25 08:29:57 +09:00
parent 5c77244a45
commit ae209e00af
85 changed files with 21568 additions and 4313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SubProject/FPJ0000/JobReport/fJobReport.cs
View File

@@ -35,11 +35,9 @@ namespace FPJ0000
this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
this.dtED.Text = DateTime.Now.ToShortDateString();
//담당자목록 - 사용자목록으로 처리한다.
//담당자목록 - 사용자목록으로 처리한다.
string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no);
if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)";
this.cmbUser.Items.Clear();
this.cmbUser.Items.Add(namestr);
try
@@ -182,7 +180,7 @@ namespace FPJ0000
string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1);
request = request.Substring(0, request.Length - 1);
this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request);
this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request,FCOMMON.info.Login.gcode);
RefreshTime();
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
}
@@ -208,6 +206,7 @@ namespace FPJ0000
}
void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
@@ -281,7 +280,7 @@ namespace FPJ0000
if (DateTime.Now.DayOfWeek == DayOfWeek.Sunday ||
DateTime.Now.DayOfWeek == DayOfWeek.Saturday) newdr.hrs = 0;
JobReport.fJobReport_Add f = new JobReport.fJobReport_Add(newdr);
var f = new JobReport.fJobReport_Add(newdr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.JobReport.AddJobReportRow(newdr);
@@ -308,7 +307,13 @@ namespace FPJ0000
else
{
search = search.Replace("'", "''");
string filter = "requestpart like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?";
var collist = new string[] { "requestpart", "package", "projectname", "process", "[type]", "description" };
string filter = ""; // "itemna like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?";
foreach (var col in collist)
{
if (filter != "") filter += " or ";
filter += col + " like ?";
}
filter = filter.Replace("?", "'%" + search + "%'");
this.bs.Filter = filter;
tbFind.BackColor = Color.Lime;