This commit is contained in:
chi
2025-01-14 16:25:43 +09:00
parent eb82bbf158
commit 1c74f81479
5 changed files with 264 additions and 147 deletions

View File

@@ -1135,6 +1135,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnbmajoritem;
private global::System.Data.DataColumn columnlastSchNo;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProjectsDataTable() :
@@ -1889,6 +1891,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn lastSchNoColumn {
get {
return this.columnlastSchNo;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2014,7 +2024,8 @@ namespace FPJ0000 {
double sfi_savecount,
double sfi_shiftcount,
double sfic,
bool bmajoritem) {
bool bmajoritem,
int lastSchNo) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -2105,7 +2116,8 @@ namespace FPJ0000 {
sfi_savecount,
sfi_shiftcount,
sfic,
bmajoritem};
bmajoritem,
lastSchNo};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -2200,7 +2212,8 @@ namespace FPJ0000 {
double sfi_savecount,
double sfi_shiftcount,
double sfic,
bool bmajoritem) {
bool bmajoritem,
int lastSchNo) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -2291,7 +2304,8 @@ namespace FPJ0000 {
sfi_savecount,
sfi_shiftcount,
sfic,
bmajoritem};
bmajoritem,
lastSchNo};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -2410,6 +2424,7 @@ namespace FPJ0000 {
this.columnsfi_shiftcount = base.Columns["sfi_shiftcount"];
this.columnsfic = base.Columns["sfic"];
this.columnbmajoritem = base.Columns["bmajoritem"];
this.columnlastSchNo = base.Columns["lastSchNo"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2593,6 +2608,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnsfic);
this.columnbmajoritem = new global::System.Data.DataColumn("bmajoritem", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnbmajoritem);
this.columnlastSchNo = new global::System.Data.DataColumn("lastSchNo", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnlastSchNo);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -2680,6 +2697,7 @@ namespace FPJ0000 {
this.columnlasthistory_date.ReadOnly = true;
this.columnlasthistory_date.MaxLength = 10;
this.columnsfi_type.MaxLength = 1;
this.columnlastSchNo.ReadOnly = true;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -14365,6 +14383,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public int lastSchNo {
get {
try {
return ((int)(this[this.tableProjects.lastSchNoColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'lastSchNo\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tableProjects.lastSchNoColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsnameNull() {
@@ -15384,6 +15418,18 @@ namespace FPJ0000 {
public void SetbmajoritemNull() {
this[this.tableProjects.bmajoritemColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IslastSchNoNull() {
return this.IsNull(this.tableProjects.lastSchNoColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void SetlastSchNoNull() {
this[this.tableProjects.lastSchNoColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -25133,6 +25179,7 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("sfi_shiftcount", "sfi_shiftcount");
tableMapping.ColumnMappings.Add("sfic", "sfic");
tableMapping.ColumnMappings.Add("bmajoritem", "bmajoritem");
tableMapping.ColumnMappings.Add("lastSchNo", "lastSchNo");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -25373,13 +25420,14 @@ namespace FPJ0000.dsPRJTableAdapters {
"yD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible,\r\n " +
" (SELECT MAX(pdate) AS Expr1\r\n FROM Projects" +
"History\r\n WHERE (pidx = Projects.idx)) AS lasthistory_date, " +
"sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem\r\nFR" +
"OM Projects WITH (nolock)\r\nWHERE (status LIKE @state) AND (ISNULL(userManag" +
"er, \'\') 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 ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'" +
"3\' WHEN ([status] = \'취소\') \r\n THEN \'9\' ELSE \'5\' END)";
"sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, db" +
"o.getLastProjectScheduleNo(gcode, idx) \r\n AS lastSchNo\r\nFROM P" +
"rojects WITH (nolock)\r\nWHERE (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 (gco" +
"de = @gcode)\r\nORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\'" +
") THEN \'1\' WHEN ([status] = \'보류\') 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, "", "", ""));
@@ -25391,12 +25439,43 @@ namespace FPJ0000.dsPRJTableAdapters {
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.Original, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx)";
this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut,
bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode,
idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory,
(SELECT MAX(pdate) AS Expr1
FROM ProjectsHistory
WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion,
dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno,
process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager,
userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo
FROM Projects WITH (nolock)
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 CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) 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 CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getSchedulePr" +
"ogressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid," +
" asset, bCost, bFanOut, \r\n bHighlight, bdate, bmajoritem, category" +
", cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effe" +
"ct_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, \r\n " +
" idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.get" +
"LastHistory(idx) AS lasthistory,\r\n (SELECT MAX(pdate) AS Expr" +
"1\r\n FROM ProjectsHistory\r\n WHERE (pid" +
"x = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserNam" +
"e(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, \r\n" +
" dbo.getUserName(designid) AS name_design, dbo.getUserName(epaneli" +
"d) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno," +
" part, path, pdate, pidx, pno, \r\n process, progress, qdate, remark" +
"_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime" +
", sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager," +
" \r\n userhw2, usermain, userprocess, usersub, wdate, wuid, \'\' AS ww" +
"d, \'\' AS wwe, \'\' AS wwo, \'\' AS wws, dbo.getLastProjectScheduleNo(gcode, idx) AS " +
"lastSchNo\r\nFROM Projects WITH (nolock)\r\nWHERE (ISNULL(name, N\'\') LIKE @sear" +
"ch) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR\r\n (ISNULL(i" +
"sdel, 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, "", "", ""));