프로젝트 목록에 history 열 추가

This commit is contained in:
chikyun.kim
2019-05-17 10:01:51 +09:00
parent 93b2cdb3ae
commit 736aaeb6d2
10 changed files with 565 additions and 467 deletions

View File

@@ -567,6 +567,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnorderno;
private global::System.Data.DataColumn columnlasthistory;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public ProjectsDataTable() :
@@ -873,6 +875,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn lasthistoryColumn {
get {
return this.columnlasthistory;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -942,7 +952,8 @@ namespace FPJ0000 {
bool isdel,
string path,
string userhw2,
string orderno) {
string orderno,
string lasthistory) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -977,7 +988,8 @@ namespace FPJ0000 {
isdel,
path,
userhw2,
orderno};
orderno,
lasthistory};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1016,7 +1028,8 @@ namespace FPJ0000 {
bool isdel,
string path,
string userhw2,
string orderno) {
string orderno,
string lasthistory) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1051,7 +1064,8 @@ namespace FPJ0000 {
isdel,
path,
userhw2,
orderno};
orderno,
lasthistory};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1114,6 +1128,7 @@ namespace FPJ0000 {
this.columnpath = base.Columns["path"];
this.columnuserhw2 = base.Columns["userhw2"];
this.columnorderno = base.Columns["orderno"];
this.columnlasthistory = base.Columns["lasthistory"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1185,6 +1200,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnuserhw2);
this.columnorderno = new global::System.Data.DataColumn("orderno", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnorderno);
this.columnlasthistory = new global::System.Data.DataColumn("lasthistory", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnlasthistory);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1217,6 +1234,8 @@ namespace FPJ0000 {
this.columnpath.MaxLength = 300;
this.columnuserhw2.MaxLength = 50;
this.columnorderno.MaxLength = 50;
this.columnlasthistory.ReadOnly = true;
this.columnlasthistory.MaxLength = 200;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4433,6 +4452,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string lasthistory {
get {
if (this.IslasthistoryNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.lasthistoryColumn]));
}
}
set {
this[this.tableProjects.lasthistoryColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsnameNull() {
@@ -4792,6 +4827,18 @@ namespace FPJ0000 {
public void SetordernoNull() {
this[this.tableProjects.ordernoColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IslasthistoryNull() {
return this.IsNull(this.tableProjects.lasthistoryColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public void SetlasthistoryNull() {
this[this.tableProjects.lasthistoryColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -6944,6 +6991,7 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("path", "path");
tableMapping.ColumnMappings.Add("userhw2", "userhw2");
tableMapping.ColumnMappings.Add("orderno", "orderno");
tableMapping.ColumnMappings.Add("lasthistory", "lasthistory");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -7139,7 +7187,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].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
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -7156,7 +7204,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status,
userManager, userhw2, usermain, usersub, wdate, wuid
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory
FROM Projects
WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
@@ -7164,7 +7212,7 @@ WHERE (idx = @idx)";
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
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory
FROM Projects
WHERE (ISNULL(name, N'') LIKE @search OR
ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0)";