1. 업무일지 작업형태 선택 ui 변경

2. 작업형태 목록 편집 UI 추가
3. 스케쥴 관련메일 발송주기를 15분에서 30분으로 변경하고 18시 이후에는 발송하지 않게 한다(최근 오류메세지가 수신된다)
This commit is contained in:
chi
2025-01-03 09:09:25 +09:00
parent c810348fa6
commit 4593c6fd74
25 changed files with 1644 additions and 664 deletions

View File

@@ -1256,6 +1256,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnwdate;
private global::System.Data.DataColumn columnsvalue2;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public CommonDataTable() {
@@ -1369,6 +1371,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 svalue2Column {
get {
return this.columnsvalue2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1406,7 +1416,7 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public CommonRow AddCommonRow(string gcode, string grp, string code, string svalue, int ivalue, double fvalue, string memo, string wuid, System.DateTime wdate) {
public CommonRow AddCommonRow(string gcode, string grp, string code, string svalue, int ivalue, double fvalue, string memo, string wuid, System.DateTime wdate, string svalue2) {
CommonRow rowCommonRow = ((CommonRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1418,7 +1428,8 @@ namespace FPJ0000 {
fvalue,
memo,
wuid,
wdate};
wdate,
svalue2};
rowCommonRow.ItemArray = columnValuesArray;
this.Rows.Add(rowCommonRow);
return rowCommonRow;
@@ -1458,6 +1469,7 @@ namespace FPJ0000 {
this.columnmemo = base.Columns["memo"];
this.columnwuid = base.Columns["wuid"];
this.columnwdate = base.Columns["wdate"];
this.columnsvalue2 = base.Columns["svalue2"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1483,6 +1495,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnwuid);
this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnwdate);
this.columnsvalue2 = new global::System.Data.DataColumn("svalue2", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnsvalue2);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1500,6 +1514,7 @@ namespace FPJ0000 {
this.columnwuid.AllowDBNull = false;
this.columnwuid.MaxLength = 20;
this.columnwdate.AllowDBNull = false;
this.columnsvalue2.MaxLength = 1000;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2459,6 +2474,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string svalue2 {
get {
if (this.Issvalue2Null()) {
return string.Empty;
}
else {
return ((string)(this[this.tableCommon.svalue2Column]));
}
}
set {
this[this.tableCommon.svalue2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsgrpNull() {
@@ -2530,6 +2561,18 @@ namespace FPJ0000 {
public void SetmemoNull() {
this[this.tableCommon.memoColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool Issvalue2Null() {
return this.IsNull(this.tableCommon.svalue2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void Setsvalue2Null() {
this[this.tableCommon.svalue2Column] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -3361,10 +3404,11 @@ ORDER BY name, pdate";
tableMapping.ColumnMappings.Add("memo", "memo");
tableMapping.ColumnMappings.Add("wuid", "wuid");
tableMapping.ColumnMappings.Add("wdate", "wdate");
tableMapping.ColumnMappings.Add("svalue2", "svalue2");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))";
this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_svalue2 = 1 AND [svalue2] IS NULL) OR ([svalue2] = @Original_svalue2)))";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -3382,10 +3426,12 @@ ORDER BY name, pdate";
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_svalue2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_svalue2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate);
SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY code";
this._adapter.InsertCommand.CommandText = @"INSERT INTO [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate], [svalue2]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate, @svalue2);
SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2 FROM Common WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY code";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, 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("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3396,10 +3442,11 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@svalue2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", 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 [Common] SET [gcode] = @gcode, [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = @idx) ORDER BY code";
this._adapter.UpdateCommand.CommandText = @"UPDATE [Common] SET [gcode] = @gcode, [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [svalue2] = @svalue2 WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_svalue2 = 1 AND [svalue2] IS NULL) OR ([svalue2] = @Original_svalue2)));
SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2 FROM Common WITH (nolock) WHERE (idx = @idx) ORDER BY code";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3410,6 +3457,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@svalue2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", 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, 0, 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -3426,6 +3474,8 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_svalue2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_svalue2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", 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.Current, false, null, "", "", ""));
}
@@ -3439,14 +3489,24 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Comm" +
"on WITH (nolock) WHERE (gcode = @gcode) AND (grp = @grp) ORDER BY code";
this._commandCollection[0].CommandText = "SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2" +
"\r\nFROM Common WITH (nolock)\r\nWHERE (gcode = @gcode) AND (grp = @grp)\r\nORDER" +
" BY code";
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, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = "SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2" +
"\r\nFROM Common WITH (nolock)\r\nWHERE (gcode = @gcode) AND (grp = @grp) AND (I" +
"SNULL(svalue2, \'\') = @jobtype)\r\nORDER BY code";
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("@grp", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobtype", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3497,6 +3557,66 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
return dataTable;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
public virtual int FillByJobProcess(dsJobReport.CommonDataTable dataTable, string gcode, string grp, string jobtype) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((grp == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(grp));
}
if ((jobtype == null)) {
throw new global::System.ArgumentNullException("jobtype");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(jobtype));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
int returnValue = this.Adapter.Fill(dataTable);
return returnValue;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual dsJobReport.CommonDataTable GetByJobProcess(string gcode, string grp, string jobtype) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((grp == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(grp));
}
if ((jobtype == null)) {
throw new global::System.ArgumentNullException("jobtype");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(jobtype));
}
dsJobReport.CommonDataTable dataTable = new dsJobReport.CommonDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
@@ -3530,7 +3650,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
public virtual int Delete(int Original_idx, string Original_gcode, string Original_grp, string Original_code, string Original_svalue, global::System.Nullable<int> Original_ivalue, global::System.Nullable<double> Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate) {
public virtual int Delete(int Original_idx, string Original_gcode, string Original_grp, string Original_code, string Original_svalue, global::System.Nullable<int> Original_ivalue, global::System.Nullable<double> Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_svalue2) {
this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
if ((Original_gcode == null)) {
throw new global::System.ArgumentNullException("Original_gcode");
@@ -3593,6 +3713,14 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_wuid));
}
this.Adapter.DeleteCommand.Parameters[15].Value = ((System.DateTime)(Original_wdate));
if ((Original_svalue2 == null)) {
this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[17].Value = global::System.DBNull.Value;
}
else {
this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[17].Value = ((string)(Original_svalue2));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -3613,7 +3741,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
public virtual int Insert(string gcode, string grp, string code, string svalue, global::System.Nullable<int> ivalue, global::System.Nullable<double> fvalue, string memo, string wuid, System.DateTime wdate) {
public virtual int Insert(string gcode, string grp, string code, string svalue, global::System.Nullable<int> ivalue, global::System.Nullable<double> fvalue, string memo, string wuid, System.DateTime wdate, string svalue2) {
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
@@ -3663,6 +3791,12 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
this.Adapter.InsertCommand.Parameters[7].Value = ((string)(wuid));
}
this.Adapter.InsertCommand.Parameters[8].Value = ((System.DateTime)(wdate));
if ((svalue2 == null)) {
this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[9].Value = ((string)(svalue2));
}
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)) {
@@ -3693,6 +3827,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
string memo,
string wuid,
System.DateTime wdate,
string svalue2,
int Original_idx,
string Original_gcode,
string Original_grp,
@@ -3703,6 +3838,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
string Original_memo,
string Original_wuid,
System.DateTime Original_wdate,
string Original_svalue2,
int idx) {
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
@@ -3753,69 +3889,83 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(wuid));
}
this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(wdate));
this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_idx));
if ((svalue2 == null)) {
this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(svalue2));
}
this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_idx));
if ((Original_gcode == null)) {
throw new global::System.ArgumentNullException("Original_gcode");
}
else {
this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_gcode));
this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_gcode));
}
if ((Original_grp == null)) {
this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_grp));
this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_grp));
}
if ((Original_code == null)) {
this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_code));
this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_code));
}
if ((Original_svalue == null)) {
this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_svalue));
this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_svalue));
}
if ((Original_ivalue.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_ivalue.Value));
this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_ivalue.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
}
if ((Original_fvalue.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[20].Value = ((double)(Original_fvalue.Value));
this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[21].Value = ((double)(Original_fvalue.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
}
if ((Original_memo == null)) {
this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_memo));
this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_memo));
}
if ((Original_wuid == null)) {
throw new global::System.ArgumentNullException("Original_wuid");
}
else {
this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_wuid));
this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_wuid));
}
this.Adapter.UpdateCommand.Parameters[24].Value = ((System.DateTime)(Original_wdate));
this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(idx));
this.Adapter.UpdateCommand.Parameters[25].Value = ((System.DateTime)(Original_wdate));
if ((Original_svalue2 == null)) {
this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_svalue2));
}
this.Adapter.UpdateCommand.Parameters[28].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)) {
@@ -3846,6 +3996,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
string memo,
string wuid,
System.DateTime wdate,
string svalue2,
int Original_idx,
string Original_gcode,
string Original_grp,
@@ -3855,8 +4006,9 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
global::System.Nullable<double> Original_fvalue,
string Original_memo,
string Original_wuid,
System.DateTime Original_wdate) {
return this.Update(gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, Original_idx, Original_gcode, Original_grp, Original_code, Original_svalue, Original_ivalue, Original_fvalue, Original_memo, Original_wuid, Original_wdate, Original_idx);
System.DateTime Original_wdate,
string Original_svalue2) {
return this.Update(gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2, Original_idx, Original_gcode, Original_grp, Original_code, Original_svalue, Original_ivalue, Original_fvalue, Original_memo, Original_wuid, Original_wdate, Original_svalue2, Original_idx);
}
}