프로젝트 목록 분류/사용자공정 추 가
This commit is contained in:
@@ -32,12 +32,24 @@ namespace FPJ0000
|
||||
this.tbRequest.Text = FCOMMON.info.Login.nameK;
|
||||
cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다
|
||||
|
||||
//분류 - 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());
|
||||
//프로젝트내의 분류(category)를 확인하여 모로을 생성한다.
|
||||
var cn = FCOMMON.DBM.getCn();
|
||||
var sql = $"select category from projects where gcode='{FCOMMON.info.Login.gcode}'" +
|
||||
" and isnull(category,'') <> ''" +
|
||||
" group by category" +
|
||||
" order by category";
|
||||
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); cn.Open();
|
||||
var rdr = cmd.ExecuteReader();
|
||||
while(rdr.Read())
|
||||
{
|
||||
var category = rdr[0].ToString();
|
||||
cmbCate.Items.Add(category);
|
||||
}
|
||||
rdr.Close();
|
||||
cmd.Dispose();
|
||||
cn.Dispose();
|
||||
cmbCate.SelectedIndex = 0;
|
||||
|
||||
this.cmbSort.Items.Clear();
|
||||
@@ -67,10 +79,29 @@ namespace FPJ0000
|
||||
|
||||
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;
|
||||
|
||||
//프로젝트내의 분류(category)를 확인하여 모로을 생성한다.
|
||||
cn = FCOMMON.DBM.getCn();
|
||||
sql = $"select userprocess from projects where gcode='{FCOMMON.info.Login.gcode}'" +
|
||||
" and isnull(userprocess,'') <> ''" +
|
||||
" group by userprocess" +
|
||||
" order by userprocess";
|
||||
cmd = new System.Data.SqlClient.SqlCommand(sql, cn); cn.Open();
|
||||
rdr = cmd.ExecuteReader();
|
||||
while (rdr.Read())
|
||||
{
|
||||
var userprocess = rdr[0].ToString();
|
||||
cmbProcess.Items.Add(userprocess);
|
||||
}
|
||||
rdr.Close();
|
||||
cmd.Dispose();
|
||||
cn.Dispose();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0;
|
||||
|
||||
this.cmbSort.SelectedIndex = 0;
|
||||
@@ -180,7 +211,7 @@ namespace FPJ0000
|
||||
"dbo.getUserName2(designid,usermain) as name_design," +
|
||||
"dbo.getUserName2(assemblyid,userAssembly) as name_assembly," +
|
||||
"dbo.getUserName2(epanelid,userhw2) as name_epanel," +
|
||||
"dbo.getUserName2(softwareid,usersub) as name_software," +
|
||||
"dbo.getUserName2(softwareid,usersub) as name_software,category," +
|
||||
"ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate,jasmin,sfi,'' AS lasthistoryD" +
|
||||
" FROM Projects";
|
||||
//string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects";
|
||||
@@ -208,7 +239,7 @@ namespace FPJ0000
|
||||
"ISNULL(usersub, '') LIKE @username) ";
|
||||
|
||||
if (state != "") State_where += " AND " + state;
|
||||
if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'";
|
||||
if (cmbCate.SelectedIndex > 0) State_where += $" AND isnull(category,'') like '{cmbCate.Text}%'";
|
||||
if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(userprocess,'') = '" + cmbProcess.Text.Trim() + "'";
|
||||
string State_order = " ORDER BY (CASE " +
|
||||
" WHEN ([status] = '진행') THEN '0' " +
|
||||
@@ -531,7 +562,7 @@ namespace FPJ0000
|
||||
| FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
|
||||
|
||||
var dlga = FCOMMON.Util.MsgQ("파일생성 완료\n파일을 확인 할까요?\n" + sd.FileName);
|
||||
if(dlga == DialogResult.Yes)
|
||||
if (dlga == DialogResult.Yes)
|
||||
{
|
||||
FCOMMON.Util.RunExplorer(sd.FileName);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user