프로젝트 목록에 업데이트 칸 추가 하고 정렬기능에도 추가

This commit is contained in:
chi
2023-09-07 23:03:16 +09:00
parent d3fd0c1468
commit 01e29029c4
8 changed files with 1532 additions and 1331 deletions

View File

@@ -1127,6 +1127,12 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnsfi_savecount;
private global::System.Data.DataColumn columnsfi_savetime1;
private global::System.Data.DataColumn columnsfi_savecount1;
private global::System.Data.DataColumn columnlasthistory_date;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProjectsDataTable() :
@@ -1849,6 +1855,30 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn sfi_savetime1Column {
get {
return this.columnsfi_savetime1;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn sfi_savecount1Column {
get {
return this.columnsfi_savecount1;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn lasthistory_dateColumn {
get {
return this.columnlasthistory_date;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1970,7 +2000,10 @@ namespace FPJ0000 {
string effect_intangible,
string sfi_type,
float sfi_savetime,
float sfi_savecount) {
float sfi_savecount,
double sfi_savetime1,
double sfi_savecount1,
string lasthistory_date) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -2057,7 +2090,10 @@ namespace FPJ0000 {
effect_intangible,
sfi_type,
sfi_savetime,
sfi_savecount};
sfi_savecount,
sfi_savetime1,
sfi_savecount1,
lasthistory_date};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -2148,7 +2184,10 @@ namespace FPJ0000 {
string effect_intangible,
string sfi_type,
float sfi_savetime,
float sfi_savecount) {
float sfi_savecount,
double sfi_savetime1,
double sfi_savecount1,
string lasthistory_date) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -2235,7 +2274,10 @@ namespace FPJ0000 {
effect_intangible,
sfi_type,
sfi_savetime,
sfi_savecount};
sfi_savecount,
sfi_savetime1,
sfi_savecount1,
lasthistory_date};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -2350,6 +2392,9 @@ namespace FPJ0000 {
this.columnsfi_type = base.Columns["sfi_type"];
this.columnsfi_savetime = base.Columns["sfi_savetime"];
this.columnsfi_savecount = base.Columns["sfi_savecount"];
this.columnsfi_savetime1 = base.Columns["sfi_savetime1"];
this.columnsfi_savecount1 = base.Columns["sfi_savecount1"];
this.columnlasthistory_date = base.Columns["lasthistory_date"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2525,6 +2570,12 @@ namespace FPJ0000 {
base.Columns.Add(this.columnsfi_savetime);
this.columnsfi_savecount = new global::System.Data.DataColumn("sfi_savecount", typeof(float), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnsfi_savecount);
this.columnsfi_savetime1 = new global::System.Data.DataColumn("sfi_savetime1", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnsfi_savetime1);
this.columnsfi_savecount1 = new global::System.Data.DataColumn("sfi_savecount1", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnsfi_savecount1);
this.columnlasthistory_date = new global::System.Data.DataColumn("lasthistory_date", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnlasthistory_date);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -2610,6 +2661,10 @@ namespace FPJ0000 {
this.columneffect_tangible.MaxLength = 1000;
this.columneffect_intangible.MaxLength = 1000;
this.columnsfi_type.MaxLength = 1;
this.columnsfi_savetime1.Caption = "sfi_savetime";
this.columnsfi_savecount1.Caption = "sfi_savecount";
this.columnlasthistory_date.ReadOnly = true;
this.columnlasthistory_date.MaxLength = 10;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -14098,6 +14153,54 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public double sfi_savetime1 {
get {
try {
return ((double)(this[this.tableProjects.sfi_savetime1Column]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'sfi_savetime1\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tableProjects.sfi_savetime1Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public double sfi_savecount1 {
get {
try {
return ((double)(this[this.tableProjects.sfi_savecount1Column]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'sfi_savecount1\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tableProjects.sfi_savecount1Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string lasthistory_date {
get {
try {
return ((string)(this[this.tableProjects.lasthistory_dateColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'lasthistory_date\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tableProjects.lasthistory_dateColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsnameNull() {
@@ -15069,6 +15172,42 @@ namespace FPJ0000 {
public void Setsfi_savecountNull() {
this[this.tableProjects.sfi_savecountColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool Issfi_savetime1Null() {
return this.IsNull(this.tableProjects.sfi_savetime1Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void Setsfi_savetime1Null() {
this[this.tableProjects.sfi_savetime1Column] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool Issfi_savecount1Null() {
return this.IsNull(this.tableProjects.sfi_savecount1Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void Setsfi_savecount1Null() {
this[this.tableProjects.sfi_savecount1Column] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool Islasthistory_dateNull() {
return this.IsNull(this.tableProjects.lasthistory_dateColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void Setlasthistory_dateNull() {
this[this.tableProjects.lasthistory_dateColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -24588,7 +24727,9 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("effect_tangible", "effect_tangible");
tableMapping.ColumnMappings.Add("effect_intangible", "effect_intangible");
tableMapping.ColumnMappings.Add("sfi_type", "sfi_type");
tableMapping.ColumnMappings.Add("sfi_savecount", "sfi_savecount");
tableMapping.ColumnMappings.Add("sfi_savetime", "sfi_savetime1");
tableMapping.ColumnMappings.Add("sfi_savecount", "sfi_savecount1");
tableMapping.ColumnMappings.Add("lasthistory_date", "lasthistory_date");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -24806,13 +24947,15 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,
"anel, dbo.getUserName(softwareid) AS name_software, userAssembly, \r\n " +
" ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, dbo.getLastH" +
"istoryD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible, sf" +
"i_type, sfi_savetime, \r\n sfi_savecount\r\nFROM Projects\r\nWHERE " +
"(status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @username OR\r\n " +
" ISNULL(usermain, \'\') LIKE @username OR\r\n ISNULL(usersub, \'\') L" +
"IKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)\r\nORDER BY (CASE W" +
"HEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보" +
"류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') \r\n " +
" THEN \'9\' ELSE \'5\' END)";
"i_type, sfi_savetime, \r\n sfi_savecount,\r\n (SELEC" +
"T MAX(pdate) AS Expr1\r\n FROM ProjectsHistory\r\n " +
" WHERE (pidx = Projects.idx)) AS lasthistory_date\r\nFROM Projects\r\n" +
"WHERE (status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @username OR\r\n " +
" ISNULL(usermain, \'\') LIKE @username OR\r\n ISNULL(usersub" +
", \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)\r\nORDER BY " +
"(CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([statu" +
"s] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') \r\n " +
" THEN \'9\' ELSE \'5\' END)";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -24829,23 +24972,36 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,
bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode,
idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design,
dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite,
ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, bHighlight, effect_tangible, effect_intangible, sfi_savecount, sfi_savetime, sfi_type
ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, bHighlight, effect_tangible, effect_intangible, sfi_savecount, sfi_savetime, sfi_type,
(SELECT MAX(pdate) AS Expr1
FROM ProjectsHistory
WHERE (pidx = Projects.idx)) AS lasthistory_date
FROM Projects
WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode,
idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design,
dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite,
ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, bHighlight, effect_tangible, effect_intangible, sfi_savecount, sfi_savetime, sfi_type
FROM Projects
WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR
(ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR
(ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)";
this._commandCollection[3].CommandText = "SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat" +
"e, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn" +
", cnt, remark_req, remark_ans, ddate, \r\n progress, import, asset, " +
"isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, ca" +
"tegory, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, \r\n " +
" bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' A" +
"S wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate, cham" +
"pionid, dbo.getProjectFinishRate(gcode, \r\n idx) AS finishrate, des" +
"ignid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_cha" +
"mpion, dbo.getUserName(designid) AS name_design, \r\n dbo.getUserNam" +
"e(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.ge" +
"tUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, \r\n " +
" ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, bHighlight, effect_tangi" +
"ble, effect_intangible, sfi_savecount, sfi_savetime, sfi_type,\r\n " +
" (SELECT MAX(pdate) AS Expr1\r\n FROM ProjectsHistory\r\n " +
" WHERE (pidx = Projects.idx)) AS lasthistory_date\r\nFROM P" +
"rojects\r\nWHERE (ISNULL(name, N\'\') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND " +
"(gcode = @gcode) OR\r\n (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) " +
"AND (CAST(idx AS varchar) LIKE @search) OR\r\n (ISNULL(isdel, 0) = 0" +
") AND (gcode = @gcode) AND (ISNULL(memo, N\'\') LIKE @search)";
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));