diff --git a/EETGW.v12.suo b/EETGW.v12.suo index 6293385..aa34d1d 100644 Binary files a/EETGW.v12.suo and b/EETGW.v12.suo differ diff --git a/SubProject/FBS0000/fMinutesDetail.cs b/SubProject/FBS0000/fMinutesDetail.cs index 4f0e66a..f26ed11 100644 --- a/SubProject/FBS0000/fMinutesDetail.cs +++ b/SubProject/FBS0000/fMinutesDetail.cs @@ -38,8 +38,8 @@ namespace FBS0000 var f = new FCM0000.fLovProject(""); if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - this.tbPrj.Text = f.Project.ToString(); - this.tbPrjName.Text = f.ProjectName; + this.tbPrj.Text = f.Index.ToString(); + this.tbPrjName.Text = f.Title; placeTextBox.Focus(); } } @@ -58,8 +58,8 @@ namespace FBS0000 var f = new FCM0000.fLovProject("%" + search + "%"); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - this.tbPrj.Text = f.Project.ToString(); - this.tbPrjName.Text = f.ProjectName; + this.tbPrj.Text = f.Index.ToString(); + this.tbPrjName.Text = f.Title; SendKeys.Send("{TAB}"); } } diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index 35eb4a8..bd10437 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -120,6 +120,12 @@ fItems.cs + + Form + + + fLovSupply.cs + Form @@ -162,6 +168,9 @@ fItems.cs + + fLovSupply.cs + fLovProject.cs diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index d309227..2036f3c 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -581,6 +581,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columncate; + private global::System.Data.DataColumn columnsupplyidx; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ItemsDataTable() { @@ -702,6 +704,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn supplyidxColumn { + get { + return this.columnsupplyidx; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -739,7 +749,7 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ItemsRow AddItemsRow(string name, string sid, string model, string manu, string supply, string memo, string wuid, System.DateTime wdate, decimal price, string cate) { + public ItemsRow AddItemsRow(string name, string sid, string model, string manu, string supply, string memo, string wuid, System.DateTime wdate, decimal price, string cate, int supplyidx) { ItemsRow rowItemsRow = ((ItemsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -752,7 +762,8 @@ namespace FCM0000 { wuid, wdate, price, - cate}; + cate, + supplyidx}; rowItemsRow.ItemArray = columnValuesArray; this.Rows.Add(rowItemsRow); return rowItemsRow; @@ -793,6 +804,7 @@ namespace FCM0000 { this.columnwdate = base.Columns["wdate"]; this.columnprice = base.Columns["price"]; this.columncate = base.Columns["cate"]; + this.columnsupplyidx = base.Columns["supplyidx"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -820,6 +832,8 @@ namespace FCM0000 { base.Columns.Add(this.columnprice); this.columncate = new global::System.Data.DataColumn("cate", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columncate); + this.columnsupplyidx = new global::System.Data.DataColumn("supplyidx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsupplyidx); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -828,11 +842,11 @@ namespace FCM0000 { this.columnidx.AllowDBNull = false; this.columnidx.ReadOnly = true; this.columnidx.Unique = true; - this.columnname.MaxLength = 50; + this.columnname.MaxLength = 100; this.columnsid.MaxLength = 50; - this.columnmodel.MaxLength = 50; - this.columnmanu.MaxLength = 50; - this.columnsupply.MaxLength = 50; + this.columnmodel.MaxLength = 100; + this.columnmanu.MaxLength = 100; + this.columnsupply.MaxLength = 100; this.columnmemo.MaxLength = 255; this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; @@ -4563,6 +4577,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int supplyidx { + get { + try { + return ((int)(this[this.tableItems.supplyidxColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Items\' 테이블의 \'supplyidx\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableItems.supplyidxColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -4658,6 +4688,18 @@ namespace FCM0000 { public void SetcateNull() { this[this.tableItems.cateColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IssupplyidxNull() { + return this.IsNull(this.tableItems.supplyidxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetsupplyidxNull() { + this[this.tableItems.supplyidxColumn] = global::System.Convert.DBNull; + } } /// @@ -7502,10 +7544,11 @@ namespace FCM0000.dsMSSQLTableAdapters { tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("price", "price"); tableMapping.ColumnMappings.Add("cate", "cate"); + tableMapping.ColumnMappings.Add("supplyidx", "supplyidx"); 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 [Items] WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Items] WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)))"; 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("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -7526,10 +7569,12 @@ namespace FCM0000.dsMSSQLTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 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_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", 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 [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7541,10 +7586,11 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM 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.DateTime, 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("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", 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 [Items] SET [name] = @name, [sid] = @sid, [model] = @model, [manu] = @manu, [supply] = @supply, [price] = @price, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [cate] = @cate WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate))); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM Items WHERE (idx = @idx) ORDER BY cate, name"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [Items] SET [name] = @name, [sid] = @sid, [model] = @model, [manu] = @manu, [supply] = @supply, [price] = @price, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [cate] = @cate, [supplyidx] = @supplyidx WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items WHERE (idx = @idx) ORDER BY cate, name"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7556,6 +7602,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM 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.DateTime, 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("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", 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("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -7575,6 +7622,8 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 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_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", 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, "", "", "")); } @@ -7588,20 +7637,31 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate\r\nFROM" + - " Items\r\nORDER BY cate, name"; + this._commandCollection[0].CommandText = "SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp" + + "lyidx\r\nFROM Items\r\nORDER BY cate, name, idx"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT cate, idx, manu, memo, model, name, price, sid, supply, wdate, wuid\r\nFROM" + - " Items\r\nORDER BY cate, name"; + this._commandCollection[1].CommandText = @"SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx +FROM Items +WHERE (sid IN + (SELECT sid + FROM Items AS Items_1 + GROUP BY sid + HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') +ORDER BY sid, cate, name, idx"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT cate, idx, manu, memo, model, name, price, sid, supply, wdate, wuid + this._commandCollection[2].CommandText = "SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate," + + " wuid\r\nFROM Items\r\nORDER BY cate, name, idx"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = @"SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, wuid FROM Items WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(sid, N'') LIKE @search) OR @@ -7609,15 +7669,15 @@ WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(supply, N'') LIKE @search) OR (ISNULL(model, N'') LIKE @search) OR (ISNULL(memo, N'') LIKE @search) -ORDER BY cate, name"; - this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[2].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] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "SELECT cate, idx, manu, memo, model, name, price, sid, supply, wdate, wuid FROM I" + - "tems WHERE (idx = @idx)"; +ORDER BY cate, name, idx"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[3].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].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[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, " + + "wuid FROM Items WHERE (idx = @idx)"; + this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[4].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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7648,7 +7708,7 @@ ORDER BY cate, name"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillNoImage(dsMSSQL.ItemsDataTable dataTable) { + public virtual int FillDupCheck(dsMSSQL.ItemsDataTable dataTable) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((this.ClearBeforeFill == true)) { dataTable.Clear(); @@ -7661,7 +7721,7 @@ ORDER BY cate, name"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual dsMSSQL.ItemsDataTable GetNoImage() { + public virtual dsMSSQL.ItemsDataTable GetDupCheck() { this.Adapter.SelectCommand = this.CommandCollection[1]; dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable(); this.Adapter.Fill(dataTable); @@ -7672,8 +7732,32 @@ ORDER BY cate, name"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillSearch(dsMSSQL.ItemsDataTable dataTable, string search) { + public virtual int FillNoImage(dsMSSQL.ItemsDataTable dataTable) { this.Adapter.SelectCommand = this.CommandCollection[2]; + 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", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsMSSQL.ItemsDataTable GetNoImage() { + this.Adapter.SelectCommand = this.CommandCollection[2]; + dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillSearch(dsMSSQL.ItemsDataTable dataTable, string search) { + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((search == null)) { throw new global::System.ArgumentNullException("search"); } @@ -7692,7 +7776,7 @@ ORDER BY cate, name"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.ItemsDataTable GetSearch(string search) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((search == null)) { throw new global::System.ArgumentNullException("search"); } @@ -7709,7 +7793,7 @@ ORDER BY cate, name"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.ItemsDataTable GetIDX(int idx) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; this.Adapter.SelectCommand.Parameters[0].Value = ((int)(idx)); dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable(); this.Adapter.Fill(dataTable); @@ -7749,7 +7833,7 @@ ORDER BY cate, name"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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_name, string Original_sid, string Original_model, string Original_manu, string Original_supply, global::System.Nullable Original_price, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_cate) { + public virtual int Delete(int Original_idx, string Original_name, string Original_sid, string Original_model, string Original_manu, string Original_supply, global::System.Nullable Original_price, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_cate, global::System.Nullable Original_supplyidx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_name == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -7822,6 +7906,14 @@ ORDER BY cate, name"; this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[18].Value = ((string)(Original_cate)); } + if ((Original_supplyidx.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[20].Value = ((int)(Original_supplyidx.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value; + } 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)) { @@ -7842,7 +7934,7 @@ ORDER BY cate, name"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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 name, string sid, string model, string manu, string supply, global::System.Nullable price, string memo, string wuid, System.DateTime wdate, string cate) { + public virtual int Insert(string name, string sid, string model, string manu, string supply, global::System.Nullable price, string memo, string wuid, System.DateTime wdate, string cate, global::System.Nullable supplyidx) { if ((name == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -7898,6 +7990,12 @@ ORDER BY cate, name"; else { this.Adapter.InsertCommand.Parameters[9].Value = ((string)(cate)); } + if ((supplyidx.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[10].Value = ((int)(supplyidx.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[10].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)) { @@ -7929,6 +8027,7 @@ ORDER BY cate, name"; string wuid, System.DateTime wdate, string cate, + global::System.Nullable supplyidx, int Original_idx, string Original_name, string Original_sid, @@ -7940,6 +8039,7 @@ ORDER BY cate, name"; string Original_wuid, System.DateTime Original_wdate, string Original_cate, + global::System.Nullable Original_supplyidx, int idx) { if ((name == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -7996,79 +8096,93 @@ ORDER BY cate, name"; else { this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(cate)); } - this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_idx)); - if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + if ((supplyidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(supplyidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_idx)); + if ((Original_name == null)) { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_name)); } if ((Original_sid == 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_sid)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_sid)); } if ((Original_model == 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_model)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_model)); } if ((Original_manu == null)) { - 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; } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_manu)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_manu)); } if ((Original_supply == null)) { - 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; } else { - this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_supply)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_supply)); } if ((Original_price.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[22].Value = ((decimal)(Original_price.Value)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((decimal)(Original_price.Value)); } else { - 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; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[26].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((System.DateTime)(Original_wdate)); if ((Original_cate == null)) { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_cate)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_cate)); } - this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(idx)); + if ((Original_supplyidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_supplyidx.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[32].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)) { @@ -8100,6 +8214,7 @@ ORDER BY cate, name"; string wuid, System.DateTime wdate, string cate, + global::System.Nullable supplyidx, int Original_idx, string Original_name, string Original_sid, @@ -8110,8 +8225,9 @@ ORDER BY cate, name"; string Original_memo, string Original_wuid, System.DateTime Original_wdate, - string Original_cate) { - return this.Update(name, sid, model, manu, supply, price, memo, wuid, wdate, cate, Original_idx, Original_name, Original_sid, Original_model, Original_manu, Original_supply, Original_price, Original_memo, Original_wuid, Original_wdate, Original_cate, Original_idx); + string Original_cate, + global::System.Nullable Original_supplyidx) { + return this.Update(name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, Original_idx, Original_name, Original_sid, Original_model, Original_manu, Original_supply, Original_price, Original_memo, Original_wuid, Original_wdate, Original_cate, Original_supplyidx, Original_idx); } } @@ -13109,7 +13225,7 @@ SELECT idx, grp, name, tel, fax, email, memo, wuid, wdate FROM Customs WHERE (id [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT Customs.*\r\nFROM Customs"; @@ -13119,6 +13235,12 @@ SELECT idx, grp, name, tel, fax, email, memo, wuid, wdate FROM Customs WHERE (id this._commandCollection[1].CommandText = "SELECT Customs.*\r\nFROM Customs\r\nwhere Grp = @grp"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "SELECT Customs.*\r\nFROM Customs\r\nwhere name like @search or tel like @search " + + "or email like @search or memo like @search"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13181,6 +13303,42 @@ SELECT idx, grp, name, tel, fax, email, memo, wuid, wdate FROM Customs WHERE (id return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillSearch(dsMSSQL.CustomsDataTable dataTable, string search) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((search == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); + } + 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", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsMSSQL.CustomsDataTable GetSearch(string search) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((search == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); + } + dsMSSQL.CustomsDataTable dataTable = new dsMSSQL.CustomsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 8299801..4877e33 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -12,7 +12,7 @@ - DELETE FROM [Items] WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate))) + DELETE FROM [Items] WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))) @@ -33,13 +33,15 @@ + + - INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name + INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name @@ -51,21 +53,22 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM + - SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate + SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items -ORDER BY cate, name +ORDER BY cate, name, idx - UPDATE [Items] SET [name] = @name, [sid] = @sid, [model] = @model, [manu] = @manu, [supply] = @supply, [price] = @price, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [cate] = @cate WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate))); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM Items WHERE (idx = @idx) ORDER BY cate, name + UPDATE [Items] SET [name] = @name, [sid] = @sid, [model] = @model, [manu] = @manu, [supply] = @supply, [price] = @price, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [cate] = @cate, [supplyidx] = @supplyidx WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items WHERE (idx = @idx) ORDER BY cate, name @@ -77,6 +80,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM + @@ -96,7 +100,9 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM - + + + @@ -114,14 +120,30 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate FROM + + + + + SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx +FROM Items +WHERE (sid IN + (SELECT sid + FROM Items AS Items_1 + GROUP BY sid + HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') +ORDER BY sid, cate, name, idx + + + + - SELECT cate, idx, manu, memo, model, name, price, sid, supply, wdate, wuid + SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, wuid FROM Items -ORDER BY cate, name +ORDER BY cate, name, idx @@ -129,7 +151,7 @@ ORDER BY cate, name - SELECT cate, idx, manu, memo, model, name, price, sid, supply, wdate, wuid + SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, wuid FROM Items WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(sid, N'') LIKE @search) OR @@ -137,7 +159,7 @@ WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(supply, N'') LIKE @search) OR (ISNULL(model, N'') LIKE @search) OR (ISNULL(memo, N'') LIKE @search) -ORDER BY cate, name +ORDER BY cate, name, idx @@ -147,7 +169,7 @@ ORDER BY cate, name - SELECT cate, idx, manu, memo, model, name, price, sid, supply, wdate, wuid FROM Items WHERE (idx = @idx) + SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, wuid FROM Items WHERE (idx = @idx) @@ -1085,6 +1107,18 @@ where Grp = @grp + + + + SELECT Customs.* +FROM Customs +where name like @search or tel like @search or email like @search or memo like @search + + + + + + @@ -1095,14 +1129,14 @@ where Grp = @grp - + - + @@ -1116,21 +1150,21 @@ where Grp = @grp - + - + - + @@ -1157,10 +1191,11 @@ where Grp = @grp + - + @@ -1230,7 +1265,7 @@ where Grp = @grp - + @@ -1301,7 +1336,7 @@ where Grp = @grp - + @@ -1346,7 +1381,7 @@ where Grp = @grp - + @@ -1413,7 +1448,7 @@ where Grp = @grp - + @@ -1472,7 +1507,7 @@ where Grp = @grp - + @@ -1536,7 +1571,7 @@ where Grp = @grp - + @@ -1625,53 +1660,53 @@ where Grp = @grp - + - + - + - + - + - + - + - + diff --git a/SubProject/FCM0000/dsMSSQL.xss b/SubProject/FCM0000/dsMSSQL.xss index 036a457..4a444c9 100644 --- a/SubProject/FCM0000/dsMSSQL.xss +++ b/SubProject/FCM0000/dsMSSQL.xss @@ -4,17 +4,17 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/SubProject/FCM0000/fInventory.cs b/SubProject/FCM0000/fInventory.cs index 1bd4e78..1433395 100644 --- a/SubProject/FCM0000/fInventory.cs +++ b/SubProject/FCM0000/fInventory.cs @@ -285,8 +285,8 @@ namespace FCM0000 var f = new fLovProject("%" + inputtext + "%"); if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - dv1.Rows[e.RowIndex].Cells["dvc_project"].Value = f.Project; - dv1.Rows[e.RowIndex].Cells["dvc_projectname"].Value = f.ProjectName; + dv1.Rows[e.RowIndex].Cells["dvc_project"].Value = f.Index; + dv1.Rows[e.RowIndex].Cells["dvc_projectname"].Value = f.Title; } } } diff --git a/SubProject/FCM0000/fItems.Designer.cs b/SubProject/FCM0000/fItems.Designer.cs index 2a16e43..252d40e 100644 --- a/SubProject/FCM0000/fItems.Designer.cs +++ b/SubProject/FCM0000/fItems.Designer.cs @@ -29,17 +29,25 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItems)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FCM0000.dsMSSQL(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.itemsBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); this.dv1 = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cate = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -55,20 +63,17 @@ this.cm1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); - this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.itemsBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.cmbMode = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); this.cm1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // bn @@ -90,19 +95,26 @@ this.bindingNavigatorSeparator2, this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, - this.itemsBindingNavigatorSaveItem, - this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 481); + this.itemsBindingNavigatorSaveItem}); + this.bn.Location = new System.Drawing.Point(0, 441); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(735, 25); + this.bn.Size = new System.Drawing.Size(758, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // + // bindingNavigatorAddNewItem + // + this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); + this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; + this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); + this.bindingNavigatorAddNewItem.Text = "Add(&A)"; + // // bs // this.bs.DataMember = "Items"; @@ -120,6 +132,32 @@ this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // + // bindingNavigatorDeleteItem + // + this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); + this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; + this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 22); + this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // // bindingNavigatorSeparator // this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; @@ -139,11 +177,37 @@ this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // // bindingNavigatorSeparator2 // this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // + // itemsBindingNavigatorSaveItem + // + this.itemsBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("itemsBindingNavigatorSaveItem.Image"))); + this.itemsBindingNavigatorSaveItem.Name = "itemsBindingNavigatorSaveItem"; + this.itemsBindingNavigatorSaveItem.Size = new System.Drawing.Size(67, 22); + this.itemsBindingNavigatorSaveItem.Text = "Save(&S)"; + this.itemsBindingNavigatorSaveItem.Click += new System.EventHandler(this.itemsBindingNavigatorSaveItem_Click); + // // dv1 // this.dv1.AllowUserToAddRows = false; @@ -163,19 +227,19 @@ this.dv1.ContextMenuStrip = this.cm1; this.dv1.DataSource = this.bs; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Location = new System.Drawing.Point(0, 25); this.dv1.Name = "dv1"; this.dv1.RowTemplate.Height = 23; - this.dv1.Size = new System.Drawing.Size(735, 481); + this.dv1.Size = new System.Drawing.Size(758, 416); this.dv1.TabIndex = 1; this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dv1_DataError); // // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle10; this.dataGridViewTextBoxColumn1.HeaderText = "idx"; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; this.dataGridViewTextBoxColumn1.ReadOnly = true; @@ -197,6 +261,8 @@ // dataGridViewTextBoxColumn3 // this.dataGridViewTextBoxColumn3.DataPropertyName = "sid"; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle11; this.dataGridViewTextBoxColumn3.HeaderText = "sid"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; this.dataGridViewTextBoxColumn3.Width = 47; @@ -225,8 +291,9 @@ // price // this.price.DataPropertyName = "price"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.price.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle12.Format = "N0"; + this.price.DefaultCellStyle = dataGridViewCellStyle12; this.price.HeaderText = "price"; this.price.Name = "price"; // @@ -265,87 +332,60 @@ // tam // this.tam.BackupDataSetBeforeUpdate = false; + this.tam.BoardTableAdapter = null; + this.tam.CommonTableAdapter = null; + this.tam.CustomsTableAdapter = null; this.tam.InventoryTableAdapter = null; this.tam.ItemsTableAdapter = this.ta; + this.tam.MailDataTableAdapter = null; + this.tam.MailFormTableAdapter = null; this.tam.ProjectsTableAdapter = null; + this.tam.RequestItemTableAdapter = null; this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // bindingNavigatorAddNewItem + // toolStrip1 // - this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); - this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; - this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); - this.bindingNavigatorAddNewItem.Text = "Add(&A)"; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel1, + this.cmbMode, + this.toolStripButton2}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(758, 25); + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "toolStrip1"; // - // bindingNavigatorDeleteItem + // cmbMode // - this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); - this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; - this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 22); - this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; + this.cmbMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbMode.Items.AddRange(new object[] { + "Normal", + "Duplication"}); + this.cmbMode.Name = "cmbMode"; + this.cmbMode.Size = new System.Drawing.Size(150, 25); // - // bindingNavigatorMoveFirstItem + // toolStripButton2 // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); - this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; - this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + this.toolStripButton2.Image = global::FCM0000.Properties.Resources.action_refresh; + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(66, 22); + this.toolStripButton2.Text = "Refresh"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // - // bindingNavigatorMovePreviousItem + // toolStripLabel1 // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); - this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; - this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); - this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; - this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); - this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; - this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // itemsBindingNavigatorSaveItem - // - this.itemsBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("itemsBindingNavigatorSaveItem.Image"))); - this.itemsBindingNavigatorSaveItem.Name = "itemsBindingNavigatorSaveItem"; - this.itemsBindingNavigatorSaveItem.Size = new System.Drawing.Size(67, 22); - this.itemsBindingNavigatorSaveItem.Text = "Save(&S)"; - this.itemsBindingNavigatorSaveItem.Click += new System.EventHandler(this.itemsBindingNavigatorSaveItem_Click); - // - // toolStripButton1 - // - this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton1.Image = global::FCM0000.Properties.Resources.action_refresh; - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(66, 22); - this.toolStripButton1.Text = "Refresh"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(68, 22); + this.toolStripLabel1.Text = "Query Type"; // // fItems // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(735, 506); + this.ClientSize = new System.Drawing.Size(758, 466); this.Controls.Add(this.dv1); + this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); this.Name = "fItems"; this.Text = "fItems"; @@ -357,6 +397,8 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); this.cm1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -394,6 +436,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; private System.Windows.Forms.DataGridViewTextBoxColumn price; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripComboBox cmbMode; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; } } \ No newline at end of file diff --git a/SubProject/FCM0000/fItems.cs b/SubProject/FCM0000/fItems.cs index 1b18f67..db404fa 100644 --- a/SubProject/FCM0000/fItems.cs +++ b/SubProject/FCM0000/fItems.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fItems : Form + public partial class fItems : FCOMMON.fBase { public fItems() { @@ -20,22 +20,20 @@ namespace FCM0000 void fItems_FormClosed(object sender, FormClosedEventArgs e) { - var form = this as Form; - FCOMMON.Util.SetFormStatus(ref form, this.Name, false); } private void fItems_Load(object sender, EventArgs e) { - var form = this as Form; - FCOMMON.Util.SetFormStatus(ref form, this.Name, true); - this.Show(); - Application.DoEvents(); - + this.cmbMode.SelectedIndex = 0; refreshData(); } void refreshData() { //refresh data - this.ta.FillNoImage(this.dsMSSQL.Items); + if (cmbMode.SelectedIndex == 0) + this.ta.FillNoImage(this.dsMSSQL.Items); + else + this.ta.FillDupCheck(this.dsMSSQL.Items); + this.dv1.AutoResizeColumns(); } @@ -71,7 +69,7 @@ namespace FCM0000 private void toolStripButton1_Click(object sender, EventArgs e) { - refreshData(); + } private void dv1_DataError(object sender, DataGridViewDataErrorEventArgs e) @@ -79,6 +77,11 @@ namespace FCM0000 } + private void toolStripButton2_Click(object sender, EventArgs e) + { + refreshData(); + } + } } diff --git a/SubProject/FCM0000/fItems.resx b/SubProject/FCM0000/fItems.resx index d0ef363..5747455 100644 --- a/SubProject/FCM0000/fItems.resx +++ b/SubProject/FCM0000/fItems.resx @@ -198,6 +198,9 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + 17, 17 + True @@ -213,4 +216,7 @@ 248, 17 + + 462, 17 + \ No newline at end of file diff --git a/SubProject/FCM0000/fLovProject.cs b/SubProject/FCM0000/fLovProject.cs index 6a7cdc6..55fad81 100644 --- a/SubProject/FCM0000/fLovProject.cs +++ b/SubProject/FCM0000/fLovProject.cs @@ -11,15 +11,15 @@ namespace FCM0000 { public partial class fLovProject : Form { - public string ProjectName { get; set; } - public int Project { get; set; } + public string Title { get; set; } + public int Index { get; set; } string keyword = string.Empty; public fLovProject(string search_) { InitializeComponent(); - ProjectName = string.Empty; - Project = -1; + Title = string.Empty; + Index = -1; this.keyword = search_; this.KeyPreview = true; @@ -56,18 +56,18 @@ namespace FCM0000 var drv = bs.Current as DataRowView; if (drv == null) { - ProjectName = string.Empty; - Project = -1; + Title = string.Empty; + Index = -1; return; } else { var dr = drv.Row as dsMSSQL.ProjectsRow; - Project = dr.idx; - ProjectName = dr.name; + Index = dr.idx; + Title = dr.name; } - if (ProjectName.isEmpty() || Project == -1) DialogResult = System.Windows.Forms.DialogResult.Cancel; + if (Title.isEmpty() || Index == -1) DialogResult = System.Windows.Forms.DialogResult.Cancel; else DialogResult = System.Windows.Forms.DialogResult.OK; } diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 14b23d8..10508b9 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -57,6 +57,14 @@ namespace FCOMMON var list = getUserList(baseLevel); return MakeDataTable(list); } + + private static Dictionary MakeDataTable(List list) + { + var retval = new Dictionary(); + foreach (var item in list) + retval.Add(item, item); + return retval; + } private static System.Data.DataTable MakeDataTable(Dictionary list) { System.Data.DataTable dt = new System.Data.DataTable(); @@ -118,6 +126,11 @@ namespace FCOMMON return retval; } + public static Dictionary getGroupTable(string GroupColumn, string table, string where = "", Boolean desc = false) + { + var list = getGroupList(GroupColumn, table, where, desc); + return MakeDataTable(list); + } public static List getGroupList(string GroupColumn, string table, string where = "",Boolean desc=false) { List retval = new List(); diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 8fe0927..2c3d853 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -101,6 +101,12 @@ rpt_equipmentB.cs + + Form + + + fPurchase_Add.cs + Form @@ -152,6 +158,9 @@ rpt_equipmentB.cs + + fPurchase_Add.cs + fPurchase_Data.cs @@ -201,6 +210,10 @@ + + {26982882-c1ff-45f8-861c-d67558725ff1} + FCM0000 + {304bd018-194b-47da-b4e0-f16df7b606da} FCOMMON diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 0dbf56f..230c918 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -33,12 +33,18 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); this.dsPurchase = new FEQ0000.dsPurchase(); - this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); - this.tableAdapterManager = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager(); - this.purchaseBindingNavigator = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -49,10 +55,10 @@ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.purchaseBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.dv1 = new System.Windows.Forms.DataGridView(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.autoResizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); @@ -78,20 +84,18 @@ this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.purchaseBindingSource)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.purchaseBindingNavigator)).BeginInit(); - this.purchaseBindingNavigator.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); + this.cm1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -100,29 +104,29 @@ this.dsPurchase.DataSetName = "dsPurchase"; this.dsPurchase.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // purchaseBindingSource + // bs // - this.purchaseBindingSource.DataMember = "Purchase"; - this.purchaseBindingSource.DataSource = this.dsPurchase; + this.bs.DataMember = "Purchase"; + this.bs.DataSource = this.dsPurchase; // - // purchaseTableAdapter + // ta // - this.purchaseTableAdapter.ClearBeforeFill = true; + this.ta.ClearBeforeFill = true; // - // tableAdapterManager + // tam // - this.tableAdapterManager.BackupDataSetBeforeUpdate = false; - this.tableAdapterManager.PurchaseTableAdapter = this.purchaseTableAdapter; - this.tableAdapterManager.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.BackupDataSetBeforeUpdate = true; + this.tam.PurchaseTableAdapter = this.ta; + this.tam.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // purchaseBindingNavigator + // bn // - this.purchaseBindingNavigator.AddNewItem = this.bindingNavigatorAddNewItem; - this.purchaseBindingNavigator.BindingSource = this.purchaseBindingSource; - this.purchaseBindingNavigator.CountItem = this.bindingNavigatorCountItem; - this.purchaseBindingNavigator.DeleteItem = this.bindingNavigatorDeleteItem; - this.purchaseBindingNavigator.Dock = System.Windows.Forms.DockStyle.Bottom; - this.purchaseBindingNavigator.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, this.bindingNavigatorSeparator, @@ -134,26 +138,17 @@ this.bindingNavigatorSeparator2, this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, - this.purchaseBindingNavigatorSaveItem, this.toolStripButton1}); - this.purchaseBindingNavigator.Location = new System.Drawing.Point(0, 502); - this.purchaseBindingNavigator.MoveFirstItem = this.bindingNavigatorMoveFirstItem; - this.purchaseBindingNavigator.MoveLastItem = this.bindingNavigatorMoveLastItem; - this.purchaseBindingNavigator.MoveNextItem = this.bindingNavigatorMoveNextItem; - this.purchaseBindingNavigator.MovePreviousItem = this.bindingNavigatorMovePreviousItem; - this.purchaseBindingNavigator.Name = "purchaseBindingNavigator"; - this.purchaseBindingNavigator.PositionItem = this.bindingNavigatorPositionItem; - this.purchaseBindingNavigator.Size = new System.Drawing.Size(752, 25); - this.purchaseBindingNavigator.TabIndex = 0; - this.purchaseBindingNavigator.Text = "bindingNavigator1"; - // - // bindingNavigatorAddNewItem - // - this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); - this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; - this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); - this.bindingNavigatorAddNewItem.Text = "Add(&A)"; + this.bn.Location = new System.Drawing.Point(0, 515); + this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn.Name = "bn"; + this.bn.PositionItem = this.bindingNavigatorPositionItem; + this.bn.Size = new System.Drawing.Size(811, 25); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; // // bindingNavigatorCountItem // @@ -230,13 +225,14 @@ this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // - // purchaseBindingNavigatorSaveItem + // bindingNavigatorAddNewItem // - this.purchaseBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("purchaseBindingNavigatorSaveItem.Image"))); - this.purchaseBindingNavigatorSaveItem.Name = "purchaseBindingNavigatorSaveItem"; - this.purchaseBindingNavigatorSaveItem.Size = new System.Drawing.Size(67, 22); - this.purchaseBindingNavigatorSaveItem.Text = "Save(&S)"; - this.purchaseBindingNavigatorSaveItem.Click += new System.EventHandler(this.purchaseBindingNavigatorSaveItem_Click); + this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); + this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; + this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); + this.bindingNavigatorAddNewItem.Text = "Add(&A)"; + this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // // toolStripButton1 // @@ -251,6 +247,7 @@ // dv1 // this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; this.dv1.AutoGenerateColumns = false; this.dv1.ColumnHeadersHeight = 30; this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; @@ -270,29 +267,29 @@ this.dataGridViewTextBoxColumn13, this.dataGridViewTextBoxColumn14, this.dataGridViewTextBoxColumn15, - this.dataGridViewTextBoxColumn16, this.dataGridViewTextBoxColumn17, - this.dataGridViewTextBoxColumn18, this.dataGridViewTextBoxColumn19, this.dataGridViewTextBoxColumn20, this.dataGridViewTextBoxColumn21, this.dataGridViewTextBoxColumn22, this.dataGridViewTextBoxColumn23}); - this.dv1.ContextMenuStrip = this.contextMenuStrip1; - this.dv1.DataSource = this.purchaseBindingSource; + this.dv1.ContextMenuStrip = this.cm1; + this.dv1.DataSource = this.bs; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(0, 25); this.dv1.Name = "dv1"; + this.dv1.ReadOnly = true; this.dv1.RowTemplate.Height = 23; - this.dv1.Size = new System.Drawing.Size(752, 477); + this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dv1.Size = new System.Drawing.Size(811, 490); this.dv1.TabIndex = 2; // - // contextMenuStrip1 + // cm1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.autoResizeColumnsToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(186, 26); + this.cm1.Name = "contextMenuStrip1"; + this.cm1.Size = new System.Drawing.Size(186, 26); // // autoResizeColumnsToolStripMenuItem // @@ -314,7 +311,7 @@ this.btSearch}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(752, 25); + this.toolStrip1.Size = new System.Drawing.Size(811, 25); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -351,14 +348,15 @@ // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(49, 22); - this.toolStripLabel3.Text = "Request"; + this.toolStripLabel3.Size = new System.Drawing.Size(66, 22); + this.toolStripLabel3.Text = "User Name"; // // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(100, 25); + this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); // // btSearch // @@ -385,155 +383,181 @@ this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate"; this.dataGridViewTextBoxColumn2.HeaderText = "Date"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.ReadOnly = true; // // dataGridViewTextBoxColumn3 // - this.dataGridViewTextBoxColumn3.DataPropertyName = "state"; - this.dataGridViewTextBoxColumn3.HeaderText = "Stat"; + this.dataGridViewTextBoxColumn3.DataPropertyName = "stateName"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle2; + this.dataGridViewTextBoxColumn3.HeaderText = "State"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.ReadOnly = true; // // dataGridViewTextBoxColumn4 // this.dataGridViewTextBoxColumn4.DataPropertyName = "process"; this.dataGridViewTextBoxColumn4.HeaderText = "process"; this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.ReadOnly = true; // // dataGridViewTextBoxColumn5 // this.dataGridViewTextBoxColumn5.DataPropertyName = "receive"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewTextBoxColumn5.HeaderText = "receive"; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; // // dataGridViewTextBoxColumn6 // this.dataGridViewTextBoxColumn6.DataPropertyName = "sc"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle4; this.dataGridViewTextBoxColumn6.HeaderText = "sc#"; this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.ReadOnly = true; // // dataGridViewTextBoxColumn7 // this.dataGridViewTextBoxColumn7.DataPropertyName = "request"; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle5; this.dataGridViewTextBoxColumn7.HeaderText = "request"; this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.ReadOnly = true; // // dataGridViewTextBoxColumn8 // this.dataGridViewTextBoxColumn8.DataPropertyName = "sid"; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle6; this.dataGridViewTextBoxColumn8.HeaderText = "sid#"; this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.ReadOnly = true; // // dataGridViewTextBoxColumn9 // this.dataGridViewTextBoxColumn9.DataPropertyName = "pumname"; this.dataGridViewTextBoxColumn9.HeaderText = "Item"; this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; + this.dataGridViewTextBoxColumn9.ReadOnly = true; // // dataGridViewTextBoxColumn10 // this.dataGridViewTextBoxColumn10.DataPropertyName = "pumscale"; this.dataGridViewTextBoxColumn10.HeaderText = "Model"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; + this.dataGridViewTextBoxColumn10.ReadOnly = true; // // dataGridViewTextBoxColumn11 // this.dataGridViewTextBoxColumn11.DataPropertyName = "pumunit"; this.dataGridViewTextBoxColumn11.HeaderText = "Unit"; this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; + this.dataGridViewTextBoxColumn11.ReadOnly = true; // // dataGridViewTextBoxColumn12 // this.dataGridViewTextBoxColumn12.DataPropertyName = "pumqty"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.Format = "N0"; + this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle7; this.dataGridViewTextBoxColumn12.HeaderText = "Qty"; this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; + this.dataGridViewTextBoxColumn12.ReadOnly = true; // // dataGridViewTextBoxColumn13 // this.dataGridViewTextBoxColumn13.DataPropertyName = "pumprice"; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.Format = "N0"; + this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridViewTextBoxColumn13.HeaderText = "Price"; this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; + this.dataGridViewTextBoxColumn13.ReadOnly = true; // // dataGridViewTextBoxColumn14 // this.dataGridViewTextBoxColumn14.DataPropertyName = "pumamt"; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle9.Format = "N0"; + this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle9; this.dataGridViewTextBoxColumn14.HeaderText = "Amt"; this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14"; + this.dataGridViewTextBoxColumn14.ReadOnly = true; // // dataGridViewTextBoxColumn15 // this.dataGridViewTextBoxColumn15.DataPropertyName = "supply"; this.dataGridViewTextBoxColumn15.HeaderText = "Supply"; this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15"; - // - // dataGridViewTextBoxColumn16 - // - this.dataGridViewTextBoxColumn16.DataPropertyName = "supplyidx"; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn16.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewTextBoxColumn16.HeaderText = "*"; - this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16"; + this.dataGridViewTextBoxColumn15.ReadOnly = true; // // dataGridViewTextBoxColumn17 // this.dataGridViewTextBoxColumn17.DataPropertyName = "project"; this.dataGridViewTextBoxColumn17.HeaderText = "Project"; this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17"; - // - // dataGridViewTextBoxColumn18 - // - this.dataGridViewTextBoxColumn18.DataPropertyName = "projectidx"; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewTextBoxColumn18.HeaderText = "*"; - this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18"; + this.dataGridViewTextBoxColumn17.ReadOnly = true; // // dataGridViewTextBoxColumn19 // this.dataGridViewTextBoxColumn19.DataPropertyName = "asset"; this.dataGridViewTextBoxColumn19.HeaderText = "Asset"; this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19"; + this.dataGridViewTextBoxColumn19.ReadOnly = true; // // dataGridViewTextBoxColumn20 // this.dataGridViewTextBoxColumn20.DataPropertyName = "edate"; this.dataGridViewTextBoxColumn20.HeaderText = "ExDate"; this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20"; + this.dataGridViewTextBoxColumn20.ReadOnly = true; // // dataGridViewTextBoxColumn21 // this.dataGridViewTextBoxColumn21.DataPropertyName = "indate"; this.dataGridViewTextBoxColumn21.HeaderText = "InDate"; this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21"; + this.dataGridViewTextBoxColumn21.ReadOnly = true; // // dataGridViewTextBoxColumn22 // this.dataGridViewTextBoxColumn22.DataPropertyName = "po"; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle10; this.dataGridViewTextBoxColumn22.HeaderText = "PO"; this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22"; + this.dataGridViewTextBoxColumn22.ReadOnly = true; // // dataGridViewTextBoxColumn23 // this.dataGridViewTextBoxColumn23.DataPropertyName = "dept"; this.dataGridViewTextBoxColumn23.HeaderText = "Dept"; this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23"; + this.dataGridViewTextBoxColumn23.ReadOnly = true; // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(752, 527); + this.ClientSize = new System.Drawing.Size(811, 540); this.Controls.Add(this.dv1); this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.purchaseBindingNavigator); + this.Controls.Add(this.bn); this.Name = "fPurchase"; this.Text = "Purchase List"; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.purchaseBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.purchaseBindingNavigator)).EndInit(); - this.purchaseBindingNavigator.ResumeLayout(false); - this.purchaseBindingNavigator.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); + this.cm1.ResumeLayout(false); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.ResumeLayout(false); @@ -544,10 +568,10 @@ #endregion private dsPurchase dsPurchase; - private System.Windows.Forms.BindingSource purchaseBindingSource; - private dsPurchaseTableAdapters.PurchaseTableAdapter purchaseTableAdapter; - private dsPurchaseTableAdapters.TableAdapterManager tableAdapterManager; - private System.Windows.Forms.BindingNavigator purchaseBindingNavigator; + private System.Windows.Forms.BindingSource bs; + private dsPurchaseTableAdapters.PurchaseTableAdapter ta; + private dsPurchaseTableAdapters.TableAdapterManager tam; + private System.Windows.Forms.BindingNavigator bn; private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; @@ -559,7 +583,6 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton purchaseBindingNavigatorSaveItem; private System.Windows.Forms.DataGridView dv1; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripLabel toolStripLabel1; @@ -568,7 +591,7 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel2; private System.Windows.Forms.ToolStripTextBox dtED; private System.Windows.Forms.ToolStripButton btSearch; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ContextMenuStrip cm1; private System.Windows.Forms.ToolStripMenuItem autoResizeColumnsToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel3; private System.Windows.Forms.ToolStripTextBox tbRequest; @@ -588,9 +611,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn18; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21; diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index fb09779..5cd3b28 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -14,11 +14,27 @@ namespace FEQ0000 public fPurchase() { InitializeComponent(); + this.dsPurchase.Purchase.TableNewRow += Purchase_TableNewRow; + } + + void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e) + { + e.Row["pdate"] = DateTime.Now.ToShortDateString(); + e.Row["wuid"] = FCOMMON.info.Login.no; + e.Row["wdate"] = DateTime.Now; + e.Row["pumunit"] = "EA"; + e.Row["state"] = "01"; + e.Row["pumqty"] = 0; + e.Row["pumprice"] = 0; + e.Row["pumamt"] = 0; + e.Row["request"] = FCOMMON.info.Login.nameK; + e.Row["receive"] = FCOMMON.info.Login.nameK; } private void __Load(object sender, EventArgs e) { - this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString(); + this.tbRequest.Text = FCOMMON.info.Login.nameK; + this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString(); this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString(); refreshData(); } @@ -26,8 +42,8 @@ namespace FEQ0000 private void purchaseBindingNavigatorSaveItem_Click(object sender, EventArgs e) { this.Validate(); - this.purchaseBindingSource.EndEdit(); - this.tableAdapterManager.UpdateAll(this.dsPurchase); + this.bs.EndEdit(); + this.tam.UpdateAll(this.dsPurchase); } @@ -37,7 +53,8 @@ namespace FEQ0000 { string request = "%"; if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%"; - this.purchaseTableAdapter.Fill(this.dsPurchase.Purchase, dtSD.Text,dtED.Text,request); + this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text,dtED.Text,request); + if (!tbRequest.Text.isEmpty()) this.dv1.AutoResizeColumns(); } catch (System.Exception ex) { @@ -67,5 +84,24 @@ namespace FEQ0000 f.MdiParent = this.MdiParent; f.Show(); } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + var newdr = this.dsPurchase.Purchase.NewPurchaseRow(); + fPurchase_Add f = new fPurchase_Add(newdr); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + this.dsPurchase.Purchase.AddPurchaseRow(newdr); + this.ta.Update(newdr); + newdr.AcceptChanges(); + } + else newdr.Delete(); + } + + private void tbRequest_KeyDown(object sender, KeyEventArgs e) + { + if(e.KeyCode == Keys.Enter) + btSearch.PerformClick(); + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 864f6ec..2901dde 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -120,31 +120,19 @@ 17, 17 - + 131, 17 - - 313, 17 + + 195, 17 - - 490, 17 + + 257, 17 - - 17, 56 + + 330, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC - pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ - Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ - /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA - zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ - IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E - rkJggg== - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -197,11 +185,16 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo - dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== @@ -219,11 +212,11 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 322, 56 + + 502, 17 - 216, 56 + 396, 17 diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 1c66cee..ce87013 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -331,6 +331,10 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnimport; + private global::System.Data.DataColumn columnpumidx; + + private global::System.Data.DataColumn columnstateName; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public PurchaseDataTable() { @@ -572,6 +576,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn pumidxColumn { + get { + return this.columnpumidx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn stateNameColumn { + get { + return this.columnstateName; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -634,7 +654,9 @@ namespace FEQ0000 { string dept, string wuid, System.DateTime wdate, - bool import) { + bool import, + int pumidx, + string stateName) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -662,7 +684,9 @@ namespace FEQ0000 { dept, wuid, wdate, - import}; + import, + pumidx, + stateName}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -718,6 +742,8 @@ namespace FEQ0000 { this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; this.columnimport = base.Columns["import"]; + this.columnpumidx = base.Columns["pumidx"]; + this.columnstateName = base.Columns["stateName"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -775,6 +801,10 @@ namespace FEQ0000 { base.Columns.Add(this.columnwdate); this.columnimport = new global::System.Data.DataColumn("import", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnimport); + this.columnpumidx = new global::System.Data.DataColumn("pumidx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpumidx); + this.columnstateName = new global::System.Data.DataColumn("stateName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnstateName); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -803,6 +833,8 @@ namespace FEQ0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columnstateName.ReadOnly = true; + this.columnstateName.MaxLength = 200; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1344,6 +1376,38 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int pumidx { + get { + try { + return ((int)(this[this.tablePurchase.pumidxColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'pumidx\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablePurchase.pumidxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string stateName { + get { + if (this.IsstateNameNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablePurchase.stateNameColumn])); + } + } + set { + this[this.tablePurchase.stateNameColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IspdateNull() { @@ -1619,6 +1683,30 @@ namespace FEQ0000 { public void SetimportNull() { this[this.tablePurchase.importColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IspumidxNull() { + return this.IsNull(this.tablePurchase.pumidxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetpumidxNull() { + this[this.tablePurchase.pumidxColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsstateNameNull() { + return this.IsNull(this.tablePurchase.stateNameColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetstateNameNull() { + this[this.tablePurchase.stateNameColumn] = global::System.Convert.DBNull; + } } /// @@ -1806,6 +1894,8 @@ namespace FEQ0000.dsPurchaseTableAdapters { tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("import", "import"); + tableMapping.ColumnMappings.Add("pumidx", "pumidx"); + tableMapping.ColumnMappings.Add("stateName", "stateName"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -1831,7 +1921,8 @@ namespace FEQ0000.dsPurchaseTableAdapters { "date)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@I" + "sNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @" + "Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [imp" + - "ort] IS NULL) OR ([import] = @Original_import)))"; + "ort] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pu" + + "midx] IS NULL) OR ([pumidx] = @Original_pumidx)))"; 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("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -1878,10 +1969,12 @@ namespace FEQ0000.dsPurchaseTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 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_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", 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 [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx); +SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1908,6 +2001,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, 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.DateTime, 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("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", 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 [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [" + @@ -1916,33 +2010,34 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, "mprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supp" + "lyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edat" + "e] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wd" + - "ate] = @wdate, [import] = @import WHERE (([idx] = @Original_idx) AND ((@IsNull_p" + - "date = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_stat" + - "e = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process" + - " = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_re" + - "ceive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNu" + - "ll_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 " + - "AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1" + - " AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [" + - "pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit =" + - " 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumq" + - "ty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pum" + - "price = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@I" + - "sNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@" + - "IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((" + - "@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_suppl" + - "yidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] =" + - " @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset]" + - " = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = " + - "@Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = " + - "@Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_p" + - "o)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND" + - " ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import " + - "= 1 AND [import] IS NULL) OR ([import] = @Original_import)));\r\nSELECT idx, pdate" + - ", state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty," + - " pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate," + - " po, dept, wuid, wdate, import FROM Purchase WHERE (idx = @idx) ORDER BY pdate D" + - "ESC"; + "ate] = @wdate, [import] = @import, [pumidx] = @pumidx WHERE (([idx] = @Original_" + + "idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)" + + ") AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) A" + + "ND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_proces" + + "s)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_r" + + "eceive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((" + + "@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) A" + + "ND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNul" + + "l_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND" + + " ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)" + + ") AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty" + + ")) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original" + + "_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Origi" + + "nal_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Orig" + + "inal_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyid" + + "x] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL" + + ") OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] " + + "IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS " + + "NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS N" + + "ULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR" + + " ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = " + + "@Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) A" + + "ND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) " + + "AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx))" + + ");\r\nSELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumsc" + + "ale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, " + + "asset, edate, indate, po, dept, wuid, wdate, import, pumidx FROM Purchase WHERE " + + "(idx = @idx) ORDER BY pdate DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1969,6 +2064,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, 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.DateTime, 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("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", 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("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -2014,6 +2110,8 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 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_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pumidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pumidx", 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, "", "", "")); } @@ -2031,10 +2129,11 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import + wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName FROM Purchase -WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request) -ORDER BY pdate DESC"; +WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request OR + ISNULL(receive, '') LIKE @request) +ORDER BY pdate DESC, idx DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2162,7 +2261,8 @@ ORDER BY pdate DESC"; string Original_dept, string Original_wuid, System.DateTime Original_wdate, - global::System.Nullable Original_import) { + global::System.Nullable Original_import, + global::System.Nullable Original_pumidx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_pdate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -2339,6 +2439,14 @@ ORDER BY pdate DESC"; this.Adapter.DeleteCommand.Parameters[43].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[44].Value = global::System.DBNull.Value; } + if ((Original_pumidx.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[46].Value = ((int)(Original_pumidx.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[46].Value = global::System.DBNull.Value; + } 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)) { @@ -2384,7 +2492,8 @@ ORDER BY pdate DESC"; string dept, string wuid, System.DateTime wdate, - global::System.Nullable import) { + global::System.Nullable import, + global::System.Nullable pumidx) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -2530,6 +2639,12 @@ ORDER BY pdate DESC"; else { this.Adapter.InsertCommand.Parameters[24].Value = global::System.DBNull.Value; } + if ((pumidx.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[25].Value = ((int)(pumidx.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[25].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)) { @@ -2576,6 +2691,7 @@ ORDER BY pdate DESC"; string wuid, System.DateTime wdate, global::System.Nullable import, + global::System.Nullable pumidx, int Original_idx, string Original_pdate, string Original_state, @@ -2600,6 +2716,7 @@ ORDER BY pdate DESC"; string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_import, + global::System.Nullable Original_pumidx, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -2746,183 +2863,197 @@ ORDER BY pdate DESC"; else { this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; + if ((pumidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(pumidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_pdate)); } if ((Original_state == null)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_state)); } if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_process)); } if ((Original_receive == null)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_receive)); } if ((Original_sc == null)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_sc)); } if ((Original_request == null)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_request)); } if ((Original_sid == null)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_sid)); } if ((Original_pumscale == null)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_pumscale)); } if ((Original_pumunit == null)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_pumunit)); } if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((int)(Original_pumqty.Value)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((int)(Original_pumqty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; } if ((Original_pumprice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((decimal)(Original_pumprice.Value)); } else { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; } if ((Original_pumamt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((decimal)(Original_pumamt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; } if ((Original_supply == null)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_supply)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_supply)); } if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_supplyidx.Value)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((int)(Original_supplyidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; } if ((Original_projectidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((int)(Original_projectidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; } if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_asset)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_asset)); } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_edate)); } if ((Original_indate == null)) { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_indate)); } if ((Original_po == null)) { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_po)); } if ((Original_dept == null)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[67].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((bool)(Original_import.Value)); } else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[70].Value = ((int)(idx)); + if ((Original_pumidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((int)(Original_pumidx.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[73].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)) { @@ -2969,6 +3100,7 @@ ORDER BY pdate DESC"; string wuid, System.DateTime wdate, global::System.Nullable import, + global::System.Nullable pumidx, int Original_idx, string Original_pdate, string Original_state, @@ -2992,8 +3124,9 @@ ORDER BY pdate DESC"; string Original_dept, string Original_wuid, System.DateTime Original_wdate, - global::System.Nullable Original_import) { - return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_idx); + global::System.Nullable Original_import, + global::System.Nullable Original_pumidx) { + return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index d28c5d3..9bf6639 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -12,7 +12,7 @@ - DELETE FROM [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import))) + DELETE FROM [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx))) @@ -59,13 +59,15 @@ + + - INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC + INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx); +SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC @@ -92,16 +94,18 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import + wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName FROM Purchase -WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request) -ORDER BY pdate DESC +WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request OR + ISNULL(receive, '') LIKE @request) +ORDER BY pdate DESC, idx DESC @@ -111,8 +115,8 @@ ORDER BY pdate DESC - UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import))); -SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC + UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx))); +SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC @@ -139,6 +143,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + @@ -184,7 +189,9 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - + + + @@ -217,6 +224,8 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + + @@ -374,6 +383,14 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + + + + + + + + diff --git a/SubProject/FEQ0000/dsPurchase.xss b/SubProject/FEQ0000/dsPurchase.xss index 4adab9d..128059e 100644 --- a/SubProject/FEQ0000/dsPurchase.xss +++ b/SubProject/FEQ0000/dsPurchase.xss @@ -6,7 +6,7 @@ --> - + \ No newline at end of file