문자편집기 창 별도 추가했음,

휴가내역 정렬 수정
This commit is contained in:
chi
2020-06-05 13:10:14 +09:00
parent a844e35d0b
commit bd442b73a8
20 changed files with 2697 additions and 1198 deletions

View File

@@ -645,6 +645,18 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnuserprocess;
private global::System.Data.DataColumn columnCMP_Background;
private global::System.Data.DataColumn columnCMP_Description;
private global::System.Data.DataColumn columnCMP_Before;
private global::System.Data.DataColumn columnCMP_After;
private global::System.Data.DataColumn columnbCost;
private global::System.Data.DataColumn columnbFanOut;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public ProjectsDataTable() :
@@ -983,6 +995,54 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn CMP_BackgroundColumn {
get {
return this.columnCMP_Background;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn CMP_DescriptionColumn {
get {
return this.columnCMP_Description;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn CMP_BeforeColumn {
get {
return this.columnCMP_Before;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn CMP_AfterColumn {
get {
return this.columnCMP_After;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn bCostColumn {
get {
return this.columnbCost;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn bFanOutColumn {
get {
return this.columnbFanOut;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1056,7 +1116,13 @@ namespace FPJ0000 {
string lasthistory,
string gcode,
string category,
string userprocess) {
string userprocess,
string CMP_Background,
string CMP_Description,
string CMP_Before,
string CMP_After,
bool bCost,
bool bFanOut) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1095,7 +1161,13 @@ namespace FPJ0000 {
lasthistory,
gcode,
category,
userprocess};
userprocess,
CMP_Background,
CMP_Description,
CMP_Before,
CMP_After,
bCost,
bFanOut};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1138,7 +1210,13 @@ namespace FPJ0000 {
string lasthistory,
string gcode,
string category,
string userprocess) {
string userprocess,
string CMP_Background,
string CMP_Description,
string CMP_Before,
string CMP_After,
bool bCost,
bool bFanOut) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1177,7 +1255,13 @@ namespace FPJ0000 {
lasthistory,
gcode,
category,
userprocess};
userprocess,
CMP_Background,
CMP_Description,
CMP_Before,
CMP_After,
bCost,
bFanOut};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1244,6 +1328,12 @@ namespace FPJ0000 {
this.columngcode = base.Columns["gcode"];
this.columncategory = base.Columns["category"];
this.columnuserprocess = base.Columns["userprocess"];
this.columnCMP_Background = base.Columns["CMP_Background"];
this.columnCMP_Description = base.Columns["CMP_Description"];
this.columnCMP_Before = base.Columns["CMP_Before"];
this.columnCMP_After = base.Columns["CMP_After"];
this.columnbCost = base.Columns["bCost"];
this.columnbFanOut = base.Columns["bFanOut"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1323,6 +1413,18 @@ namespace FPJ0000 {
base.Columns.Add(this.columncategory);
this.columnuserprocess = new global::System.Data.DataColumn("userprocess", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnuserprocess);
this.columnCMP_Background = new global::System.Data.DataColumn("CMP_Background", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCMP_Background);
this.columnCMP_Description = new global::System.Data.DataColumn("CMP_Description", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCMP_Description);
this.columnCMP_Before = new global::System.Data.DataColumn("CMP_Before", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCMP_Before);
this.columnCMP_After = new global::System.Data.DataColumn("CMP_After", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCMP_After);
this.columnbCost = new global::System.Data.DataColumn("bCost", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnbCost);
this.columnbFanOut = new global::System.Data.DataColumn("bFanOut", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnbFanOut);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1361,6 +1463,10 @@ namespace FPJ0000 {
this.columngcode.MaxLength = 10;
this.columncategory.MaxLength = 50;
this.columnuserprocess.MaxLength = 100;
this.columnCMP_Background.MaxLength = 2147483647;
this.columnCMP_Description.MaxLength = 2147483647;
this.columnCMP_Before.MaxLength = 2147483647;
this.columnCMP_After.MaxLength = 2147483647;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5811,6 +5917,102 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string CMP_Background {
get {
if (this.IsCMP_BackgroundNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.CMP_BackgroundColumn]));
}
}
set {
this[this.tableProjects.CMP_BackgroundColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string CMP_Description {
get {
if (this.IsCMP_DescriptionNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.CMP_DescriptionColumn]));
}
}
set {
this[this.tableProjects.CMP_DescriptionColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string CMP_Before {
get {
if (this.IsCMP_BeforeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.CMP_BeforeColumn]));
}
}
set {
this[this.tableProjects.CMP_BeforeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string CMP_After {
get {
if (this.IsCMP_AfterNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.CMP_AfterColumn]));
}
}
set {
this[this.tableProjects.CMP_AfterColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool bCost {
get {
if (this.IsbCostNull()) {
return false;
}
else {
return ((bool)(this[this.tableProjects.bCostColumn]));
}
}
set {
this[this.tableProjects.bCostColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool bFanOut {
get {
if (this.IsbFanOutNull()) {
return false;
}
else {
return ((bool)(this[this.tableProjects.bFanOutColumn]));
}
}
set {
this[this.tableProjects.bFanOutColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsnameNull() {
@@ -6206,6 +6408,78 @@ namespace FPJ0000 {
public void SetuserprocessNull() {
this[this.tableProjects.userprocessColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsCMP_BackgroundNull() {
return this.IsNull(this.tableProjects.CMP_BackgroundColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetCMP_BackgroundNull() {
this[this.tableProjects.CMP_BackgroundColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsCMP_DescriptionNull() {
return this.IsNull(this.tableProjects.CMP_DescriptionColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetCMP_DescriptionNull() {
this[this.tableProjects.CMP_DescriptionColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsCMP_BeforeNull() {
return this.IsNull(this.tableProjects.CMP_BeforeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetCMP_BeforeNull() {
this[this.tableProjects.CMP_BeforeColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsCMP_AfterNull() {
return this.IsNull(this.tableProjects.CMP_AfterColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetCMP_AfterNull() {
this[this.tableProjects.CMP_AfterColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsbCostNull() {
return this.IsNull(this.tableProjects.bCostColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetbCostNull() {
this[this.tableProjects.bCostColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsbFanOutNull() {
return this.IsNull(this.tableProjects.bFanOutColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetbFanOutNull() {
this[this.tableProjects.bFanOutColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -9562,6 +9836,12 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("gcode", "gcode");
tableMapping.ColumnMappings.Add("category", "category");
tableMapping.ColumnMappings.Add("userprocess", "userprocess");
tableMapping.ColumnMappings.Add("CMP_Background", "CMP_Background");
tableMapping.ColumnMappings.Add("CMP_Description", "CMP_Description");
tableMapping.ColumnMappings.Add("CMP_Before", "CMP_Before");
tableMapping.ColumnMappings.Add("CMP_After", "CMP_After");
tableMapping.ColumnMappings.Add("bCost", "bCost");
tableMapping.ColumnMappings.Add("bFanOut", "bFanOut");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -9572,8 +9852,8 @@ namespace FPJ0000.dsPRJTableAdapters {
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO Projects
(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, gcode, category, userprocess)
VALUES (@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,@gcode,@category,@userprocess);
progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut)
VALUES (@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,@gcode,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut);
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 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '' THEN '0' WHEN ([status] = '') THEN '1' WHEN ([status] = '') THEN '2' WHEN ([status] = '') THEN '3' WHEN ([status] = '') THEN '9' ELSE '5' END)";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -9610,14 +9890,21 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._adapter.InsertCommand.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._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE Projects
SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo,
wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt,
remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2,
orderno = @orderno, category = @category, userprocess = @userprocess
WHERE (idx = @Original_idx);
orderno = @orderno, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before,
CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut
WHERE (idx = @Original_idx);
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 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '' THEN '0' WHEN ([status] = '') THEN '1' WHEN ([status] = '') THEN '2' WHEN ([status] = '') THEN '3' WHEN ([status] = '') THEN '9' ELSE '5' END)";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -9653,6 +9940,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.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.Original, false, null, "", "", ""));
}
@@ -9671,7 +9964,8 @@ 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, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
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
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -9690,7 +9984,8 @@ 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, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut
FROM Projects
WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
@@ -9698,7 +9993,8 @@ 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, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
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
FROM Projects
WHERE (ISNULL(name, N'') LIKE @search OR
ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)";
@@ -9930,7 +10226,13 @@ WHERE (ISNULL(name, N'') LIKE @search OR
string orderno,
string gcode,
string category,
string userprocess) {
string userprocess,
string CMP_Background,
string CMP_Description,
string CMP_Before,
string CMP_After,
global::System.Nullable<bool> bCost,
global::System.Nullable<bool> bFanOut) {
if ((status == null)) {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -10130,6 +10432,42 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.InsertCommand.Parameters[33].Value = ((string)(userprocess));
}
if ((CMP_Background == null)) {
this.Adapter.InsertCommand.Parameters[34].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[34].Value = ((string)(CMP_Background));
}
if ((CMP_Description == null)) {
this.Adapter.InsertCommand.Parameters[35].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[35].Value = ((string)(CMP_Description));
}
if ((CMP_Before == null)) {
this.Adapter.InsertCommand.Parameters[36].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[36].Value = ((string)(CMP_Before));
}
if ((CMP_After == null)) {
this.Adapter.InsertCommand.Parameters[37].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[37].Value = ((string)(CMP_After));
}
if ((bCost.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[38].Value = ((bool)(bCost.Value));
}
else {
this.Adapter.InsertCommand.Parameters[38].Value = global::System.DBNull.Value;
}
if ((bFanOut.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[39].Value = ((bool)(bFanOut.Value));
}
else {
this.Adapter.InsertCommand.Parameters[39].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -10184,6 +10522,12 @@ WHERE (ISNULL(name, N'') LIKE @search OR
string orderno,
string category,
string userprocess,
string CMP_Background,
string CMP_Description,
string CMP_Before,
string CMP_After,
global::System.Nullable<bool> bCost,
global::System.Nullable<bool> bFanOut,
int Original_idx,
int idx) {
if ((status == null)) {
@@ -10379,8 +10723,44 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(userprocess));
}
this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[34].Value = ((int)(idx));
if ((CMP_Background == null)) {
this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(CMP_Background));
}
if ((CMP_Description == null)) {
this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(CMP_Description));
}
if ((CMP_Before == null)) {
this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(CMP_Before));
}
if ((CMP_After == null)) {
this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(CMP_After));
}
if ((bCost.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[37].Value = ((bool)(bCost.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
}
if ((bFanOut.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[38].Value = ((bool)(bFanOut.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value;
}
this.Adapter.UpdateCommand.Parameters[39].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[40].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {