From f6f6db19ffc060403998c941b66dd5d791de66b7 Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 14 Sep 2023 17:40:00 +0900 Subject: [PATCH] ... --- SubProject/FCM0000/DSInventory.Designer.cs | 462 +++++++++--- SubProject/FCM0000/DSInventory.xsd | 200 +++--- SubProject/FCM0000/DSReport.Designer.cs | 661 +++++++++++------- SubProject/FCM0000/DSReport.xsd | 73 +- .../FCM0000/Inventory/fInventory.Designer.cs | 187 ++--- SubProject/FCM0000/Inventory/fInventory.cs | 61 +- SubProject/FCM0000/Inventory/fInventory.resx | 30 +- .../Inventory/fInventoryJagoList.Designer.cs | 304 ++++---- .../FCM0000/Inventory/fInventoryJagoList.cs | 28 +- .../FCM0000/Inventory/fInventoryJagoList.resx | 11 +- .../Inventory/finventoryAdd.Designer.cs | 127 ++-- SubProject/FCM0000/Inventory/finventoryAdd.cs | 23 +- .../FCM0000/Inventory/finventoryAdd.resx | 349 ++++----- SubProject/FCOMMON/DataBaseManager.cs | 6 +- 14 files changed, 1507 insertions(+), 1015 deletions(-) diff --git a/SubProject/FCM0000/DSInventory.Designer.cs b/SubProject/FCM0000/DSInventory.Designer.cs index 6af3233..179225c 100644 --- a/SubProject/FCM0000/DSInventory.Designer.cs +++ b/SubProject/FCM0000/DSInventory.Designer.cs @@ -352,6 +352,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columnitem; + private global::System.Data.DataColumn columnbox; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public InventoryDataTable() { @@ -537,6 +539,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn boxColumn { + get { + return this.columnbox; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -592,7 +602,8 @@ namespace FCM0000 { string projectName, string wuid, System.DateTime wdate, - int item) { + int item, + string box) { InventoryRow rowInventoryRow = ((InventoryRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -613,7 +624,8 @@ namespace FCM0000 { projectName, wuid, wdate, - item}; + item, + box}; rowInventoryRow.ItemArray = columnValuesArray; this.Rows.Add(rowInventoryRow); return rowInventoryRow; @@ -662,6 +674,7 @@ namespace FCM0000 { this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; this.columnitem = base.Columns["item"]; + this.columnbox = base.Columns["box"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -705,6 +718,8 @@ namespace FCM0000 { base.Columns.Add(this.columnwdate); this.columnitem = new global::System.Data.DataColumn("item", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnitem); + this.columnbox = new global::System.Data.DataColumn("box", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbox); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -729,6 +744,7 @@ namespace FCM0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columnbox.MaxLength = 100; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -904,6 +920,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columnsid; + private global::System.Data.DataColumn columnbox; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public vInventoryDataTable() { @@ -1105,6 +1123,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn boxColumn { + get { + return this.columnbox; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1162,7 +1188,8 @@ namespace FCM0000 { string projectName, string wuid, System.DateTime wdate, - string sid) { + string sid, + string box) { vInventoryRow rowvInventoryRow = ((vInventoryRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1185,7 +1212,8 @@ namespace FCM0000 { projectName, wuid, wdate, - sid}; + sid, + box}; rowvInventoryRow.ItemArray = columnValuesArray; this.Rows.Add(rowvInventoryRow); return rowvInventoryRow; @@ -1236,6 +1264,7 @@ namespace FCM0000 { this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; this.columnsid = base.Columns["sid"]; + this.columnbox = base.Columns["box"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1283,13 +1312,14 @@ namespace FCM0000 { base.Columns.Add(this.columnwdate); this.columnsid = new global::System.Data.DataColumn("sid", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnsid); + this.columnbox = new global::System.Data.DataColumn("box", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbox); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; this.columnidx.AutoIncrementSeed = -1; this.columnidx.AutoIncrementStep = -1; this.columnidx.AllowDBNull = false; - this.columnidx.ReadOnly = true; this.columnidx.Unique = true; this.columngcode.AllowDBNull = false; this.columngcode.MaxLength = 10; @@ -1307,6 +1337,7 @@ namespace FCM0000 { this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; this.columnsid.MaxLength = 50; + this.columnbox.MaxLength = 100; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1731,6 +1762,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string box { + get { + if (this.IsboxNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableInventory.boxColumn])); + } + } + set { + this[this.tableInventory.boxColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -1910,6 +1957,18 @@ namespace FCM0000 { public void SetitemNull() { this[this.tableInventory.itemColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsboxNull() { + return this.IsNull(this.tableInventory.boxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetboxNull() { + this[this.tableInventory.boxColumn] = global::System.Convert.DBNull; + } } /// @@ -2242,6 +2301,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string box { + get { + if (this.IsboxNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevInventory.boxColumn])); + } + } + set { + this[this.tablevInventory.boxColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -2445,6 +2520,18 @@ namespace FCM0000 { public void SetsidNull() { this[this.tablevInventory.sidColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsboxNull() { + return this.IsNull(this.tablevInventory.boxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetboxNull() { + this[this.tablevInventory.boxColumn] = global::System.Convert.DBNull; + } } /// @@ -2659,10 +2746,11 @@ namespace FCM0000.DSInventoryTableAdapters { tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("item", "item"); + tableMapping.ColumnMappings.Add("box", "box"); 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 [Inventory] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_invtype)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_dr_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) AND ((@IsNull_dr_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) AND ((@IsNull_cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty)) AND ((@IsNull_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_item = 1 AND [item] IS NULL) OR ([item] = @Original_item)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Inventory] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_invtype)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_dr_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) AND ((@IsNull_dr_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) AND ((@IsNull_cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty)) AND ((@IsNull_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_item = 1 AND [item] IS NULL) OR ([item] = @Original_item)) AND ((@IsNull_box = 1 AND [box] IS NULL) OR ([box] = @Original_box)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -2691,13 +2779,15 @@ namespace FCM0000.DSInventoryTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.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("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_box", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "box", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_box", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "box", 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 [Inventory] ([gcode], [pdate], [invtype], [uid], [serial], [dr_qty], [dr_amt], [cr_qty], [cr_amt], [place], [memo], [project], [projectName], [wuid], [wdate], [item]) VALUES (@gcode, @pdate, @invtype, @uid, @serial, @dr_qty, @dr_amt, @cr_qty, @cr_amt, @place, @memo, @project, @projectName, @wuid, @wdate, @item); -SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item FROM Inventory WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Inventory] ([gcode], [pdate], [invtype], [uid], [serial], [dr_qty], [dr_amt], [cr_qty], [cr_amt], [place], [memo], [project], [projectName], [wuid], [wdate], [item], [box]) VALUES (@gcode, @pdate, @invtype, @uid, @serial, @dr_qty, @dr_amt, @cr_qty, @cr_amt, @place, @memo, @project, @projectName, @wuid, @wdate, @item, @box); +SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item, box FROM Inventory 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("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2713,33 +2803,35 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.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("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@box", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "box", 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 [Inventory] SET [gcode] = @gcode, [pdate] = @pdate, [invtype] = @invtype, " + "[uid] = @uid, [serial] = @serial, [dr_qty] = @dr_qty, [dr_amt] = @dr_amt, [cr_qt" + "y] = @cr_qty, [cr_amt] = @cr_amt, [place] = @place, [memo] = @memo, [project] = " + "@project, [projectName] = @projectName, [wuid] = @wuid, [wdate] = @wdate, [item]" + - " = @item WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@I" + - "sNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNu" + - "ll_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_invtype)) AND ((" + - "@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_ser" + - "ial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_dr" + - "_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) AND ((@IsNull_d" + - "r_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) AND ((@IsNull_" + - "cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty)) AND ((@IsNull" + - "_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)) AND ((@IsNul" + - "l_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_m" + - "emo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_project " + - "= 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_pro" + - "jectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectNam" + - "e)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_" + - "item = 1 AND [item] IS NULL) OR ([item] = @Original_item)));\r\nSELECT idx, gcode," + - " pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) " + - "AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, proj" + - "ectName, wuid, wdate, item FROM Inventory WHERE (idx = @idx) ORDER BY pdate DESC" + - ""; + " = @item, [box] = @box WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_g" + + "code) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate" + + ")) AND ((@IsNull_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_in" + + "vtype)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND" + + " ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AN" + + "D ((@IsNull_dr_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) A" + + "ND ((@IsNull_dr_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) " + + "AND ((@IsNull_cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty))" + + " AND ((@IsNull_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)" + + ") AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) A" + + "ND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@I" + + "sNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND" + + " ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Origi" + + "nal_projectName)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) " + + "AND ((@IsNull_item = 1 AND [item] IS NULL) OR ([item] = @Original_item)) AND ((@" + + "IsNull_box = 1 AND [box] IS NULL) OR ([box] = @Original_box)));\r\nSELECT idx, gco" + + "de, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(ite" + + "m) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, p" + + "rojectName, wuid, wdate, item, box FROM Inventory WHERE (idx = @idx) ORDER BY pd" + + "ate DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2755,8 +2847,9 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.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("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@box", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "box", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -2784,9 +2877,11 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.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("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_box", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "box", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_box", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "box", 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, "", "", "")); } @@ -2804,7 +2899,7 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, - wdate, item + wdate, item, box FROM Inventory WHERE (gcode = @gcode) ORDER BY pdate DESC"; @@ -3129,7 +3224,8 @@ ORDER BY pdate DESC"; string Original_projectName, string Original_wuid, System.DateTime Original_wdate, - global::System.Nullable Original_item) { + global::System.Nullable Original_item, + string Original_box) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); @@ -3248,6 +3344,14 @@ ORDER BY pdate DESC"; this.Adapter.DeleteCommand.Parameters[28].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[29].Value = global::System.DBNull.Value; } + if ((Original_box == null)) { + this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[31].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[31].Value = ((string)(Original_box)); + } 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)) { @@ -3284,7 +3388,8 @@ ORDER BY pdate DESC"; string projectName, string wuid, System.DateTime wdate, - global::System.Nullable item) { + global::System.Nullable item, + string box) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -3376,6 +3481,12 @@ ORDER BY pdate DESC"; else { this.Adapter.InsertCommand.Parameters[15].Value = global::System.DBNull.Value; } + if ((box == null)) { + this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[16].Value = ((string)(box)); + } 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)) { @@ -3413,6 +3524,7 @@ ORDER BY pdate DESC"; string wuid, System.DateTime wdate, global::System.Nullable item, + string box, int Original_idx, string Original_gcode, string Original_pdate, @@ -3430,6 +3542,7 @@ ORDER BY pdate DESC"; string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_item, + string Original_box, int idx) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -3522,125 +3635,139 @@ ORDER BY pdate DESC"; else { this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx)); + if ((box == null)) { + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(box)); + } + this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_gcode)); } if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_pdate)); } if ((Original_invtype == null)) { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_invtype)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_invtype)); } if ((Original_uid == null)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_uid)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_uid)); } if ((Original_serial == null)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_serial)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_serial)); } if ((Original_dr_qty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_dr_qty.Value)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((int)(Original_dr_qty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; } if ((Original_dr_amt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((decimal)(Original_dr_amt.Value)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((decimal)(Original_dr_amt.Value)); } else { - 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; } if ((Original_cr_qty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_cr_qty.Value)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_cr_qty.Value)); } else { - 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; } if ((Original_cr_amt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((decimal)(Original_cr_amt.Value)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((decimal)(Original_cr_amt.Value)); } else { - 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; } if ((Original_place == 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_place)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_place)); } if ((Original_memo == 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_memo)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_memo)); } if ((Original_project.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((int)(Original_project.Value)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((int)(Original_project.Value)); } else { - 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; } if ((Original_projectName == 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_projectName)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_projectName)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[43].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((System.DateTime)(Original_wdate)); if ((Original_item.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((int)(Original_item.Value)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((int)(Original_item.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; } - this.Adapter.UpdateCommand.Parameters[46].Value = ((int)(idx)); + if ((Original_box == null)) { + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_box)); + } + this.Adapter.UpdateCommand.Parameters[49].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)) { @@ -3678,6 +3805,7 @@ ORDER BY pdate DESC"; string wuid, System.DateTime wdate, global::System.Nullable item, + string box, int Original_idx, string Original_gcode, string Original_pdate, @@ -3694,8 +3822,9 @@ ORDER BY pdate DESC"; string Original_projectName, string Original_wuid, System.DateTime Original_wdate, - global::System.Nullable Original_item) { - return this.Update(gcode, pdate, invtype, uid, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item, Original_idx, Original_gcode, Original_pdate, Original_invtype, Original_uid, Original_serial, Original_dr_qty, Original_dr_amt, Original_cr_qty, Original_cr_amt, Original_place, Original_memo, Original_project, Original_projectName, Original_wuid, Original_wdate, Original_item, Original_idx); + global::System.Nullable Original_item, + string Original_box) { + return this.Update(gcode, pdate, invtype, uid, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item, box, Original_idx, Original_gcode, Original_pdate, Original_invtype, Original_uid, Original_serial, Original_dr_qty, Original_dr_amt, Original_cr_qty, Original_cr_amt, Original_place, Original_memo, Original_project, Original_projectName, Original_wuid, Original_wdate, Original_item, Original_box, Original_idx); } } @@ -3841,6 +3970,7 @@ ORDER BY pdate DESC"; tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("sid", "sid"); + tableMapping.ColumnMappings.Add("box", "box"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -3850,49 +3980,50 @@ ORDER BY pdate DESC"; this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = @"INSERT INTO Inventory - (gcode, pdate, invtype, uid, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item) -VALUES (@gcode,@pdate,@invtype,@uid,@serial,@dr_qty,@dr_amt,@cr_qty,@cr_amt,@place,@memo,@project,@projectName,@wuid,@wdate,@item)"; + (gcode, pdate, invtype, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, box) +VALUES (@gcode,@pdate,@invtype,@uid,@item,@serial,@dr_qty,@dr_amt,@cr_qty,@cr_amt,@place,@memo,@project,@projectName,@wuid,@wdate,@box)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, 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("@invtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "invtype", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@item", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@serial", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dr_qty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "dr_qty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dr_amt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "dr_amt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cr_qty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "cr_qty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cr_amt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "cr_amt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, 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, 8, 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("@item", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, 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("@box", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "box", 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 Inventory -SET gcode = @gcode, pdate = @pdate, invtype = @invtype, uid = @uid, serial = @serial, dr_qty = @dr_qty, dr_amt = @dr_amt, cr_qty = @cr_qty, cr_amt = @cr_amt, place = @place, - memo = @memo, project = @project, projectName = @projectName, wuid = @wuid, wdate = @wdate, item = @item -WHERE (idx = @Original_idx)"; +SET pdate = @pdate, invtype = @invtype, uid = @uid, item = @item, serial = @serial, dr_qty = @dr_qty, dr_amt = @dr_amt, cr_qty = @cr_qty, cr_amt = @cr_amt, place = @place, + memo = @memo, project = @project, projectName = @projectName, wuid = @wuid, wdate = @wdate, box = @box +WHERE (idx = @oidx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, 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("@invtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "invtype", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@item", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@serial", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dr_qty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "dr_qty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dr_amt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "dr_amt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cr_qty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "cr_qty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cr_amt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "cr_amt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "place", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, 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, 8, 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("@item", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, 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("@box", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "box", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@oidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3908,12 +4039,10 @@ WHERE (idx = @Original_idx)"; this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT A.idx, A.gcode, A.pdate, A.invtype, A.uid, dbo.getUserName(A.uid) AS userName, A.item, A.serial, A.dr_qty, A.dr_amt, A.cr_qty, A.cr_amt, A.place, A.memo, B.name AS itemName, - B.model AS itemModel, A.project, A.projectName, A.wuid, A.wdate, B.sid -FROM Inventory AS A LEFT OUTER JOIN - Items AS B ON A.item = B.idx -WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (A.invtype LIKE @invtype) AND (ISNULL(A.uid, N'') LIKE @uid) AND (ISNULL(A.place, N'') LIKE @place) -ORDER BY A.pdate DESC"; + this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, invtype, uid, userName, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, itemName, itemModel, project, projectName, wuid, wdate, sid, box +FROM vEETGW_Inventory AS A +WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (invtype LIKE @invtype) AND (ISNULL(uid, N'') LIKE @uid) AND (ISNULL(place, N'') LIKE @place) +ORDER BY pdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4049,6 +4178,107 @@ ORDER BY A.pdate DESC"; } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class QueriesTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.IDbCommand[] _commandCollection; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected global::System.Data.IDbCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.IDbCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FCM0000.Properties.Settings.Default.gwcs); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "select max(idx)\r\nfrom inventory\r\nwhere gcode = @gcode and uid = @uid and invtype " + + "=@invtype\r\nand wuid = @wuid\r\nand wdate = @wdate\r\nand item = @item"; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandType = global::System.Data.CommandType.Text; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@invtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "invtype", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@item", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual global::System.Nullable GetLastIdx(string gcode, string uid, string invtype, string wuid, System.DateTime wdate, global::System.Nullable item) { + global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[0])); + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + command.Parameters[0].Value = ((string)(gcode)); + } + if ((uid == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(uid)); + } + if ((invtype == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(invtype)); + } + if ((wuid == null)) { + throw new global::System.ArgumentNullException("wuid"); + } + else { + command.Parameters[3].Value = ((string)(wuid)); + } + command.Parameters[4].Value = ((System.DateTime)(wdate)); + if ((item.HasValue == true)) { + command.Parameters[5].Value = ((int)(item.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + object returnValue; + try { + returnValue = command.ExecuteScalar(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + if (((returnValue == null) + || (returnValue.GetType() == typeof(global::System.DBNull)))) { + return new global::System.Nullable(); + } + else { + return new global::System.Nullable(((int)(returnValue))); + } + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/SubProject/FCM0000/DSInventory.xsd b/SubProject/FCM0000/DSInventory.xsd index 0efce6d..bd95446 100644 --- a/SubProject/FCM0000/DSInventory.xsd +++ b/SubProject/FCM0000/DSInventory.xsd @@ -2,17 +2,17 @@ - + - + - DELETE FROM [Inventory] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_invtype)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_dr_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) AND ((@IsNull_dr_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) AND ((@IsNull_cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty)) AND ((@IsNull_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_item = 1 AND [item] IS NULL) OR ([item] = @Original_item))) + DELETE FROM [Inventory] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_invtype)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_dr_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) AND ((@IsNull_dr_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) AND ((@IsNull_cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty)) AND ((@IsNull_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_item = 1 AND [item] IS NULL) OR ([item] = @Original_item)) AND ((@IsNull_box = 1 AND [box] IS NULL) OR ([box] = @Original_box))) @@ -41,16 +41,18 @@ - + + + - INSERT INTO [Inventory] ([gcode], [pdate], [invtype], [uid], [serial], [dr_qty], [dr_amt], [cr_qty], [cr_amt], [place], [memo], [project], [projectName], [wuid], [wdate], [item]) VALUES (@gcode, @pdate, @invtype, @uid, @serial, @dr_qty, @dr_amt, @cr_qty, @cr_amt, @place, @memo, @project, @projectName, @wuid, @wdate, @item); -SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item FROM Inventory WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC + INSERT INTO [Inventory] ([gcode], [pdate], [invtype], [uid], [serial], [dr_qty], [dr_amt], [cr_qty], [cr_amt], [place], [memo], [project], [projectName], [wuid], [wdate], [item], [box]) VALUES (@gcode, @pdate, @invtype, @uid, @serial, @dr_qty, @dr_amt, @cr_qty, @cr_amt, @place, @memo, @project, @projectName, @wuid, @wdate, @item, @box); +SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item, box FROM Inventory WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC @@ -66,27 +68,28 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g - + + SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, - wdate, item + wdate, item, box FROM Inventory WHERE (gcode = @gcode) ORDER BY pdate DESC - + - UPDATE [Inventory] SET [gcode] = @gcode, [pdate] = @pdate, [invtype] = @invtype, [uid] = @uid, [serial] = @serial, [dr_qty] = @dr_qty, [dr_amt] = @dr_amt, [cr_qty] = @cr_qty, [cr_amt] = @cr_amt, [place] = @place, [memo] = @memo, [project] = @project, [projectName] = @projectName, [wuid] = @wuid, [wdate] = @wdate, [item] = @item WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_invtype)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_dr_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) AND ((@IsNull_dr_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) AND ((@IsNull_cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty)) AND ((@IsNull_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_item = 1 AND [item] IS NULL) OR ([item] = @Original_item))); -SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item FROM Inventory WHERE (idx = @idx) ORDER BY pdate DESC + UPDATE [Inventory] SET [gcode] = @gcode, [pdate] = @pdate, [invtype] = @invtype, [uid] = @uid, [serial] = @serial, [dr_qty] = @dr_qty, [dr_amt] = @dr_amt, [cr_qty] = @cr_qty, [cr_amt] = @cr_amt, [place] = @place, [memo] = @memo, [project] = @project, [projectName] = @projectName, [wuid] = @wuid, [wdate] = @wdate, [item] = @item, [box] = @box WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_invtype)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_dr_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) AND ((@IsNull_dr_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) AND ((@IsNull_cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty)) AND ((@IsNull_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_item = 1 AND [item] IS NULL) OR ([item] = @Original_item)) AND ((@IsNull_box = 1 AND [box] IS NULL) OR ([box] = @Original_box))); +SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item, box FROM Inventory WHERE (idx = @idx) ORDER BY pdate DESC @@ -102,8 +105,9 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g - + + @@ -131,10 +135,12 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g - + - + + + @@ -160,6 +166,7 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g + @@ -208,83 +215,82 @@ ORDER BY pdate DESC - + - + DELETE FROM Inventory WHERE (idx = @idx) - + - + INSERT INTO Inventory - (gcode, pdate, invtype, uid, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, item) -VALUES (@gcode,@pdate,@invtype,@uid,@serial,@dr_qty,@dr_amt,@cr_qty,@cr_amt,@place,@memo,@project,@projectName,@wuid,@wdate,@item) + (gcode, pdate, invtype, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid, wdate, box) +VALUES (@gcode,@pdate,@invtype,@uid,@item,@serial,@dr_qty,@dr_amt,@cr_qty,@cr_amt,@place,@memo,@project,@projectName,@wuid,@wdate,@box) - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - SELECT A.idx, A.gcode, A.pdate, A.invtype, A.uid, dbo.getUserName(A.uid) AS userName, A.item, A.serial, A.dr_qty, A.dr_amt, A.cr_qty, A.cr_amt, A.place, A.memo, B.name AS itemName, - B.model AS itemModel, A.project, A.projectName, A.wuid, A.wdate, B.sid -FROM Inventory AS A LEFT OUTER JOIN - Items AS B ON A.item = B.idx -WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (A.invtype LIKE @invtype) AND (ISNULL(A.uid, N'') LIKE @uid) AND (ISNULL(A.place, N'') LIKE @place) -ORDER BY A.pdate DESC + + SELECT idx, gcode, pdate, invtype, uid, userName, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, itemName, itemModel, project, projectName, wuid, wdate, sid, box +FROM vEETGW_Inventory AS A +WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (invtype LIKE @invtype) AND (ISNULL(uid, N'') LIKE @uid) AND (ISNULL(place, N'') LIKE @place) +ORDER BY pdate DESC - - - - + + + + - + UPDATE Inventory -SET gcode = @gcode, pdate = @pdate, invtype = @invtype, uid = @uid, serial = @serial, dr_qty = @dr_qty, dr_amt = @dr_amt, cr_qty = @cr_qty, cr_amt = @cr_amt, place = @place, - memo = @memo, project = @project, projectName = @projectName, wuid = @wuid, wdate = @wdate, item = @item -WHERE (idx = @Original_idx) +SET pdate = @pdate, invtype = @invtype, uid = @uid, item = @item, serial = @serial, dr_qty = @dr_qty, dr_amt = @dr_amt, cr_qty = @cr_qty, cr_amt = @cr_amt, place = @place, + memo = @memo, project = @project, projectName = @projectName, wuid = @wuid, wdate = @wdate, box = @box +WHERE (idx = @oidx) - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -312,21 +318,43 @@ WHERE (idx = @Original_idx) + - + + + + + select max(idx) +from inventory +where gcode = @gcode and uid = @uid and invtype =@invtype +and wuid = @wuid +and wdate = @wdate +and item = @item + + + + + + + + + + + + - + - + - + @@ -376,7 +404,7 @@ WHERE (idx = @Original_idx) - + @@ -394,7 +422,7 @@ WHERE (idx = @Original_idx) - + @@ -402,22 +430,29 @@ WHERE (idx = @Original_idx) - + - + + + + + + + + - + - + @@ -508,7 +543,7 @@ WHERE (idx = @Original_idx) - + @@ -516,6 +551,13 @@ WHERE (idx = @Original_idx) + + + + + + + diff --git a/SubProject/FCM0000/DSReport.Designer.cs b/SubProject/FCM0000/DSReport.Designer.cs index db56d07..e8f98eb 100644 --- a/SubProject/FCM0000/DSReport.Designer.cs +++ b/SubProject/FCM0000/DSReport.Designer.cs @@ -33,7 +33,7 @@ namespace FCM0000 { private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public DSReport() { this.BeginInit(); this.InitClass(); @@ -41,10 +41,11 @@ namespace FCM0000 { base.Tables.CollectionChanged += schemaChangedHandler; base.Relations.CollectionChanged += schemaChangedHandler; this.EndInit(); + this.InitExpressions(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected DSReport(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context, false) { if ((this.IsBinarySerialized(info, context) == true)) { @@ -52,6 +53,9 @@ namespace FCM0000 { global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); this.Tables.CollectionChanged += schemaChangedHandler1; this.Relations.CollectionChanged += schemaChangedHandler1; + if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.ExcludeSchema)) { + this.InitExpressions(); + } return; } string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string)))); @@ -78,6 +82,7 @@ namespace FCM0000 { } else { this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema))); + this.InitExpressions(); } this.GetSerializationData(info, context); global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); @@ -86,7 +91,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public PersonInvStockDataTable PersonInvStock { @@ -96,7 +101,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public jagosummaryDataTable jagosummary { @@ -106,7 +111,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public jagosummaryPlaceDataTable jagosummaryPlace { @@ -116,7 +121,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)] public override global::System.Data.SchemaSerializationMode SchemaSerializationMode { @@ -129,7 +134,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataTableCollection Tables { get { @@ -138,7 +143,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataRelationCollection Relations { get { @@ -147,7 +152,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void InitializeDerivedDataSet() { this.BeginInit(); this.InitClass(); @@ -155,28 +160,29 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public override global::System.Data.DataSet Clone() { DSReport cln = ((DSReport)(base.Clone())); cln.InitVars(); + cln.InitExpressions(); cln.SchemaSerializationMode = this.SchemaSerializationMode; return cln; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override bool ShouldSerializeTables() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override bool ShouldSerializeRelations() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) { if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { this.Reset(); @@ -207,7 +213,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() { global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(); this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null)); @@ -216,13 +222,13 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal void InitVars() { this.InitVars(true); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal void InitVars(bool initTable) { this.tablePersonInvStock = ((PersonInvStockDataTable)(base.Tables["PersonInvStock"])); if ((initTable == true)) { @@ -245,7 +251,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitClass() { this.DataSetName = "DSReport"; this.Prefix = ""; @@ -256,30 +262,30 @@ namespace FCM0000 { base.Tables.Add(this.tablePersonInvStock); this.tablejagosummary = new jagosummaryDataTable(); base.Tables.Add(this.tablejagosummary); - this.tablejagosummaryPlace = new jagosummaryPlaceDataTable(); + this.tablejagosummaryPlace = new jagosummaryPlaceDataTable(false); base.Tables.Add(this.tablejagosummaryPlace); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private bool ShouldSerializePersonInvStock() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private bool ShouldSerializejagosummary() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private bool ShouldSerializejagosummaryPlace() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) { this.InitVars(); @@ -287,7 +293,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) { DSReport ds = new DSReport(); global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); @@ -333,13 +339,19 @@ namespace FCM0000 { return type; } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitExpressions() { + this.jagosummaryPlace.placeboxColumn.Expression = "place + \'_\' + box"; + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void PersonInvStockRowChangeEventHandler(object sender, PersonInvStockRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void jagosummaryRowChangeEventHandler(object sender, jagosummaryRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void jagosummaryPlaceRowChangeEventHandler(object sender, jagosummaryPlaceRowChangeEvent e); /// @@ -360,7 +372,7 @@ namespace FCM0000 { private global::System.Data.DataColumn columnstock; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public PersonInvStockDataTable() { this.TableName = "PersonInvStock"; this.BeginInit(); @@ -369,7 +381,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal PersonInvStockDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { @@ -386,14 +398,14 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected PersonInvStockDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn usernameColumn { get { return this.columnusername; @@ -401,7 +413,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn projectColumn { get { return this.columnproject; @@ -409,7 +421,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn pdateColumn { get { return this.columnpdate; @@ -417,7 +429,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn ItemNameColumn { get { return this.columnItemName; @@ -425,7 +437,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn stockColumn { get { return this.columnstock; @@ -433,7 +445,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int Count { get { @@ -442,33 +454,33 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public PersonInvStockRow this[int index] { get { return ((PersonInvStockRow)(this.Rows[index])); } } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event PersonInvStockRowChangeEventHandler PersonInvStockRowChanging; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event PersonInvStockRowChangeEventHandler PersonInvStockRowChanged; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event PersonInvStockRowChangeEventHandler PersonInvStockRowDeleting; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event PersonInvStockRowChangeEventHandler PersonInvStockRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void AddPersonInvStockRow(PersonInvStockRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public PersonInvStockRow AddPersonInvStockRow(string username, string project, string pdate, string ItemName, int stock) { PersonInvStockRow rowPersonInvStockRow = ((PersonInvStockRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -483,7 +495,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public override global::System.Data.DataTable Clone() { PersonInvStockDataTable cln = ((PersonInvStockDataTable)(base.Clone())); cln.InitVars(); @@ -491,13 +503,13 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Data.DataTable CreateInstance() { return new PersonInvStockDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal void InitVars() { this.columnusername = base.Columns["username"]; this.columnproject = base.Columns["project"]; @@ -507,7 +519,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitClass() { this.columnusername = new global::System.Data.DataColumn("username", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnusername); @@ -530,25 +542,25 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public PersonInvStockRow NewPersonInvStockRow() { return ((PersonInvStockRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { return new PersonInvStockRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Type GetRowType() { return typeof(PersonInvStockRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanged(e); if ((this.PersonInvStockRowChanged != null)) { @@ -557,7 +569,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanging(e); if ((this.PersonInvStockRowChanging != null)) { @@ -566,7 +578,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleted(e); if ((this.PersonInvStockRowDeleted != null)) { @@ -575,7 +587,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleting(e); if ((this.PersonInvStockRowDeleting != null)) { @@ -584,13 +596,13 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void RemovePersonInvStockRow(PersonInvStockRow row) { this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -677,7 +689,7 @@ namespace FCM0000 { private global::System.Data.DataColumn columnsupply; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryDataTable() { this.TableName = "jagosummary"; this.BeginInit(); @@ -686,7 +698,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal jagosummaryDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { @@ -703,14 +715,14 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected jagosummaryDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn idxColumn { get { return this.columnidx; @@ -718,7 +730,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn lastDateColumn { get { return this.columnlastDate; @@ -726,7 +738,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn nameColumn { get { return this.columnname; @@ -734,7 +746,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn sidColumn { get { return this.columnsid; @@ -742,7 +754,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn modelColumn { get { return this.columnmodel; @@ -750,7 +762,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn QtyColumn { get { return this.columnQty; @@ -758,7 +770,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn AmtColumn { get { return this.columnAmt; @@ -766,7 +778,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn supplyColumn { get { return this.columnsupply; @@ -774,7 +786,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int Count { get { @@ -783,33 +795,33 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryRow this[int index] { get { return ((jagosummaryRow)(this.Rows[index])); } } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event jagosummaryRowChangeEventHandler jagosummaryRowChanging; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event jagosummaryRowChangeEventHandler jagosummaryRowChanged; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event jagosummaryRowChangeEventHandler jagosummaryRowDeleting; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event jagosummaryRowChangeEventHandler jagosummaryRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void AddjagosummaryRow(jagosummaryRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryRow AddjagosummaryRow(string lastDate, string name, string sid, string model, int Qty, decimal Amt, string supply) { jagosummaryRow rowjagosummaryRow = ((jagosummaryRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -827,7 +839,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public override global::System.Data.DataTable Clone() { jagosummaryDataTable cln = ((jagosummaryDataTable)(base.Clone())); cln.InitVars(); @@ -835,13 +847,13 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Data.DataTable CreateInstance() { return new jagosummaryDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal void InitVars() { this.columnidx = base.Columns["idx"]; this.columnlastDate = base.Columns["lastDate"]; @@ -854,7 +866,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitClass() { this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidx); @@ -890,25 +902,25 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryRow NewjagosummaryRow() { return ((jagosummaryRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { return new jagosummaryRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Type GetRowType() { return typeof(jagosummaryRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanged(e); if ((this.jagosummaryRowChanged != null)) { @@ -917,7 +929,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanging(e); if ((this.jagosummaryRowChanging != null)) { @@ -926,7 +938,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleted(e); if ((this.jagosummaryRowDeleted != null)) { @@ -935,7 +947,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleting(e); if ((this.jagosummaryRowDeleting != null)) { @@ -944,13 +956,13 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void RemovejagosummaryRow(jagosummaryRow row) { this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -1038,17 +1050,30 @@ namespace FCM0000 { private global::System.Data.DataColumn columnitem; + private global::System.Data.DataColumn columnbox; + + private global::System.Data.DataColumn columnplacebox; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public jagosummaryPlaceDataTable() { + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public jagosummaryPlaceDataTable() : + this(false) { + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public jagosummaryPlaceDataTable(bool initExpressions) { this.TableName = "jagosummaryPlace"; this.BeginInit(); this.InitClass(); + if ((initExpressions == true)) { + this.InitExpressions(); + } this.EndInit(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal jagosummaryPlaceDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { @@ -1065,14 +1090,14 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected jagosummaryPlaceDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn placeColumn { get { return this.columnplace; @@ -1080,7 +1105,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn lastDateColumn { get { return this.columnlastDate; @@ -1088,7 +1113,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn nameColumn { get { return this.columnname; @@ -1096,7 +1121,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn sidColumn { get { return this.columnsid; @@ -1104,7 +1129,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn modelColumn { get { return this.columnmodel; @@ -1112,7 +1137,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn QtyColumn { get { return this.columnQty; @@ -1120,7 +1145,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn AmtColumn { get { return this.columnAmt; @@ -1128,7 +1153,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn supplyColumn { get { return this.columnsupply; @@ -1136,7 +1161,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataColumn itemColumn { get { return this.columnitem; @@ -1144,7 +1169,23 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn boxColumn { + get { + return this.columnbox; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn placeboxColumn { + get { + return this.columnplacebox; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int Count { get { @@ -1153,34 +1194,34 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryPlaceRow this[int index] { get { return ((jagosummaryPlaceRow)(this.Rows[index])); } } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event jagosummaryPlaceRowChangeEventHandler jagosummaryPlaceRowChanging; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event jagosummaryPlaceRowChangeEventHandler jagosummaryPlaceRowChanged; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event jagosummaryPlaceRowChangeEventHandler jagosummaryPlaceRowDeleting; - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event jagosummaryPlaceRowChangeEventHandler jagosummaryPlaceRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void AddjagosummaryPlaceRow(jagosummaryPlaceRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public jagosummaryPlaceRow AddjagosummaryPlaceRow(string place, string lastDate, string name, string sid, string model, int Qty, decimal Amt, string supply, int item) { + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public jagosummaryPlaceRow AddjagosummaryPlaceRow(string place, string lastDate, string name, string sid, string model, int Qty, decimal Amt, string supply, int item, string box, string placebox) { jagosummaryPlaceRow rowjagosummaryPlaceRow = ((jagosummaryPlaceRow)(this.NewRow())); object[] columnValuesArray = new object[] { place, @@ -1191,14 +1232,37 @@ namespace FCM0000 { Qty, Amt, supply, - item}; + item, + box, + placebox}; rowjagosummaryPlaceRow.ItemArray = columnValuesArray; this.Rows.Add(rowjagosummaryPlaceRow); return rowjagosummaryPlaceRow; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public jagosummaryPlaceRow AddjagosummaryPlaceRow(string place, string lastDate, string name, string sid, string model, int Qty, decimal Amt, string supply, int item, string box) { + jagosummaryPlaceRow rowjagosummaryPlaceRow = ((jagosummaryPlaceRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + place, + lastDate, + name, + sid, + model, + Qty, + Amt, + supply, + item, + box, + null}; + rowjagosummaryPlaceRow.ItemArray = columnValuesArray; + this.Rows.Add(rowjagosummaryPlaceRow); + return rowjagosummaryPlaceRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public override global::System.Data.DataTable Clone() { jagosummaryPlaceDataTable cln = ((jagosummaryPlaceDataTable)(base.Clone())); cln.InitVars(); @@ -1206,13 +1270,13 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Data.DataTable CreateInstance() { return new jagosummaryPlaceDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal void InitVars() { this.columnplace = base.Columns["place"]; this.columnlastDate = base.Columns["lastDate"]; @@ -1223,10 +1287,12 @@ namespace FCM0000 { this.columnAmt = base.Columns["Amt"]; this.columnsupply = base.Columns["supply"]; this.columnitem = base.Columns["item"]; + this.columnbox = base.Columns["box"]; + this.columnplacebox = base.Columns["placebox"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitClass() { this.columnplace = new global::System.Data.DataColumn("place", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnplace); @@ -1246,6 +1312,10 @@ namespace FCM0000 { base.Columns.Add(this.columnsupply); this.columnitem = new global::System.Data.DataColumn("item", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnitem); + this.columnbox = new global::System.Data.DataColumn("box", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbox); + this.columnplacebox = new global::System.Data.DataColumn("placebox", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnplacebox); this.columnplace.MaxLength = 100; this.columnlastDate.ReadOnly = true; this.columnlastDate.MaxLength = 10; @@ -1255,28 +1325,36 @@ namespace FCM0000 { this.columnQty.ReadOnly = true; this.columnAmt.ReadOnly = true; this.columnsupply.MaxLength = 100; + this.columnbox.MaxLength = 100; + this.columnplacebox.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryPlaceRow NewjagosummaryPlaceRow() { return ((jagosummaryPlaceRow)(this.NewRow())); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { return new jagosummaryPlaceRow(builder); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override global::System.Type GetRowType() { return typeof(jagosummaryPlaceRow); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitExpressions() { + this.placeboxColumn.Expression = "place + \'_\' + box"; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanged(e); if ((this.jagosummaryPlaceRowChanged != null)) { @@ -1285,7 +1363,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { base.OnRowChanging(e); if ((this.jagosummaryPlaceRowChanging != null)) { @@ -1294,7 +1372,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleted(e); if ((this.jagosummaryPlaceRowDeleted != null)) { @@ -1303,7 +1381,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { base.OnRowDeleting(e); if ((this.jagosummaryPlaceRowDeleting != null)) { @@ -1312,13 +1390,13 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void RemovejagosummaryPlaceRow(jagosummaryPlaceRow row) { this.Rows.Remove(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -1389,14 +1467,14 @@ namespace FCM0000 { private PersonInvStockDataTable tablePersonInvStock; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal PersonInvStockRow(global::System.Data.DataRowBuilder rb) : base(rb) { this.tablePersonInvStock = ((PersonInvStockDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string username { get { if (this.IsusernameNull()) { @@ -1412,7 +1490,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string project { get { if (this.IsprojectNull()) { @@ -1428,7 +1506,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string pdate { get { if (this.IspdateNull()) { @@ -1444,7 +1522,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string ItemName { get { if (this.IsItemNameNull()) { @@ -1460,7 +1538,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public int stock { get { if (this.IsstockNull()) { @@ -1476,61 +1554,61 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsusernameNull() { return this.IsNull(this.tablePersonInvStock.usernameColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetusernameNull() { this[this.tablePersonInvStock.usernameColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsprojectNull() { return this.IsNull(this.tablePersonInvStock.projectColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetprojectNull() { this[this.tablePersonInvStock.projectColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { return this.IsNull(this.tablePersonInvStock.pdateColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetpdateNull() { this[this.tablePersonInvStock.pdateColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsItemNameNull() { return this.IsNull(this.tablePersonInvStock.ItemNameColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetItemNameNull() { this[this.tablePersonInvStock.ItemNameColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsstockNull() { return this.IsNull(this.tablePersonInvStock.stockColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetstockNull() { this[this.tablePersonInvStock.stockColumn] = global::System.Convert.DBNull; } @@ -1544,14 +1622,14 @@ namespace FCM0000 { private jagosummaryDataTable tablejagosummary; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal jagosummaryRow(global::System.Data.DataRowBuilder rb) : base(rb) { this.tablejagosummary = ((jagosummaryDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public int idx { get { try { @@ -1567,7 +1645,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string lastDate { get { if (this.IslastDateNull()) { @@ -1583,7 +1661,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string name { get { if (this.IsnameNull()) { @@ -1599,7 +1677,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string sid { get { if (this.IssidNull()) { @@ -1615,7 +1693,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string model { get { if (this.IsmodelNull()) { @@ -1631,7 +1709,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public int Qty { get { if (this.IsQtyNull()) { @@ -1647,7 +1725,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public decimal Amt { get { if (this.IsAmtNull()) { @@ -1663,7 +1741,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string supply { get { if (this.IssupplyNull()) { @@ -1679,97 +1757,97 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsidxNull() { return this.IsNull(this.tablejagosummary.idxColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetidxNull() { this[this.tablejagosummary.idxColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IslastDateNull() { return this.IsNull(this.tablejagosummary.lastDateColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetlastDateNull() { this[this.tablejagosummary.lastDateColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsnameNull() { return this.IsNull(this.tablejagosummary.nameColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetnameNull() { this[this.tablejagosummary.nameColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IssidNull() { return this.IsNull(this.tablejagosummary.sidColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetsidNull() { this[this.tablejagosummary.sidColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsmodelNull() { return this.IsNull(this.tablejagosummary.modelColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetmodelNull() { this[this.tablejagosummary.modelColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsQtyNull() { return this.IsNull(this.tablejagosummary.QtyColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetQtyNull() { this[this.tablejagosummary.QtyColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsAmtNull() { return this.IsNull(this.tablejagosummary.AmtColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetAmtNull() { this[this.tablejagosummary.AmtColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IssupplyNull() { return this.IsNull(this.tablejagosummary.supplyColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetsupplyNull() { this[this.tablejagosummary.supplyColumn] = global::System.Convert.DBNull; } @@ -1783,14 +1861,14 @@ namespace FCM0000 { private jagosummaryPlaceDataTable tablejagosummaryPlace; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal jagosummaryPlaceRow(global::System.Data.DataRowBuilder rb) : base(rb) { this.tablejagosummaryPlace = ((jagosummaryPlaceDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string place { get { if (this.IsplaceNull()) { @@ -1806,7 +1884,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string lastDate { get { if (this.IslastDateNull()) { @@ -1822,7 +1900,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string name { get { if (this.IsnameNull()) { @@ -1838,7 +1916,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string sid { get { if (this.IssidNull()) { @@ -1854,7 +1932,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string model { get { if (this.IsmodelNull()) { @@ -1870,7 +1948,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public int Qty { get { if (this.IsQtyNull()) { @@ -1886,7 +1964,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public decimal Amt { get { if (this.IsAmtNull()) { @@ -1902,7 +1980,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string supply { get { if (this.IssupplyNull()) { @@ -1918,7 +1996,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public int item { get { if (this.IsitemNull()) { @@ -1934,118 +2012,174 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string box { + get { + if (this.IsboxNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablejagosummaryPlace.boxColumn])); + } + } + set { + this[this.tablejagosummaryPlace.boxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string placebox { + get { + try { + return ((string)(this[this.tablejagosummaryPlace.placeboxColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'jagosummaryPlace\' 테이블의 \'placebox\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablejagosummaryPlace.placeboxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsplaceNull() { return this.IsNull(this.tablejagosummaryPlace.placeColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetplaceNull() { this[this.tablejagosummaryPlace.placeColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IslastDateNull() { return this.IsNull(this.tablejagosummaryPlace.lastDateColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetlastDateNull() { this[this.tablejagosummaryPlace.lastDateColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsnameNull() { return this.IsNull(this.tablejagosummaryPlace.nameColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetnameNull() { this[this.tablejagosummaryPlace.nameColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IssidNull() { return this.IsNull(this.tablejagosummaryPlace.sidColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetsidNull() { this[this.tablejagosummaryPlace.sidColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsmodelNull() { return this.IsNull(this.tablejagosummaryPlace.modelColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetmodelNull() { this[this.tablejagosummaryPlace.modelColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsQtyNull() { return this.IsNull(this.tablejagosummaryPlace.QtyColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetQtyNull() { this[this.tablejagosummaryPlace.QtyColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsAmtNull() { return this.IsNull(this.tablejagosummaryPlace.AmtColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetAmtNull() { this[this.tablejagosummaryPlace.AmtColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IssupplyNull() { return this.IsNull(this.tablejagosummaryPlace.supplyColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetsupplyNull() { this[this.tablejagosummaryPlace.supplyColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsitemNull() { return this.IsNull(this.tablejagosummaryPlace.itemColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public void SetitemNull() { this[this.tablejagosummaryPlace.itemColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsboxNull() { + return this.IsNull(this.tablejagosummaryPlace.boxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetboxNull() { + this[this.tablejagosummaryPlace.boxColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsplaceboxNull() { + return this.IsNull(this.tablejagosummaryPlace.placeboxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetplaceboxNull() { + this[this.tablejagosummaryPlace.placeboxColumn] = global::System.Convert.DBNull; + } } /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public class PersonInvStockRowChangeEvent : global::System.EventArgs { private PersonInvStockRow eventRow; @@ -2053,14 +2187,14 @@ namespace FCM0000 { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public PersonInvStockRowChangeEvent(PersonInvStockRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public PersonInvStockRow Row { get { return this.eventRow; @@ -2068,7 +2202,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -2079,7 +2213,7 @@ namespace FCM0000 { /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public class jagosummaryRowChangeEvent : global::System.EventArgs { private jagosummaryRow eventRow; @@ -2087,14 +2221,14 @@ namespace FCM0000 { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryRowChangeEvent(jagosummaryRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryRow Row { get { return this.eventRow; @@ -2102,7 +2236,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -2113,7 +2247,7 @@ namespace FCM0000 { /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public class jagosummaryPlaceRowChangeEvent : global::System.EventArgs { private jagosummaryPlaceRow eventRow; @@ -2121,14 +2255,14 @@ namespace FCM0000 { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryPlaceRowChangeEvent(jagosummaryPlaceRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryPlaceRow Row { get { return this.eventRow; @@ -2136,7 +2270,7 @@ namespace FCM0000 { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -2170,13 +2304,13 @@ namespace FCM0000.DSReportTableAdapters { private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public PersonInvStockTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -2187,7 +2321,7 @@ namespace FCM0000.DSReportTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal global::System.Data.SqlClient.SqlConnection Connection { get { if ((this._connection == null)) { @@ -2215,7 +2349,7 @@ namespace FCM0000.DSReportTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal global::System.Data.SqlClient.SqlTransaction Transaction { get { return this._transaction; @@ -2241,7 +2375,7 @@ namespace FCM0000.DSReportTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -2252,7 +2386,7 @@ namespace FCM0000.DSReportTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -2263,7 +2397,7 @@ namespace FCM0000.DSReportTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -2278,14 +2412,14 @@ namespace FCM0000.DSReportTableAdapters { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FCM0000.Properties.Settings.Default.gwcs; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); @@ -2301,7 +2435,7 @@ ORDER BY username, project, ItemName"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] public virtual int Fill(DSReport.PersonInvStockDataTable dataTable, string uid) { @@ -2320,7 +2454,7 @@ ORDER BY username, project, ItemName"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] public virtual DSReport.PersonInvStockDataTable GetData(string uid) { @@ -2359,13 +2493,13 @@ ORDER BY username, project, ItemName"; private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -2376,7 +2510,7 @@ ORDER BY username, project, ItemName"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal global::System.Data.SqlClient.SqlConnection Connection { get { if ((this._connection == null)) { @@ -2404,7 +2538,7 @@ ORDER BY username, project, ItemName"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal global::System.Data.SqlClient.SqlTransaction Transaction { get { return this._transaction; @@ -2430,7 +2564,7 @@ ORDER BY username, project, ItemName"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -2441,7 +2575,7 @@ ORDER BY username, project, ItemName"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -2452,7 +2586,7 @@ ORDER BY username, project, ItemName"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -2470,14 +2604,14 @@ ORDER BY username, project, ItemName"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FCM0000.Properties.Settings.Default.gwcs; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); @@ -2493,7 +2627,7 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] public virtual int Fill(DSReport.jagosummaryDataTable dataTable, string gcode, string baseDate) { @@ -2518,7 +2652,7 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] public virtual DSReport.jagosummaryDataTable GetData(string gcode, string baseDate) { @@ -2563,13 +2697,13 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; private bool _clearBeforeFill; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jagosummaryPlaceTableAdapter() { this.ClearBeforeFill = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { get { if ((this._adapter == null)) { @@ -2580,7 +2714,7 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal global::System.Data.SqlClient.SqlConnection Connection { get { if ((this._connection == null)) { @@ -2608,7 +2742,7 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal global::System.Data.SqlClient.SqlTransaction Transaction { get { return this._transaction; @@ -2634,7 +2768,7 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { get { if ((this._commandCollection == null)) { @@ -2645,7 +2779,7 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool ClearBeforeFill { get { return this._clearBeforeFill; @@ -2656,7 +2790,7 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitAdapter() { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); @@ -2671,38 +2805,41 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply"; tableMapping.ColumnMappings.Add("Amt", "Amt"); tableMapping.ColumnMappings.Add("supply", "supply"); tableMapping.ColumnMappings.Add("item", "item"); + tableMapping.ColumnMappings.Add("box", "box"); this._adapter.TableMappings.Add(tableMapping); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FCM0000.Properties.Settings.Default.gwcs; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitCommandCollection() { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item + this._commandCollection[0].CommandText = @"SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item, + Inventory.box FROM Inventory LEFT OUTER JOIN Items ON Inventory.gcode = Items.gcode AND Inventory.item = Items.idx WHERE (Inventory.gcode = @gcode) AND (Inventory.pdate <= @baseDate) AND (ISNULL(Inventory.place, N'') LIKE @place) -GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item"; +GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item, Inventory.box"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@baseDate", 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("@place", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@place", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = @"SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item + this._commandCollection[1].CommandText = @"SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item, + Inventory.box FROM Inventory LEFT OUTER JOIN Items ON Inventory.gcode = Items.gcode AND Inventory.item = Items.idx WHERE (Inventory.gcode = @gcode) AND (Inventory.pdate <= @baseDate) AND (Items.idx = @item) -GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item"; +GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item, Inventory.box"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@baseDate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2710,7 +2847,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] public virtual int Fill(DSReport.jagosummaryPlaceDataTable dataTable, string gcode, string baseDate, string place) { @@ -2741,7 +2878,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] public virtual DSReport.jagosummaryPlaceDataTable GetData(string gcode, string baseDate, string place) { @@ -2764,13 +2901,13 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(place)); } - DSReport.jagosummaryPlaceDataTable dataTable = new DSReport.jagosummaryPlaceDataTable(); + DSReport.jagosummaryPlaceDataTable dataTable = new DSReport.jagosummaryPlaceDataTable(true); this.Adapter.Fill(dataTable); return dataTable; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] public virtual int FillByItemIdx(DSReport.jagosummaryPlaceDataTable dataTable, string gcode, string baseDate, int item) { @@ -2796,7 +2933,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DSReport.jagosummaryPlaceDataTable GetbyItemIdx(string gcode, string baseDate, int item) { @@ -2814,7 +2951,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve this.Adapter.SelectCommand.Parameters[1].Value = ((string)(baseDate)); } this.Adapter.SelectCommand.Parameters[2].Value = ((int)(item)); - DSReport.jagosummaryPlaceDataTable dataTable = new DSReport.jagosummaryPlaceDataTable(); + DSReport.jagosummaryPlaceDataTable dataTable = new DSReport.jagosummaryPlaceDataTable(true); this.Adapter.Fill(dataTable); return dataTable; } @@ -2837,7 +2974,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve private global::System.Data.IDbConnection _connection; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public UpdateOrderOption UpdateOrder { get { return this._updateOrder; @@ -2848,7 +2985,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool BackupDataSetBeforeUpdate { get { return this._backupDataSetBeforeUpdate; @@ -2859,7 +2996,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] public global::System.Data.IDbConnection Connection { get { @@ -2874,7 +3011,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] public int TableAdapterInstanceCount { get { @@ -2887,7 +3024,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve ///Update rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateUpdatedRows(DSReport dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) { int result = 0; return result; @@ -2897,7 +3034,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve ///Insert rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateInsertedRows(DSReport dataSet, global::System.Collections.Generic.List allAddedRows) { int result = 0; return result; @@ -2907,7 +3044,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve ///Delete rows in bottom-up order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateDeletedRows(DSReport dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; return result; @@ -2917,7 +3054,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve ///Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List allAddedRows) { if (((updatedRows == null) || (updatedRows.Length < 1))) { @@ -2941,7 +3078,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve ///Update all changes to the dataset. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public virtual int UpdateAll(DSReport dataSet) { if ((dataSet == null)) { throw new global::System.ArgumentNullException("dataSet"); @@ -3051,13 +3188,13 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) { global::System.Array.Sort(rows, new SelfReferenceComparer(relation, childFirst)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) { if ((this._connection != null)) { return true; @@ -3075,7 +3212,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve /// ///Update Order Option /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public enum UpdateOrderOption { InsertUpdateDelete = 0, @@ -3086,7 +3223,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve /// ///Used to sort self-referenced table's rows /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer { private global::System.Data.DataRelation _relation; @@ -3094,7 +3231,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve private int _childFirst; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) { this._relation = relation; if (childFirst) { @@ -3106,7 +3243,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private global::System.Data.DataRow GetRoot(global::System.Data.DataRow row, out int distance) { global::System.Diagnostics.Debug.Assert((row != null)); global::System.Data.DataRow root = row; @@ -3145,7 +3282,7 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) { if (object.ReferenceEquals(row1, row2)) { return 0; diff --git a/SubProject/FCM0000/DSReport.xsd b/SubProject/FCM0000/DSReport.xsd index aacfd86..2893a7e 100644 --- a/SubProject/FCM0000/DSReport.xsd +++ b/SubProject/FCM0000/DSReport.xsd @@ -69,15 +69,16 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply - SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item + SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item, + Inventory.box FROM Inventory LEFT OUTER JOIN Items ON Inventory.gcode = Items.gcode AND Inventory.item = Items.idx WHERE (Inventory.gcode = @gcode) AND (Inventory.pdate <= @baseDate) AND (ISNULL(Inventory.place, N'') LIKE @place) -GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item +GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item, Inventory.box - + @@ -93,16 +94,18 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve + - SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item + SELECT Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item, + Inventory.box FROM Inventory LEFT OUTER JOIN Items ON Inventory.gcode = Items.gcode AND Inventory.item = Items.idx WHERE (Inventory.gcode = @gcode) AND (Inventory.pdate <= @baseDate) AND (Items.idx = @item) -GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item +GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item, Inventory.box @@ -118,79 +121,79 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve - + - + - + - + - + - + - + - + - - + + - + - + - + - - - + + + @@ -200,54 +203,62 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve - + - + - + - + - + - + - - - + + + - + + + + + + + + + diff --git a/SubProject/FCM0000/Inventory/fInventory.Designer.cs b/SubProject/FCM0000/Inventory/fInventory.Designer.cs index 312780b..876666f 100644 --- a/SubProject/FCM0000/Inventory/fInventory.Designer.cs +++ b/SubProject/FCM0000/Inventory/fInventory.Designer.cs @@ -30,19 +30,20 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fInventory)); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -79,6 +80,9 @@ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); + this.입고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.출고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -93,9 +97,6 @@ this.bs = new System.Windows.Forms.BindingSource(this.components); this.dSInventory = new FCM0000.DSInventory(); this.ta = new FCM0000.DSInventoryTableAdapters.vInventoryTableAdapter(); - this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); - this.입고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.출고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -131,14 +132,14 @@ this.tbFind, this.toolStripButton1, this.btFind}); - this.bn.Location = new System.Drawing.Point(0, 554); + this.bn.Location = new System.Drawing.Point(0, 605); 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(979, 25); + this.bn.Size = new System.Drawing.Size(1107, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -176,6 +177,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -238,10 +240,12 @@ // // btSave // + this.btSave.ForeColor = System.Drawing.Color.Red; this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); this.btSave.Name = "btSave"; this.btSave.Size = new System.Drawing.Size(66, 22); this.btSave.Text = "저장(&S)"; + this.btSave.Visible = false; this.btSave.Click += new System.EventHandler(this.btSave_Click); // // toolStripSeparator1 @@ -259,6 +263,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.toolStripTextBox1_KeyDown); @@ -303,7 +308,7 @@ this.toolStripButton2}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(979, 37); + this.toolStrip1.Size = new System.Drawing.Size(1107, 37); this.toolStrip1.TabIndex = 2; this.toolStrip1.Text = "toolStrip1"; // @@ -317,6 +322,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(100, 37); this.dtSD.Text = "1982-11-23"; @@ -338,6 +344,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(100, 37); this.dtED.Text = "1982-11-23"; @@ -422,7 +429,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(979, 517); + this.fpSpread1.Size = new System.Drawing.Size(1107, 568); this.fpSpread1.TabIndex = 3; // // cm @@ -441,7 +448,26 @@ this.toolStripMenuItem1, this.보관소별재고확인ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(299, 332); + this.cm.Size = new System.Drawing.Size(297, 310); + // + // 입고등록ToolStripMenuItem + // + this.입고등록ToolStripMenuItem.Name = "입고등록ToolStripMenuItem"; + this.입고등록ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); + this.입고등록ToolStripMenuItem.Text = "입고 등록"; + this.입고등록ToolStripMenuItem.Click += new System.EventHandler(this.입고등록ToolStripMenuItem_Click); + // + // 출고등록ToolStripMenuItem + // + this.출고등록ToolStripMenuItem.Name = "출고등록ToolStripMenuItem"; + this.출고등록ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); + this.출고등록ToolStripMenuItem.Text = "출고 등록"; + this.출고등록ToolStripMenuItem.Click += new System.EventHandler(this.출고등록ToolStripMenuItem_Click); + // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(293, 6); // // columnSizeToolStripMenuItem // @@ -449,14 +475,14 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.columnSizeToolStripMenuItem.Text = "열 크기"; // // saveToolStripMenuItem // this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(266, 36); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(264, 36); this.saveToolStripMenuItem.Text = "현재 상태 저장"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -464,52 +490,52 @@ // this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(266, 36); + this.loadToolStripMenuItem.Size = new System.Drawing.Size(264, 36); this.loadToolStripMenuItem.Text = "저장값 불러오기"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); // // exportListToolStripMenuItem // this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; - this.exportListToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.exportListToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.exportListToolStripMenuItem.Text = "목록 내보내기"; this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); // // 인쇄ToolStripMenuItem // this.인쇄ToolStripMenuItem.Name = "인쇄ToolStripMenuItem"; - this.인쇄ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.인쇄ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.인쇄ToolStripMenuItem.Text = "인쇄"; this.인쇄ToolStripMenuItem.Click += new System.EventHandler(this.인쇄ToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(295, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(293, 6); // // 편집ToolStripMenuItem // this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem"; - this.편집ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.편집ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.편집ToolStripMenuItem.Text = "편집"; this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click); // // 삭제ToolStripMenuItem // this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.삭제ToolStripMenuItem.Text = "삭제"; this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(295, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(293, 6); // // 보관소별재고확인ToolStripMenuItem // this.보관소별재고확인ToolStripMenuItem.Name = "보관소별재고확인ToolStripMenuItem"; - this.보관소별재고확인ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.보관소별재고확인ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.보관소별재고확인ToolStripMenuItem.Text = "보관소별 재고 확인"; this.보관소별재고확인ToolStripMenuItem.Click += new System.EventHandler(this.보관소별재고확인ToolStripMenuItem_Click); // @@ -519,7 +545,7 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 13; + this.fpSpread1_Sheet1.ColumnCount = 14; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -534,93 +560,99 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "금액"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "사용자"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "보관소"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "BOX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 30F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 62F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "invtype"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "구분"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "SID"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 92F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "itemName"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "itemModel"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "SID"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "S/N"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 83F; - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType7; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "dr_qty"; this.fpSpread1_Sheet1.Columns.Get(7).ForeColor = System.Drawing.Color.Blue; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 77F; - numberCellType8.DecimalPlaces = 0; - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - numberCellType8.NegativeRed = true; - numberCellType8.NullDisplay = "--"; - numberCellType8.Separator = ","; - numberCellType8.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType8; + numberCellType2.DecimalPlaces = 0; + numberCellType2.MaximumValue = 999999999999999D; + numberCellType2.MinimumValue = -999999999999999D; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "dr_amt"; this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.Blue; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(8).Label = "금액"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 75F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userName"; this.fpSpread1_Sheet1.Columns.Get(9).Label = "사용자"; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "보관소"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType30; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "box"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "BOX"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 151F; - numberCellType9.DecimalPlaces = 0; - numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType9.MaximumValue = 2147483647D; - numberCellType9.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(12).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 151F; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(13).Visible = false; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -643,30 +675,11 @@ // this.ta.ClearBeforeFill = true; // - // toolStripMenuItem3 - // - this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(295, 6); - // - // 입고등록ToolStripMenuItem - // - this.입고등록ToolStripMenuItem.Name = "입고등록ToolStripMenuItem"; - this.입고등록ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); - this.입고등록ToolStripMenuItem.Text = "입고 등록"; - this.입고등록ToolStripMenuItem.Click += new System.EventHandler(this.입고등록ToolStripMenuItem_Click); - // - // 출고등록ToolStripMenuItem - // - this.출고등록ToolStripMenuItem.Name = "출고등록ToolStripMenuItem"; - this.출고등록ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); - this.출고등록ToolStripMenuItem.Text = "출고 등록"; - this.출고등록ToolStripMenuItem.Click += new System.EventHandler(this.출고등록ToolStripMenuItem_Click); - // // fInventory // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(979, 579); + this.ClientSize = new System.Drawing.Size(1107, 630); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); @@ -736,12 +749,12 @@ private System.Windows.Forms.ToolStripComboBox cmbInvType; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 보관소별재고확인ToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem 인쇄ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel7; private System.Windows.Forms.ToolStripComboBox cmbPlace; private System.Windows.Forms.ToolStripMenuItem 입고등록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 출고등록ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Inventory/fInventory.cs b/SubProject/FCM0000/Inventory/fInventory.cs index 55ecb07..926103c 100644 --- a/SubProject/FCM0000/Inventory/fInventory.cs +++ b/SubProject/FCM0000/Inventory/fInventory.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -105,7 +106,7 @@ namespace FCM0000 cmbUser.SelectedIndex = 0;//전체 dtED.Text = DateTime.Now.ToShortDateString(); - dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString(); + dtSD.Text = DateTime.Now.AddYears(-1).ToShortDateString(); RefreshData(); } @@ -129,10 +130,10 @@ namespace FCM0000 } var place = "%"; - if (cmbPlace.SelectedIndex > 0) place = cmbPlace.Text.Trim(); + if (cmbPlace.SelectedIndex > 0) place = cmbPlace.Text.Trim() ; var invtype = "%"; - if (cmbInvType.SelectedIndex > 0) invtype = cmbInvType.Text.Trim(); - this.ta.Fill(this.dSInventory.vInventory, FCOMMON.info.Login.gcode, sd, ed, userNo, invtype, place); + if (cmbInvType.SelectedIndex > 0) invtype = cmbInvType.Text.Trim(); + this.ta.Fill(this.dSInventory.vInventory, FCOMMON.info.Login.gcode, sd, ed, invtype, userNo, place); this.dSInventory.vInventory.AcceptChanges(); FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); @@ -284,7 +285,8 @@ namespace FCM0000 try { - this.ta.Update(this.dSInventory.vInventory); + var cnt = this.ta.Update(this.dSInventory.vInventory); + FCOMMON.Util.MsgI($"{cnt}건의 자료가 저장 되었습니다"); } catch (Exception ex) { @@ -296,17 +298,32 @@ namespace FCM0000 private void btAdd_Click(object sender, EventArgs e) { var newdr = this.dSInventory.vInventory.NewvInventoryRow(); - var f = new finventoryAdd(newdr); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { + newdr.EndEdit(); this.dSInventory.vInventory.AddvInventoryRow(newdr); - int cnt = this.ta.Update(newdr); - newdr.AcceptChanges(); + var cnt = ta.Update(newdr); if (cnt != 1) - FCOMMON.Util.MsgE("자료가 추가되지 않았습니다.\n\n잠시 후 다시 시도하세요"); + { + FCOMMON.Util.MsgE("저장이 완료되지 않았습니다"); + } + else + { + //방금입력한 자료의 idx를 찾아서 업데이트해아한다. + var taq = new DSInventoryTableAdapters.QueriesTableAdapter(); + var idx = taq.GetLastIdx(newdr.gcode, newdr.uid, newdr.invtype, newdr.wuid, newdr.wdate, newdr.item); + newdr.idx = (int)idx; + newdr.EndEdit(); + newdr.AcceptChanges(); + } } - else newdr.Delete(); + else + { + newdr.Delete(); + //newdr.AcceptChanges(); + } + } private void btEdit_Click(object sender, EventArgs e) @@ -321,11 +338,13 @@ namespace FCM0000 var f = new finventoryAdd(dr); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - if (dr.RowState != DataRowState.Unchanged) + dr.EndEdit(); + var cnt = ta.Update(dr); + if (cnt != 1) { - int cnt = this.ta.Update(dr); - dr.AcceptChanges(); + FCOMMON.Util.MsgE("저장이 완료되지 않았습니다"); } + else dr.AcceptChanges(); } else dr.RejectChanges(); } @@ -342,16 +361,16 @@ namespace FCM0000 var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?"); if (dlg != System.Windows.Forms.DialogResult.Yes) return; - dr.Delete(); - try + var cnt = ta.Update(dr); + if(cnt != 1) { - this.ta.Update(dr); - } - catch (Exception ex) + FCOMMON.Util.MsgE("저장 실패"); + }else { - FCOMMON.Util.MsgE("삭제실패\n\n" + ex.Message); + //dr.AcceptChanges(); } + } @@ -369,7 +388,7 @@ namespace FCM0000 } else { - var collist = new string[] { "username","uid","place","itemName","itemModel","serial","memo" }; + var collist = new string[] { "username","box","uid","place","itemName","itemModel","serial","memo" }; search = search.Replace("'", "''"); string filter = ""; // "itemna like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?"; foreach(var col in collist) diff --git a/SubProject/FCM0000/Inventory/fInventory.resx b/SubProject/FCM0000/Inventory/fInventory.resx index 531119c..cef9b8b 100644 --- a/SubProject/FCM0000/Inventory/fInventory.resx +++ b/SubProject/FCM0000/Inventory/fInventory.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -135,7 +135,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -144,7 +144,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -153,7 +153,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -164,7 +164,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/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 @@ -187,7 +187,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -259,15 +259,6 @@ 371, 17 - - 501, 17 - - - 189, 17 - - - 253, 17 - R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh @@ -288,10 +279,13 @@ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== + + 501, 17 + + + 189, 17 + 253, 17 - - 439, 17 - \ No newline at end of file diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs b/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs index f211a68..468f0b1 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs @@ -30,17 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fInventoryJagoList)); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -63,7 +53,6 @@ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btSearch = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.입고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.출고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -76,15 +65,24 @@ this.bs = new System.Windows.Forms.BindingSource(this.components); this.dSReport = new FCM0000.DSReport(); this.ta = new FCM0000.DSReportTableAdapters.jagosummaryPlaceTableAdapter(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.초기화ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.arDatagridView1 = new arCtl.arDatagridView(); + this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.boxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.lastDateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.modelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.qtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.amtDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.placeboxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSReport)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); this.SuspendLayout(); // // bn @@ -152,6 +150,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -195,6 +194,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.toolStripTextBox1_KeyDown); @@ -246,6 +246,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(100, 37); this.dtSD.Text = "1982-11-23"; @@ -287,24 +288,6 @@ this.toolStripButton2.Text = "닫기"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // - // fpSpread1 - // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.ContextMenuStrip = this.cm; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.Location = new System.Drawing.Point(0, 37); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(979, 517); - this.fpSpread1.TabIndex = 3; - this.fpSpread1.TitleInfo.CellType = textCellType7; - this.fpSpread1.TitleInfo.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1.TitleInfo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1.TitleInfo.Text = "재고 현황"; - this.fpSpread1.TitleInfo.Value = "재고 현황"; - this.fpSpread1.TitleInfo.VerticalAlign = FarPoint.Win.Spread.CellVerticalAlignment.Center; - // // cm // this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -316,41 +299,42 @@ this.exportListToolStripMenuItem, this.인쇄ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(243, 190); + this.cm.Size = new System.Drawing.Size(241, 190); // // 입고등록ToolStripMenuItem // this.입고등록ToolStripMenuItem.Name = "입고등록ToolStripMenuItem"; - this.입고등록ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.입고등록ToolStripMenuItem.Size = new System.Drawing.Size(240, 36); this.입고등록ToolStripMenuItem.Text = "입고 등록"; this.입고등록ToolStripMenuItem.Click += new System.EventHandler(this.입고등록ToolStripMenuItem_Click); // // 출고등록ToolStripMenuItem // this.출고등록ToolStripMenuItem.Name = "출고등록ToolStripMenuItem"; - this.출고등록ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.출고등록ToolStripMenuItem.Size = new System.Drawing.Size(240, 36); this.출고등록ToolStripMenuItem.Text = "출고 등록"; this.출고등록ToolStripMenuItem.Click += new System.EventHandler(this.출고등록ToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(239, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(237, 6); // // columnSizeToolStripMenuItem // this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveToolStripMenuItem, - this.loadToolStripMenuItem}); + this.loadToolStripMenuItem, + this.초기화ToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(240, 36); this.columnSizeToolStripMenuItem.Text = "열 크기"; // // saveToolStripMenuItem // this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(266, 36); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(264, 36); this.saveToolStripMenuItem.Text = "현재 상태 저장"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -358,21 +342,21 @@ // this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(266, 36); + this.loadToolStripMenuItem.Size = new System.Drawing.Size(264, 36); this.loadToolStripMenuItem.Text = "저장값 불러오기"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); // // exportListToolStripMenuItem // this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; - this.exportListToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.exportListToolStripMenuItem.Size = new System.Drawing.Size(240, 36); this.exportListToolStripMenuItem.Text = "목록 내보내기"; this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); // // 인쇄ToolStripMenuItem // this.인쇄ToolStripMenuItem.Name = "인쇄ToolStripMenuItem"; - this.인쇄ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.인쇄ToolStripMenuItem.Size = new System.Drawing.Size(240, 36); this.인쇄ToolStripMenuItem.Text = "인쇄"; this.인쇄ToolStripMenuItem.Click += new System.EventHandler(this.인쇄ToolStripMenuItem_Click); // @@ -390,122 +374,122 @@ // this.ta.ClearBeforeFill = true; // - // fpSpread1_Sheet1 + // 초기화ToolStripMenuItem // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 9; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "최종등록일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "모델명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "보관소"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 30F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "lastDate"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "최종등록일"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 89F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "품명"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 146F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "model"; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "모델명"; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID"; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 77F; - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "Qty"; - this.fpSpread1_Sheet1.Columns.Get(4).ForeColor = System.Drawing.Color.Blue; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "수량"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "--"; - numberCellType2.Separator = ","; - numberCellType2.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "Amt"; - this.fpSpread1_Sheet1.Columns.Get(5).ForeColor = System.Drawing.Color.Blue; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "금액"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 75F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "place"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "보관소"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(7).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "item"; - this.fpSpread1_Sheet1.DataAutoCellTypes = false; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.ReadOnly; - this.fpSpread1_Sheet1.PrintInfo.AbortMessage = "취소"; - this.fpSpread1_Sheet1.PrintInfo.BestFitCols = true; - this.fpSpread1_Sheet1.PrintInfo.BestFitRows = true; - this.fpSpread1_Sheet1.PrintInfo.Centering = FarPoint.Win.Spread.Centering.Horizontal; - this.fpSpread1_Sheet1.PrintInfo.EnhancePreview = true; - this.fpSpread1_Sheet1.PrintInfo.JobName = "재고현황"; - this.fpSpread1_Sheet1.PrintInfo.Margin.Bottom = 3; - this.fpSpread1_Sheet1.PrintInfo.Margin.Footer = 3; - this.fpSpread1_Sheet1.PrintInfo.Margin.Header = 3; - this.fpSpread1_Sheet1.PrintInfo.Margin.Left = 3; - this.fpSpread1_Sheet1.PrintInfo.Margin.Right = 3; - this.fpSpread1_Sheet1.PrintInfo.Margin.Top = 3; - noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo1.HardMarginX = 0F; - noPrinterPrintInfo1.HardMarginY = 0F; - noPrinterPrintInfo1.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; - this.fpSpread1_Sheet1.PrintInfo.Orientation = FarPoint.Win.Spread.PrintOrientation.Portrait; - this.fpSpread1_Sheet1.PrintInfo.PdfFileName = "재고현황"; - this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; - this.fpSpread1_Sheet1.PrintInfo.Preview = true; - this.fpSpread1_Sheet1.PrintInfo.UseSmartPrint = true; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.TitleInfo.Text = "재고현황"; - this.fpSpread1_Sheet1.TitleInfo.Value = "재고현황"; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + this.초기화ToolStripMenuItem.Name = "초기화ToolStripMenuItem"; + this.초기화ToolStripMenuItem.Size = new System.Drawing.Size(264, 36); + this.초기화ToolStripMenuItem.Text = "초기화"; + this.초기화ToolStripMenuItem.Click += new System.EventHandler(this.초기화ToolStripMenuItem_Click); + // + // arDatagridView1 + // + this.arDatagridView1.A_DelCurrentCell = true; + this.arDatagridView1.A_EnterToTab = true; + this.arDatagridView1.A_KoreanField = null; + this.arDatagridView1.A_UpperField = null; + this.arDatagridView1.A_ViewRownumOnHeader = true; + this.arDatagridView1.AllowUserToAddRows = false; + this.arDatagridView1.AutoGenerateColumns = false; + this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.placeDataGridViewTextBoxColumn, + this.boxDataGridViewTextBoxColumn, + this.lastDateDataGridViewTextBoxColumn, + this.nameDataGridViewTextBoxColumn, + this.modelDataGridViewTextBoxColumn, + this.sidDataGridViewTextBoxColumn, + this.qtyDataGridViewTextBoxColumn, + this.amtDataGridViewTextBoxColumn, + this.placeboxDataGridViewTextBoxColumn}); + this.arDatagridView1.ContextMenuStrip = this.cm; + this.arDatagridView1.DataSource = this.bs; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.arDatagridView1.DefaultCellStyle = dataGridViewCellStyle1; + this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.arDatagridView1.Location = new System.Drawing.Point(0, 37); + this.arDatagridView1.Name = "arDatagridView1"; + this.arDatagridView1.ReadOnly = true; + this.arDatagridView1.RowTemplate.Height = 23; + this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.arDatagridView1.Size = new System.Drawing.Size(979, 517); + this.arDatagridView1.TabIndex = 4; + // + // placeDataGridViewTextBoxColumn + // + this.placeDataGridViewTextBoxColumn.DataPropertyName = "place"; + this.placeDataGridViewTextBoxColumn.HeaderText = "보관소"; + this.placeDataGridViewTextBoxColumn.Name = "placeDataGridViewTextBoxColumn"; + this.placeDataGridViewTextBoxColumn.ReadOnly = true; + // + // boxDataGridViewTextBoxColumn + // + this.boxDataGridViewTextBoxColumn.DataPropertyName = "box"; + this.boxDataGridViewTextBoxColumn.HeaderText = "분류"; + this.boxDataGridViewTextBoxColumn.Name = "boxDataGridViewTextBoxColumn"; + this.boxDataGridViewTextBoxColumn.ReadOnly = true; + // + // lastDateDataGridViewTextBoxColumn + // + this.lastDateDataGridViewTextBoxColumn.DataPropertyName = "lastDate"; + this.lastDateDataGridViewTextBoxColumn.HeaderText = "최종등록"; + this.lastDateDataGridViewTextBoxColumn.Name = "lastDateDataGridViewTextBoxColumn"; + this.lastDateDataGridViewTextBoxColumn.ReadOnly = true; + // + // nameDataGridViewTextBoxColumn + // + this.nameDataGridViewTextBoxColumn.DataPropertyName = "name"; + this.nameDataGridViewTextBoxColumn.HeaderText = "품명"; + this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn"; + this.nameDataGridViewTextBoxColumn.ReadOnly = true; + // + // modelDataGridViewTextBoxColumn + // + this.modelDataGridViewTextBoxColumn.DataPropertyName = "model"; + this.modelDataGridViewTextBoxColumn.HeaderText = "모델"; + this.modelDataGridViewTextBoxColumn.Name = "modelDataGridViewTextBoxColumn"; + this.modelDataGridViewTextBoxColumn.ReadOnly = true; + // + // sidDataGridViewTextBoxColumn + // + this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid"; + this.sidDataGridViewTextBoxColumn.HeaderText = "SID"; + this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn"; + this.sidDataGridViewTextBoxColumn.ReadOnly = true; + // + // qtyDataGridViewTextBoxColumn + // + this.qtyDataGridViewTextBoxColumn.DataPropertyName = "Qty"; + this.qtyDataGridViewTextBoxColumn.HeaderText = "수량"; + this.qtyDataGridViewTextBoxColumn.Name = "qtyDataGridViewTextBoxColumn"; + this.qtyDataGridViewTextBoxColumn.ReadOnly = true; + // + // amtDataGridViewTextBoxColumn + // + this.amtDataGridViewTextBoxColumn.DataPropertyName = "Amt"; + this.amtDataGridViewTextBoxColumn.HeaderText = "금액"; + this.amtDataGridViewTextBoxColumn.Name = "amtDataGridViewTextBoxColumn"; + this.amtDataGridViewTextBoxColumn.ReadOnly = true; + // + // placeboxDataGridViewTextBoxColumn + // + this.placeboxDataGridViewTextBoxColumn.DataPropertyName = "placebox"; + this.placeboxDataGridViewTextBoxColumn.HeaderText = "placebox"; + this.placeboxDataGridViewTextBoxColumn.Name = "placeboxDataGridViewTextBoxColumn"; + this.placeboxDataGridViewTextBoxColumn.ReadOnly = true; // // fInventoryJagoList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(979, 579); - this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.arDatagridView1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); this.Name = "fInventoryJagoList"; @@ -516,11 +500,10 @@ this.bn.PerformLayout(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dSReport)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -546,7 +529,6 @@ private System.Windows.Forms.ToolStripTextBox tbFind; private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private FarPoint.Win.Spread.FpSpread fpSpread1; private System.Windows.Forms.BindingSource bs; private System.Windows.Forms.ContextMenuStrip cm; private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; @@ -563,6 +545,16 @@ private System.Windows.Forms.ToolStripComboBox cmbPlace; private System.Windows.Forms.ToolStripMenuItem 입고등록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 출고등록ToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripMenuItem 초기화ToolStripMenuItem; + private arCtl.arDatagridView arDatagridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn placeDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn boxDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn lastDateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn modelDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn sidDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn qtyDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn amtDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn placeboxDataGridViewTextBoxColumn; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs index af81acf..7defa37 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs @@ -83,7 +83,8 @@ namespace FCM0000 if (cmbPlace.SelectedIndex > 0) place = cmbPlace.Text.Trim(); this.ta.Fill(this.dSReport.jagosummaryPlace, FCOMMON.info.Login.gcode, sd,place); this.dSReport.jagosummaryPlace.AcceptChanges(); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + // FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + arDatagridView1.AutoResizeColumns(); } catch (Exception ex) { @@ -109,7 +110,7 @@ namespace FCM0000 } else { - var collist = new string[] { "place", "name", "sid", "model", "supply" }; + var collist = new string[] { "place", "name", "placebox","box","sid", "model", "supply" }; search = search.Replace("'", "''"); string filter = ""; // "itemna like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?"; foreach (var col in collist) @@ -166,12 +167,12 @@ namespace FCM0000 private void saveToolStripMenuItem_Click(object sender, EventArgs e) { - FPUtil.ColsizeSave(this.fpSpread1, fn_fpcolsize); + //FPUtil.ColsizeSave(this.fpSpread1, fn_fpcolsize); } private void loadToolStripMenuItem_Click(object sender, EventArgs e) { - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + //FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); } private void exportListToolStripMenuItem_Click(object sender, EventArgs e) @@ -181,12 +182,12 @@ namespace FCM0000 sd.FileName = "inventoryjagolist.xls"; if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - fpSpread1.SaveExcel(sd.FileName, - FarPoint.Excel.ExcelSaveFlags.SaveAsViewed - | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered - | FarPoint.Excel.ExcelSaveFlags.NoFormulas - | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); - FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); + //fpSpread1.SaveExcel(sd.FileName, + // FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + // | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + // | FarPoint.Excel.ExcelSaveFlags.NoFormulas + // | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); + //FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); } } @@ -213,7 +214,7 @@ namespace FCM0000 private void 인쇄ToolStripMenuItem_Click(object sender, EventArgs e) { - FPUtil.printsheet(this.fpSpread1, "재고현황"); + // FPUtil.printsheet(this.fpSpread1, "재고현황"); } private void 입고등록ToolStripMenuItem_Click(object sender, EventArgs e) @@ -303,5 +304,10 @@ namespace FCM0000 this.RefreshData(); } + + private void 초기화ToolStripMenuItem_Click(object sender, EventArgs e) + { + // FPUtil.ColsizeSave(this.fpSpread1, fn_fpcolsize); + } } } diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.resx b/SubProject/FCM0000/Inventory/fInventoryJagoList.resx index d1dba18..af9b1aa 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.resx +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -135,7 +135,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -144,7 +144,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -153,7 +153,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -234,9 +234,6 @@ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - 486, 17 - 189, 17 diff --git a/SubProject/FCM0000/Inventory/finventoryAdd.Designer.cs b/SubProject/FCM0000/Inventory/finventoryAdd.Designer.cs index 0bba3f9..291e133 100644 --- a/SubProject/FCM0000/Inventory/finventoryAdd.Designer.cs +++ b/SubProject/FCM0000/Inventory/finventoryAdd.Designer.cs @@ -40,6 +40,7 @@ System.Windows.Forms.Label label6; System.Windows.Forms.Label label2; System.Windows.Forms.Label label4; + System.Windows.Forms.Label label5; this.tbSID = new System.Windows.Forms.TextBox(); this.tbPumName = new System.Windows.Forms.TextBox(); this.tbPumModel = new System.Windows.Forms.TextBox(); @@ -48,8 +49,6 @@ this.tbPumAmt = new System.Windows.Forms.TextBox(); this.tbProject = new System.Windows.Forms.TextBox(); this.tbProjectIndex = new System.Windows.Forms.TextBox(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsPurchase = new FCM0000.DSInventory(); this.tbBigo = new System.Windows.Forms.TextBox(); this.dtPdate = new System.Windows.Forms.DateTimePicker(); this.btSave = new System.Windows.Forms.Button(); @@ -57,12 +56,15 @@ this.cmbRequest = new System.Windows.Forms.ComboBox(); this.tbPumIDX = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.cmbStorage = new System.Windows.Forms.ComboBox(); this.tbSN = new System.Windows.Forms.TextBox(); this.linkLabel7 = new System.Windows.Forms.LinkLabel(); this.linkLabel5 = new System.Windows.Forms.LinkLabel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.cmbBox = new System.Windows.Forms.ComboBox(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsPurchase = new FCM0000.DSInventory(); this.ta = new FCM0000.DSInventoryTableAdapters.vInventoryTableAdapter(); - this.cmbPlace = new System.Windows.Forms.ComboBox(); sidLabel = new System.Windows.Forms.Label(); pumscaleLabel = new System.Windows.Forms.Label(); pumqtyLabel = new System.Windows.Forms.Label(); @@ -74,9 +76,10 @@ label6 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); + this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); - this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // sidLabel @@ -92,7 +95,7 @@ // pumscaleLabel // pumscaleLabel.AutoSize = true; - pumscaleLabel.Location = new System.Drawing.Point(9, 142); + pumscaleLabel.Location = new System.Drawing.Point(12, 142); pumscaleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumscaleLabel.Name = "pumscaleLabel"; pumscaleLabel.Size = new System.Drawing.Size(75, 20); @@ -102,7 +105,7 @@ // pumqtyLabel // pumqtyLabel.AutoSize = true; - pumqtyLabel.Location = new System.Drawing.Point(45, 178); + pumqtyLabel.Location = new System.Drawing.Point(48, 178); pumqtyLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumqtyLabel.Name = "pumqtyLabel"; pumqtyLabel.Size = new System.Drawing.Size(39, 20); @@ -122,7 +125,7 @@ // pumamtLabel // pumamtLabel.AutoSize = true; - pumamtLabel.Location = new System.Drawing.Point(45, 213); + pumamtLabel.Location = new System.Drawing.Point(48, 213); pumamtLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumamtLabel.Name = "pumamtLabel"; pumamtLabel.Size = new System.Drawing.Size(39, 20); @@ -132,7 +135,7 @@ // deptLabel // deptLabel.AutoSize = true; - deptLabel.Location = new System.Drawing.Point(45, 318); + deptLabel.Location = new System.Drawing.Point(48, 351); deptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); deptLabel.Name = "deptLabel"; deptLabel.Size = new System.Drawing.Size(39, 20); @@ -142,7 +145,7 @@ // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(30, 32); + label1.Location = new System.Drawing.Point(33, 32); label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label1.Name = "label1"; label1.Size = new System.Drawing.Size(54, 20); @@ -152,7 +155,7 @@ // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(45, 70); + label3.Location = new System.Drawing.Point(48, 70); label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label3.Name = "label3"; label3.Size = new System.Drawing.Size(39, 20); @@ -172,7 +175,7 @@ // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(50, 248); + label2.Location = new System.Drawing.Point(53, 248); label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label2.Name = "label2"; label2.Size = new System.Drawing.Size(34, 20); @@ -182,12 +185,12 @@ // label4 // label4.AutoSize = true; - label4.Location = new System.Drawing.Point(30, 283); + label4.Location = new System.Drawing.Point(2, 283); label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new System.Drawing.Size(54, 20); + label4.Size = new System.Drawing.Size(86, 20); label4.TabIndex = 24; - label4.Text = "보관소"; + label4.Text = "보관소(*60)"; // // tbSID // @@ -254,7 +257,7 @@ // this.tbProject.BackColor = System.Drawing.SystemColors.Window; this.tbProject.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbProject.Location = new System.Drawing.Point(92, 352); + this.tbProject.Location = new System.Drawing.Point(92, 385); this.tbProject.Margin = new System.Windows.Forms.Padding(4); this.tbProject.Name = "tbProject"; this.tbProject.Size = new System.Drawing.Size(311, 27); @@ -263,7 +266,7 @@ // tbProjectIndex // this.tbProjectIndex.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "project", true)); - this.tbProjectIndex.Location = new System.Drawing.Point(409, 352); + this.tbProjectIndex.Location = new System.Drawing.Point(409, 385); this.tbProjectIndex.Margin = new System.Windows.Forms.Padding(4); this.tbProjectIndex.Name = "tbProjectIndex"; this.tbProjectIndex.ReadOnly = true; @@ -273,20 +276,10 @@ this.tbProjectIndex.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolTip1.SetToolTip(this.tbProjectIndex, "Database ID"); // - // bs - // - this.bs.DataMember = "vInventory"; - this.bs.DataSource = this.dsPurchase; - // - // dsPurchase - // - this.dsPurchase.DataSetName = "dsPurchase"; - this.dsPurchase.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // tbBigo // this.tbBigo.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbBigo.Location = new System.Drawing.Point(93, 315); + this.tbBigo.Location = new System.Drawing.Point(93, 348); this.tbBigo.Margin = new System.Windows.Forms.Padding(4); this.tbBigo.MaxLength = 500; this.tbBigo.Name = "tbBigo"; @@ -304,7 +297,7 @@ // // btSave // - this.btSave.Location = new System.Drawing.Point(11, 406); + this.btSave.Location = new System.Drawing.Point(11, 438); this.btSave.Margin = new System.Windows.Forms.Padding(4); this.btSave.Name = "btSave"; this.btSave.Size = new System.Drawing.Size(490, 49); @@ -357,7 +350,9 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.cmbPlace); + this.groupBox1.Controls.Add(this.cmbBox); + this.groupBox1.Controls.Add(label5); + this.groupBox1.Controls.Add(this.cmbStorage); this.groupBox1.Controls.Add(label4); this.groupBox1.Controls.Add(this.tbSN); this.groupBox1.Controls.Add(label2); @@ -389,11 +384,24 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(490, 392); + this.groupBox1.Size = new System.Drawing.Size(490, 424); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "필수입력"; // + // cmbStorage + // + this.cmbStorage.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbStorage.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbStorage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbStorage.FormattingEnabled = true; + this.cmbStorage.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.cmbStorage.Location = new System.Drawing.Point(93, 280); + this.cmbStorage.Margin = new System.Windows.Forms.Padding(4); + this.cmbStorage.Name = "cmbStorage"; + this.cmbStorage.Size = new System.Drawing.Size(381, 28); + this.cmbStorage.TabIndex = 28; + // // tbSN // this.tbSN.ImeMode = System.Windows.Forms.ImeMode.Hangul; @@ -408,7 +416,7 @@ // linkLabel7 // this.linkLabel7.AutoSize = true; - this.linkLabel7.Location = new System.Drawing.Point(13, 355); + this.linkLabel7.Location = new System.Drawing.Point(16, 388); this.linkLabel7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabel7.Name = "linkLabel7"; this.linkLabel7.Size = new System.Drawing.Size(69, 20); @@ -420,7 +428,7 @@ // linkLabel5 // this.linkLabel5.AutoSize = true; - this.linkLabel5.Location = new System.Drawing.Point(45, 105); + this.linkLabel5.Location = new System.Drawing.Point(48, 105); this.linkLabel5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabel5.Name = "linkLabel5"; this.linkLabel5.Size = new System.Drawing.Size(39, 20); @@ -429,28 +437,48 @@ this.linkLabel5.Text = "품명"; this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked); // + // cmbBox + // + this.cmbBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbBox.FormattingEnabled = true; + this.cmbBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.cmbBox.Location = new System.Drawing.Point(92, 314); + this.cmbBox.Margin = new System.Windows.Forms.Padding(4); + this.cmbBox.Name = "cmbBox"; + this.cmbBox.Size = new System.Drawing.Size(381, 28); + this.cmbBox.TabIndex = 30; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(16, 317); + label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(71, 20); + label5.TabIndex = 29; + label5.Text = "박스(*61)"; + // + // bs + // + this.bs.DataMember = "vInventory"; + this.bs.DataSource = this.dsPurchase; + // + // dsPurchase + // + this.dsPurchase.DataSetName = "dsPurchase"; + this.dsPurchase.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // ta // this.ta.ClearBeforeFill = true; // - // tbPlace - // - this.cmbPlace.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cmbPlace.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.cmbPlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbPlace.FormattingEnabled = true; - this.cmbPlace.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.cmbPlace.Location = new System.Drawing.Point(93, 280); - this.cmbPlace.Margin = new System.Windows.Forms.Padding(4); - this.cmbPlace.Name = "tbPlace"; - this.cmbPlace.Size = new System.Drawing.Size(381, 28); - this.cmbPlace.TabIndex = 28; - // // finventoryAdd // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(511, 462); + this.ClientSize = new System.Drawing.Size(511, 496); this.Controls.Add(this.groupBox1); this.Controls.Add(this.btSave); this.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -462,10 +490,10 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "품목재고 등록/변경"; this.Load += new System.EventHandler(this.@__Load); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); this.ResumeLayout(false); } @@ -494,6 +522,7 @@ private System.Windows.Forms.LinkLabel linkLabel5; private System.Windows.Forms.LinkLabel linkLabel7; private System.Windows.Forms.TextBox tbSN; - private System.Windows.Forms.ComboBox cmbPlace; + private System.Windows.Forms.ComboBox cmbStorage; + private System.Windows.Forms.ComboBox cmbBox; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Inventory/finventoryAdd.cs b/SubProject/FCM0000/Inventory/finventoryAdd.cs index 20abda3..24a714a 100644 --- a/SubProject/FCM0000/Inventory/finventoryAdd.cs +++ b/SubProject/FCM0000/Inventory/finventoryAdd.cs @@ -50,11 +50,16 @@ namespace FCM0000 } //보관소 목록업데이트 - var PlaceList = FCOMMON.DBM.GetItemStorageList(); - cmbPlace.Items.Clear(); - foreach (var item in PlaceList) - cmbPlace.Items.Add(item); + var ListStorage = FCOMMON.DBM.getCodeList("60"); + cmbStorage.Items.Clear(); + foreach (var item in ListStorage) + cmbStorage.Items.Add(item.Value); + //박스 목록업데이트 + var ListBox = FCOMMON.DBM.getCodeList("61"); + cmbBox.Items.Clear(); + foreach (var item in ListBox) + cmbBox.Items.Add(item.Value); //사현재사용자의 데이터를 찾는다. if (cmbRequest.Items.Count > 0) @@ -89,7 +94,8 @@ namespace FCM0000 tbPumAmt.Text = dr.dr_amt.ToString("N0"); tbSN.Text = dr.serial; - cmbPlace.Text = dr.place; + cmbStorage.Text = dr.place; + cmbBox.Text = dr.box; tbProject.Text = dr.projectName; tbProject.Tag = tbProject.Text; tbProjectIndex.Text = dr.project.ToString(); @@ -236,17 +242,18 @@ namespace FCM0000 FCOMMON.DBM.UpdateItemSID(int.Parse(tbPumIDX.Text), tbSID.Text); } - if(cmbPlace.Text.Trim() == "") + if(cmbStorage.Text.Trim() == "") { FCOMMON.Util.MsgE("보관소를 입력하세요"); - cmbPlace.Focus(); + cmbStorage.Focus(); return false; } dr.itemName = tbPumName.Text; dr.itemModel = tbPumModel.Text; dr.item = int.Parse( tbPumIDX.Text ); - dr.place = cmbPlace.Text; + dr.place = cmbStorage.Text; + dr.box = cmbBox.Text; dr.serial = tbSN.Text; if (tbPumQty.Text.isEmpty()) tbPumQty.Text = "0"; if (tbPumPrice.Text.isEmpty()) tbPumPrice.Text = "0"; diff --git a/SubProject/FCM0000/Inventory/finventoryAdd.resx b/SubProject/FCM0000/Inventory/finventoryAdd.resx index a2f16d7..058f3ff 100644 --- a/SubProject/FCM0000/Inventory/finventoryAdd.resx +++ b/SubProject/FCM0000/Inventory/finventoryAdd.resx @@ -1,168 +1,183 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - 131, 17 - - - 17, 17 - - - 490, 17 - - - 313, 17 - - - 58 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + 131, 17 + + + 490, 17 + + + False + + + 490, 17 + + + False + + + 131, 17 + + + 17, 17 + + + 17, 17 + + + 313, 17 + + + 58 + \ No newline at end of file diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 6c14af2..444fc74 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -40,7 +40,7 @@ namespace FCOMMON cn.Open(); List retval = new List(); - var sql = "SELECT Storage FROM Items WHERE(gcode = @gcode) AND(ISNULL(disable, 0) = 0) AND(ISNULL(Storage, '') <> '') GROUP BY Storage ORDER BY Storage"; + var sql = "SELECT place FROM Inventory WHERE(gcode = @gcode) AND(ISNULL(place, '') <> '') GROUP BY place ORDER BY place"; var cmd = new SqlCommand(sql, cn); cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode; try @@ -1200,8 +1200,8 @@ namespace FCOMMON cn.Open(); var sql = "select isnull(place,'')" + " from Inventory " + - " where gcode = '{0}'" + - " order by place"; + " where gcode = '{0}' and isnull(place,'') <> ''" + + " group by place order by place"; sql = string.Format(sql, gcode); var cmd = new SqlCommand(sql, cn); var rdr = cmd.ExecuteReader();