This commit is contained in:
chi
2023-01-16 22:53:29 +09:00
parent 913ae6b261
commit e487cdb3e3
20 changed files with 1527 additions and 2218 deletions

View File

@@ -3206,6 +3206,12 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnddate;
private global::System.Data.DataColumn columncomplete;
private global::System.Data.DataColumn columnuidname;
private global::System.Data.DataColumn columnprogress;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public UserScheduleTableDataTable() {
@@ -3359,6 +3365,30 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn completeColumn {
get {
return this.columncomplete;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn uidnameColumn {
get {
return this.columnuidname;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn progressColumn {
get {
return this.columnprogress;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -3396,7 +3426,23 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public UserScheduleTableRow AddUserScheduleTableRow(int ScheduleNo, string gcode, string name, int no, int seq, string title, string uid, string sw, string ew, string swa, string ewa, string sdate, string ddate) {
public UserScheduleTableRow AddUserScheduleTableRow(
int ScheduleNo,
string gcode,
string name,
int no,
int seq,
string title,
string uid,
string sw,
string ew,
string swa,
string ewa,
string sdate,
string ddate,
bool complete,
string uidname,
int progress) {
UserScheduleTableRow rowUserScheduleTableRow = ((UserScheduleTableRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -3413,7 +3459,10 @@ namespace FPJ0000 {
swa,
ewa,
sdate,
ddate};
ddate,
complete,
uidname,
progress};
rowUserScheduleTableRow.ItemArray = columnValuesArray;
this.Rows.Add(rowUserScheduleTableRow);
return rowUserScheduleTableRow;
@@ -3459,6 +3508,9 @@ namespace FPJ0000 {
this.columnewa = base.Columns["ewa"];
this.columnsdate = base.Columns["sdate"];
this.columnddate = base.Columns["ddate"];
this.columncomplete = base.Columns["complete"];
this.columnuidname = base.Columns["uidname"];
this.columnprogress = base.Columns["progress"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3494,6 +3546,12 @@ namespace FPJ0000 {
base.Columns.Add(this.columnsdate);
this.columnddate = new global::System.Data.DataColumn("ddate", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnddate);
this.columncomplete = new global::System.Data.DataColumn("complete", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columncomplete);
this.columnuidname = new global::System.Data.DataColumn("uidname", typeof(string), null, global::System.Data.MappingType.Element);
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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnSubIDX,
this.columnidx}, true));
@@ -3519,6 +3577,7 @@ namespace FPJ0000 {
this.columnewa.MaxLength = 10;
this.columnsdate.MaxLength = 50;
this.columnddate.MaxLength = 50;
this.columnuidname.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6066,6 +6125,54 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool complete {
get {
if (this.IscompleteNull()) {
return false;
}
else {
return ((bool)(this[this.tableUserScheduleTable.completeColumn]));
}
}
set {
this[this.tableUserScheduleTable.completeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string uidname {
get {
if (this.IsuidnameNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableUserScheduleTable.uidnameColumn]));
}
}
set {
this[this.tableUserScheduleTable.uidnameColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int progress {
get {
if (this.IsprogressNull()) {
return 0;
}
else {
return ((int)(this[this.tableUserScheduleTable.progressColumn]));
}
}
set {
this[this.tableUserScheduleTable.progressColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsScheduleNoNull() {
@@ -6209,6 +6316,42 @@ namespace FPJ0000 {
public void SetddateNull() {
this[this.tableUserScheduleTable.ddateColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IscompleteNull() {
return this.IsNull(this.tableUserScheduleTable.completeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetcompleteNull() {
this[this.tableUserScheduleTable.completeColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsuidnameNull() {
return this.IsNull(this.tableUserScheduleTable.uidnameColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetuidnameNull() {
this[this.tableUserScheduleTable.uidnameColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsprogressNull() {
return this.IsNull(this.tableUserScheduleTable.progressColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetprogressNull() {
this[this.tableUserScheduleTable.progressColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -9017,6 +9160,9 @@ ORDER BY title, ww";
tableMapping.ColumnMappings.Add("ewa", "ewa");
tableMapping.ColumnMappings.Add("sdate", "sdate");
tableMapping.ColumnMappings.Add("ddate", "ddate");
tableMapping.ColumnMappings.Add("complete", "complete");
tableMapping.ColumnMappings.Add("uidname", "uidname");
tableMapping.ColumnMappings.Add("progress", "progress");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -9035,7 +9181,8 @@ ORDER BY title, ww";
this._commandCollection[0].Connection = this.Connection;
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.swa, EETGW_ProjectsSchedule.ewa, Projects.sdate, Projects.ddate, EETGW_ProjectsSchedule.complete, EETGW_ProjectsSchedule.uidname,
EETGW_ProjectsSchedule.progress
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 = '진행') AND (ISNULL(Projects.isdel, 0) = 0) AND (dbo.getLastProjectScheduleNo(Projects.gcode, Projects.idx)