검토기한 항목 추가 , 개인별 스케쥴 현황 변경

This commit is contained in:
chi
2023-02-09 13:38:26 +09:00
parent f5b0e77af3
commit e10610f15f
12 changed files with 1105 additions and 620 deletions

View File

@@ -3212,6 +3212,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnprogress;
private global::System.Data.DataColumn columnuserprocess;
private global::System.Data.DataColumn columnstatus;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public UserScheduleTableDataTable() {
@@ -3389,6 +3393,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn userprocessColumn {
get {
return this.columnuserprocess;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn statusColumn {
get {
return this.columnstatus;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -3442,7 +3462,9 @@ namespace FPJ0000 {
string ddate,
bool complete,
string uidname,
int progress) {
int progress,
string userprocess,
string status) {
UserScheduleTableRow rowUserScheduleTableRow = ((UserScheduleTableRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -3462,7 +3484,9 @@ namespace FPJ0000 {
ddate,
complete,
uidname,
progress};
progress,
userprocess,
status};
rowUserScheduleTableRow.ItemArray = columnValuesArray;
this.Rows.Add(rowUserScheduleTableRow);
return rowUserScheduleTableRow;
@@ -3511,6 +3535,8 @@ namespace FPJ0000 {
this.columncomplete = base.Columns["complete"];
this.columnuidname = base.Columns["uidname"];
this.columnprogress = base.Columns["progress"];
this.columnuserprocess = base.Columns["userprocess"];
this.columnstatus = base.Columns["status"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3552,6 +3578,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnuidname);
this.columnprogress = new global::System.Data.DataColumn("progress", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnprogress);
this.columnuserprocess = new global::System.Data.DataColumn("userprocess", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnuserprocess);
this.columnstatus = new global::System.Data.DataColumn("status", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnstatus);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnSubIDX,
this.columnidx}, true));
@@ -3578,6 +3608,8 @@ namespace FPJ0000 {
this.columnsdate.MaxLength = 50;
this.columnddate.MaxLength = 50;
this.columnuidname.MaxLength = 50;
this.columnuserprocess.MaxLength = 100;
this.columnstatus.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6173,6 +6205,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string userprocess {
get {
if (this.IsuserprocessNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableUserScheduleTable.userprocessColumn]));
}
}
set {
this[this.tableUserScheduleTable.userprocessColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string status {
get {
if (this.IsstatusNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableUserScheduleTable.statusColumn]));
}
}
set {
this[this.tableUserScheduleTable.statusColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsScheduleNoNull() {
@@ -6352,6 +6416,30 @@ namespace FPJ0000 {
public void SetprogressNull() {
this[this.tableUserScheduleTable.progressColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsuserprocessNull() {
return this.IsNull(this.tableUserScheduleTable.userprocessColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetuserprocessNull() {
this[this.tableUserScheduleTable.userprocessColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsstatusNull() {
return this.IsNull(this.tableUserScheduleTable.statusColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetstatusNull() {
this[this.tableUserScheduleTable.statusColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -9163,6 +9251,8 @@ ORDER BY title, ww";
tableMapping.ColumnMappings.Add("complete", "complete");
tableMapping.ColumnMappings.Add("uidname", "uidname");
tableMapping.ColumnMappings.Add("progress", "progress");
tableMapping.ColumnMappings.Add("userprocess", "userprocess");
tableMapping.ColumnMappings.Add("status", "status");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -9182,7 +9272,7 @@ ORDER BY title, ww";
this._commandCollection[0].CommandText = @"SELECT Projects.idx, dbo.getLastProjectScheduleNo(Projects.gcode, Projects.idx) AS ScheduleNo, Projects.gcode, Projects.name, EETGW_ProjectsSchedule.idx AS SubIDX,
EETGW_ProjectsSchedule.no, EETGW_ProjectsSchedule.seq, EETGW_ProjectsSchedule.title, EETGW_ProjectsSchedule.uid, EETGW_ProjectsSchedule.sw, EETGW_ProjectsSchedule.ew,
EETGW_ProjectsSchedule.swa, EETGW_ProjectsSchedule.ewa, Projects.sdate, Projects.ddate, EETGW_ProjectsSchedule.complete, EETGW_ProjectsSchedule.uidname,
EETGW_ProjectsSchedule.progress
EETGW_ProjectsSchedule.progress, Projects.userprocess, Projects.status
FROM Projects LEFT OUTER JOIN
EETGW_ProjectsSchedule ON Projects.gcode = EETGW_ProjectsSchedule.gcode AND Projects.idx = EETGW_ProjectsSchedule.project
WHERE (Projects.gcode = @gcode) AND (Projects.status = '검토' OR