This commit is contained in:
chi
2021-03-19 14:08:42 +09:00
parent 9d3e220d7f
commit 35d6c64b99
18 changed files with 731 additions and 538 deletions

View File

@@ -909,6 +909,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columncrdue;
private global::System.Data.DataColumn columnProgressPrj;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public ProjectsDataTable() :
@@ -1319,6 +1321,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn ProgressPrjColumn {
get {
return this.columnProgressPrj;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1401,7 +1411,8 @@ namespace FPJ0000 {
bool bCost,
bool bFanOut,
string div,
string crdue) {
string crdue,
double ProgressPrj) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1449,7 +1460,8 @@ namespace FPJ0000 {
bCost,
bFanOut,
div,
crdue};
crdue,
ProgressPrj};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1501,7 +1513,8 @@ namespace FPJ0000 {
bool bCost,
bool bFanOut,
string div,
string crdue) {
string crdue,
double ProgressPrj) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1549,7 +1562,8 @@ namespace FPJ0000 {
bCost,
bFanOut,
div,
crdue};
crdue,
ProgressPrj};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1625,6 +1639,7 @@ namespace FPJ0000 {
this.columnbFanOut = base.Columns["bFanOut"];
this.columndiv = base.Columns["div"];
this.columncrdue = base.Columns["crdue"];
this.columnProgressPrj = base.Columns["ProgressPrj"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1722,6 +1737,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columndiv);
this.columncrdue = new global::System.Data.DataColumn("crdue", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columncrdue);
this.columnProgressPrj = new global::System.Data.DataColumn("ProgressPrj", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnProgressPrj);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1766,6 +1783,7 @@ namespace FPJ0000 {
this.columnCMP_After.MaxLength = 2147483647;
this.columndiv.MaxLength = 2;
this.columncrdue.MaxLength = 10;
this.columnProgressPrj.ReadOnly = true;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10820,6 +10838,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double ProgressPrj {
get {
try {
return ((double)(this[this.tableProjects.ProgressPrjColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'ProgressPrj\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tableProjects.ProgressPrjColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsnameNull() {
@@ -11323,6 +11357,18 @@ namespace FPJ0000 {
public void SetcrdueNull() {
this[this.tableProjects.crdueColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsProgressPrjNull() {
return this.IsNull(this.tableProjects.ProgressPrjColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetProgressPrjNull() {
this[this.tableProjects.ProgressPrjColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -19365,6 +19411,7 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("bFanOut", "bFanOut");
tableMapping.ColumnMappings.Add("div", "div");
tableMapping.ColumnMappings.Add("crdue", "crdue");
tableMapping.ColumnMappings.Add("ProgressPrj", "ProgressPrj");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -19725,7 +19772,7 @@ namespace FPJ0000.dsPRJTableAdapters {
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, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut, div, crdue
bCost, bFanOut, div, crdue, dbo.getScheduleProgress(idx) AS ProgressPrj
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -19745,7 +19792,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
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, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut
bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj
FROM Projects
WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
@@ -19754,7 +19801,7 @@ WHERE (idx = @idx)";
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
bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj
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
@@ -29180,8 +29227,10 @@ WHERE (idx = @idx)";
a.crdue
FROM Projects AS a INNER JOIN
ProjectsPart AS b ON a.idx = b.Project
WHERE (a.gcode = @gcode) AND (ISNULL(b.qtybuy, 0) > 0) AND (ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) AND (a.status IN ('', '', '()')) AND (ISNULL(b.bCancel, 0) = 0) AND
(ISNULL(a.orderno, '') <> '')
WHERE (a.gcode = @gcode) AND (ISNULL(b.qtybuy, 0) > 0) AND (a.status IN ('', '', '()')) AND (ISNULL(b.bCancel, 0) = 0) AND (ISNULL(a.orderno, '') <> '') AND (ISNULL(b.bbuy, 0)
= 0 OR
ISNULL(b.bconfirm, 0) = 0 OR
ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0))
ORDER BY ISNULL(b.bbuy, 0), ISNULL(b.bconfirm, 0), ISNULL(a.userManager, ''), ISNULL(b.Project, 0)";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].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, "", "", ""));
@@ -29192,7 +29241,9 @@ ORDER BY ISNULL(b.bbuy, 0), ISNULL(b.bconfirm, 0), ISNULL(a.userManager, ''), IS
a.crdue
FROM Projects AS a INNER JOIN
ProjectsPart AS b ON a.idx = b.Project
WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AND (ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) AND (a.status IN ('', '', '()'))";
WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AND (a.status IN ('', '', '()')) AND (ISNULL(b.bbuy, 0) = 0 OR
ISNULL(b.bconfirm, 0) = 0 OR
ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0))";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].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, "", "", ""));
this._commandCollection[1].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, "", "", ""));