...

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;
+            }
         }
         
         /// <summary>
@@ -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;
+            }
         }
         
         /// <summary>
@@ -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);
+            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 FROM Inventory WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
+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" +
+                " = @item, [box] = @box WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_g" +
-                "sNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNu" +
+                "code) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate" +
-                "ll_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_invtype)) AND ((" +
+                ")) AND ((@IsNull_invtype = 1 AND [invtype] IS NULL) OR ([invtype] = @Original_in" +
-                "@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_ser" +
+                "vtype)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND" +
-                "ial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_dr" +
+                " ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AN" +
-                "_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) AND ((@IsNull_d" +
+                "D ((@IsNull_dr_qty = 1 AND [dr_qty] IS NULL) OR ([dr_qty] = @Original_dr_qty)) A" +
-                "r_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) AND ((@IsNull_" +
+                "ND ((@IsNull_dr_amt = 1 AND [dr_amt] IS NULL) OR ([dr_amt] = @Original_dr_amt)) " +
-                "cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty)) AND ((@IsNull" +
+                "AND ((@IsNull_cr_qty = 1 AND [cr_qty] IS NULL) OR ([cr_qty] = @Original_cr_qty))" +
-                "_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)) AND ((@IsNul" +
+                " AND ((@IsNull_cr_amt = 1 AND [cr_amt] IS NULL) OR ([cr_amt] = @Original_cr_amt)" +
-                "l_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_m" +
+                ") AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) A" +
-                "emo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_project " +
+                "ND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@I" +
-                "= 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_pro" +
+                "sNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND" +
-                "jectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectNam" +
+                " ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Origi" +
-                "e)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_" +
+                "nal_projectName)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) " +
-                "item = 1 AND [item] IS NULL) OR ([item] = @Original_item)));\r\nSELECT idx, gcode," +
+                "AND ((@IsNull_item = 1 AND [item] IS NULL) OR ([item] = @Original_item)) AND ((@" +
-                " pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) " +
+                "IsNull_box = 1 AND [box] IS NULL) OR ([box] = @Original_box)));\r\nSELECT idx, gco" +
-                "AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, proj" +
+                "de, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(ite" +
-                "ectName, wuid, wdate, item FROM Inventory WHERE (idx = @idx) ORDER BY pdate DESC" +
+                "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<int> Original_item) {
+                    global::System.Nullable<int> 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<int> item) {
+                    global::System.Nullable<int> 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<int> 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<int> 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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_pdate));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_invtype));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_uid));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_serial));
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_dr_qty.Value));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[29].Value = ((decimal)(Original_dr_amt.Value));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_cr_qty.Value));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[33].Value = ((decimal)(Original_cr_amt.Value));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_place));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_memo));
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[39].Value = ((int)(Original_project.Value));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value;
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value;
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_projectName));
+                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 = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[45].Value = ((int)(Original_item.Value));
+                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 = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value;
+                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<int> 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<int> Original_item) {
+                    global::System.Nullable<int> 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);
+                    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)
+               (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,@serial,@dr_qty,@dr_amt,@cr_qty,@cr_amt,@place,@memo,@project,@projectName,@wuid,@wdate,@item)";
+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("@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.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("@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("@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("@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("@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, 
+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, item = @item
+               memo = @memo, project = @project, projectName = @projectName, wuid = @wuid, wdate = @wdate, box = @box
-WHERE  (idx = @Original_idx)";
+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("@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.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("@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("@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("@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("@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("@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("@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, 
+            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
-               B.model AS itemModel, A.project, A.projectName, A.wuid, A.wdate, B.sid
+FROM     vEETGW_Inventory AS A
-FROM     Inventory AS A LEFT OUTER JOIN
+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)
-               Items AS B ON A.item = B.idx
+ORDER BY pdate DESC";
-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].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";
         }
     }
     
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [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<int> GetLastIdx(string gcode, string uid, string invtype, string wuid, System.DateTime wdate, global::System.Nullable<int> 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<int>();
+            }
+            else {
+                return new global::System.Nullable<int>(((int)(returnValue)));
+            }
+        }
+    }
+    
     /// <summary>
     ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
     ///</summary>

SubProject/FCM0000/DSInventory.xsd

@@ -2,17 +2,17 @@
 <xs:schema id="DSInventory" targetNamespace="http://tempuri.org/DSInventory.xsd" xmlns:mstns="http://tempuri.org/DSInventory.xsd" xmlns="http://tempuri.org/DSInventory.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
   <xs:annotation>
     <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
-      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" GeneratorFunctionsComponentClassName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" UserFunctionsComponentName="QueriesTableAdapter" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
         <Connections>
           <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="gwcs" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="gwcs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.FCM0000.Properties.Settings.GlobalReference.Default.gwcs" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="InventoryTableAdapter" GeneratorDataComponentClassName="InventoryTableAdapter" Name="Inventory" UserDataComponentName="InventoryTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Inventory" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Inventory" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <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)))</CommandText>
+                    <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)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -41,16 +41,18 @@
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_projectName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_item" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="item" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_item" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_box" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="box" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_box" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="box" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <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);
+                    <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 FROM Inventory WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC</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, box FROM Inventory WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -66,27 +68,28 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@box" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="box" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <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</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <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) 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)));
+                    <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, [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 FROM Inventory WHERE (idx = @idx) ORDER BY pdate DESC</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, box FROM Inventory WHERE (idx = @idx) ORDER BY pdate DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -102,8 +105,9 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@box" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="box" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -131,10 +135,12 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_projectName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_item" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="item" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_item" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="GroupWare.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_box" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="box" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_box" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="box" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -160,6 +166,7 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g
               <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
               <Mapping SourceColumn="item" DataSetColumn="item" />
+              <Mapping SourceColumn="box" DataSetColumn="box" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Inventory" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByDate" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyDate" GeneratorSourceName="FillByDate" GetMethodModifier="Public" GetMethodName="GetbyDate" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyDate" UserSourceName="FillByDate">
@@ -208,83 +215,82 @@ ORDER BY pdate DESC</CommandText>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="vInventoryTableAdapter" GeneratorDataComponentClassName="vInventoryTableAdapter" Name="vInventory" UserDataComponentName="vInventoryTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vEETGW_Inventory" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>DELETE FROM Inventory
 WHERE  (idx = @idx)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>INSERT INTO Inventory
-               (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,@serial,@dr_qty,@dr_amt,@cr_qty,@cr_amt,@place,@memo,@project,@projectName,@wuid,@wdate,@item)</CommandText>
+VALUES  (@gcode,@pdate,@invtype,@uid,@item,@serial,@dr_qty,@dr_amt,@cr_qty,@cr_amt,@place,@memo,@project,@projectName,@wuid,@wdate,@box)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="invtype" ColumnName="invtype" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@invtype" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="invtype" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="invtype" ColumnName="invtype" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@invtype" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="invtype" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="item" ColumnName="item" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="dr_qty" ColumnName="dr_qty" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@dr_qty" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="dr_qty" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="dr_amt" ColumnName="dr_amt" DataSourceName="" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@dr_amt" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="dr_amt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="dr_qty" ColumnName="dr_qty" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@dr_qty" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="dr_qty" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cr_qty" ColumnName="cr_qty" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cr_qty" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cr_qty" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="dr_amt" ColumnName="dr_amt" DataSourceName="EE.dbo.Inventory" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@dr_amt" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="dr_amt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cr_amt" ColumnName="cr_amt" DataSourceName="" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@cr_amt" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="cr_amt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cr_qty" ColumnName="cr_qty" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cr_qty" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cr_qty" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="place" ColumnName="place" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@place" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cr_amt" ColumnName="cr_amt" DataSourceName="EE.dbo.Inventory" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@cr_amt" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="cr_amt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="place" ColumnName="place" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@place" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="project" ColumnName="project" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="project" ColumnName="project" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="item" ColumnName="item" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="box" ColumnName="box" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@box" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="box" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <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, 
+                    <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
-               B.model AS itemModel, A.project, A.projectName, A.wuid, A.wdate, B.sid
+FROM     vEETGW_Inventory AS A
-FROM     Inventory AS A LEFT OUTER JOIN
+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)
-               Items AS B ON A.item = B.idx
+ORDER BY pdate DESC</CommandText>
-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</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vEETGW_Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.vEETGW_Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.vEETGW_Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="invtype" ColumnName="invtype" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@invtype" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="invtype" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="invtype" ColumnName="invtype" DataSourceName="EE.dbo.vEETGW_Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@invtype" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="invtype" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="uid" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="place" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="String" Direction="Input" ParameterName="@place" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <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, 
+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, item = @item
+               memo = @memo, project = @project, projectName = @projectName, wuid = @wuid, wdate = @wdate, box = @box
-WHERE  (idx = @Original_idx)</CommandText>
+WHERE  (idx = @oidx)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="invtype" ColumnName="invtype" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@invtype" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="invtype" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="invtype" ColumnName="invtype" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@invtype" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="invtype" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="item" ColumnName="item" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="dr_qty" ColumnName="dr_qty" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@dr_qty" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="dr_qty" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="dr_qty" ColumnName="dr_qty" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@dr_qty" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="dr_qty" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="dr_amt" ColumnName="dr_amt" DataSourceName="" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@dr_amt" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="dr_amt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="dr_amt" ColumnName="dr_amt" DataSourceName="EE.dbo.Inventory" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@dr_amt" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="dr_amt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cr_qty" ColumnName="cr_qty" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cr_qty" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cr_qty" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cr_qty" ColumnName="cr_qty" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cr_qty" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cr_qty" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cr_amt" ColumnName="cr_amt" DataSourceName="" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@cr_amt" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="cr_amt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cr_amt" ColumnName="cr_amt" DataSourceName="EE.dbo.Inventory" DataTypeServer="decimal(18, 0)" DbType="Decimal" Direction="Input" ParameterName="@cr_amt" Precision="18" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="cr_amt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="place" ColumnName="place" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@place" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="place" ColumnName="place" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@place" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="project" ColumnName="project" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="project" ColumnName="project" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="item" ColumnName="item" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="box" ColumnName="box" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@box" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="box" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="oidx" ColumnName="idx" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@oidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -312,21 +318,43 @@ WHERE  (idx = @Original_idx)</CommandText>
               <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
               <Mapping SourceColumn="sid" DataSetColumn="sid" />
+              <Mapping SourceColumn="box" DataSetColumn="box" />
             </Mappings>
             <Sources />
           </TableAdapter>
         </Tables>
-        <Sources />
+        <Sources>
+          <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="GetLastIdx" MethodsParameterType="CLR" Modifier="Public" Name="GetLastIdx" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="GetLastIdx">
+            <SelectCommand>
+              <DbCommand CommandType="Text" ModifiedByUser="true">
+                <CommandText>select max(idx)
+from inventory
+where gcode = @gcode and uid = @uid and invtype =@invtype
+and wuid = @wuid
+and wdate = @wdate
+and item = @item</CommandText>
+                <Parameters>
+                  <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="invtype" ColumnName="invtype" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@invtype" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="invtype" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="item" ColumnName="item" DataSourceName="EE.dbo.Inventory" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="item" SourceColumnNullMapping="false" SourceVersion="Current" />
+                </Parameters>
+              </DbCommand>
+            </SelectCommand>
+          </DbSource>
+        </Sources>
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="DSInventory" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_UserDSName="DSInventory" msprop:Generator_DataSetName="DSInventory">
+  <xs:element name="DSInventory" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="DSInventory" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSInventory">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Inventory" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowEvArgName="InventoryRowChangeEvent" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_RowClassName="InventoryRow" msprop:Generator_TableVarName="tableInventory" msprop:Generator_UserTableName="Inventory">
+        <xs:element name="Inventory" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowEvArgName="InventoryRowChangeEvent" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowClassName="InventoryRow" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -376,7 +404,7 @@ WHERE  (idx = @Original_idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="dr_qty" msprop:Generator_ColumnPropNameInRow="dr_qty" msprop:Generator_ColumnPropNameInTable="dr_qtyColumn" msprop:Generator_ColumnVarNameInTable="columndr_qty" msprop:Generator_UserColumnName="dr_qty" type="xs:int" minOccurs="0" />
+              <xs:element name="dr_qty" msprop:Generator_ColumnPropNameInTable="dr_qtyColumn" msprop:Generator_ColumnPropNameInRow="dr_qty" msprop:Generator_UserColumnName="dr_qty" msprop:Generator_ColumnVarNameInTable="columndr_qty" type="xs:int" minOccurs="0" />
               <xs:element name="dr_amt" msprop:Generator_ColumnPropNameInTable="dr_amtColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="dr_amt" msprop:Generator_UserColumnName="dr_amt" msprop:Generator_ColumnVarNameInTable="columndr_amt" type="xs:decimal" minOccurs="0" />
               <xs:element name="cr_qty" msprop:Generator_ColumnPropNameInTable="cr_qtyColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="cr_qty" msprop:Generator_UserColumnName="cr_qty" msprop:Generator_ColumnVarNameInTable="columncr_qty" type="xs:int" minOccurs="0" />
               <xs:element name="cr_amt" msprop:Generator_ColumnPropNameInTable="cr_amtColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="cr_amt" msprop:Generator_UserColumnName="cr_amt" msprop:Generator_ColumnVarNameInTable="columncr_amt" type="xs:decimal" minOccurs="0" />
@@ -394,7 +422,7 @@ WHERE  (idx = @Original_idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="project" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_ColumnVarNameInTable="columnproject" msprop:Generator_UserColumnName="project" type="xs:int" minOccurs="0" />
+              <xs:element name="project" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_UserColumnName="project" msprop:Generator_ColumnVarNameInTable="columnproject" type="xs:int" minOccurs="0" />
               <xs:element name="projectName" msprop:Generator_ColumnPropNameInTable="projectNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="projectName" msprop:Generator_UserColumnName="projectName" msprop:Generator_ColumnVarNameInTable="columnprojectName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -402,22 +430,29 @@ WHERE  (idx = @Original_idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="item" msprop:Generator_ColumnPropNameInTable="itemColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="item" msprop:Generator_UserColumnName="item" msprop:Generator_ColumnVarNameInTable="columnitem" type="xs:int" minOccurs="0" />
+              <xs:element name="box" msprop:Generator_ColumnPropNameInTable="boxColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="box" msprop:Generator_UserColumnName="box" msprop:Generator_ColumnVarNameInTable="columnbox" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vInventory" msprop:Generator_RowEvHandlerName="vInventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="vInventoryRowDeleted" msprop:Generator_RowDeletingName="vInventoryRowDeleting" msprop:Generator_RowEvArgName="vInventoryRowChangeEvent" msprop:Generator_TablePropName="vInventory" msprop:Generator_RowChangedName="vInventoryRowChanged" msprop:Generator_RowChangingName="vInventoryRowChanging" msprop:Generator_TableClassName="vInventoryDataTable" msprop:Generator_RowClassName="vInventoryRow" msprop:Generator_TableVarName="tablevInventory" msprop:Generator_UserTableName="vInventory">
+        <xs:element name="vInventory" msprop:Generator_RowEvHandlerName="vInventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="vInventoryRowDeleted" msprop:Generator_RowDeletingName="vInventoryRowDeleting" msprop:Generator_RowEvArgName="vInventoryRowChangeEvent" msprop:Generator_TablePropName="vInventory" msprop:Generator_RowChangedName="vInventoryRowChanged" msprop:Generator_UserTableName="vInventory" msprop:Generator_RowChangingName="vInventoryRowChanging" msprop:Generator_RowClassName="vInventoryRow" msprop:Generator_TableClassName="vInventoryDataTable" msprop:Generator_TableVarName="tablevInventory">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -508,7 +543,7 @@ WHERE  (idx = @Original_idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="sid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_UserColumnName="sid" msprop:Generator_ColumnVarNameInTable="columnsid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -516,6 +551,13 @@ WHERE  (idx = @Original_idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="box" msprop:Generator_ColumnPropNameInTable="boxColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="box" msprop:Generator_UserColumnName="box" msprop:Generator_ColumnVarNameInTable="columnbox" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FCM0000/DSReport.xsd

@@ -69,15 +69,16 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply</CommandTex
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <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
+                    <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 &lt;= @baseDate) AND (ISNULL(Inventory.place, N'') LIKE @place)
-GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item</CommandText>
+GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item, Inventory.box</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="baseDate" ColumnName="pdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@baseDate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="place" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="String" Direction="Input" ParameterName="@place" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="place" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@place" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -93,16 +94,18 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve
               <Mapping SourceColumn="Amt" DataSetColumn="Amt" />
               <Mapping SourceColumn="supply" DataSetColumn="supply" />
               <Mapping SourceColumn="item" DataSetColumn="item" />
+              <Mapping SourceColumn="box" DataSetColumn="box" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="FillByItemIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyItemIdx" GeneratorSourceName="FillByItemIdx" GetMethodModifier="Public" GetMethodName="GetbyItemIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyItemIdx" UserSourceName="FillByItemIdx">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <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
+                    <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 &lt;= @baseDate) AND (Items.idx = @item)
-GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item</CommandText>
+GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item, Inventory.box</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="baseDate" ColumnName="pdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@baseDate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -118,79 +121,79 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="DSReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSReport" msprop:Generator_UserDSName="DSReport">
+  <xs:element name="DSReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="DSReport" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="PersonInvStock" msprop:Generator_TableClassName="PersonInvStockDataTable" msprop:Generator_TableVarName="tablePersonInvStock" msprop:Generator_RowChangedName="PersonInvStockRowChanged" msprop:Generator_TablePropName="PersonInvStock" msprop:Generator_RowDeletingName="PersonInvStockRowDeleting" msprop:Generator_RowChangingName="PersonInvStockRowChanging" msprop:Generator_RowEvHandlerName="PersonInvStockRowChangeEventHandler" msprop:Generator_RowDeletedName="PersonInvStockRowDeleted" msprop:Generator_RowClassName="PersonInvStockRow" msprop:Generator_UserTableName="PersonInvStock" msprop:Generator_RowEvArgName="PersonInvStockRowChangeEvent">
+        <xs:element name="PersonInvStock" msprop:Generator_RowClassName="PersonInvStockRow" msprop:Generator_RowEvHandlerName="PersonInvStockRowChangeEventHandler" msprop:Generator_RowDeletedName="PersonInvStockRowDeleted" msprop:Generator_RowDeletingName="PersonInvStockRowDeleting" msprop:Generator_RowEvArgName="PersonInvStockRowChangeEvent" msprop:Generator_TablePropName="PersonInvStock" msprop:Generator_RowChangedName="PersonInvStockRowChanged" msprop:Generator_UserTableName="PersonInvStock" msprop:Generator_RowChangingName="PersonInvStockRowChanging" msprop:Generator_TableClassName="PersonInvStockDataTable" msprop:Generator_TableVarName="tablePersonInvStock">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="username" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:Generator_UserColumnName="username" minOccurs="0">
+              <xs:element name="username" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnVarNameInTable="columnusername" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="project" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_ColumnVarNameInTable="columnproject" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_UserColumnName="project" minOccurs="0">
+              <xs:element name="project" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_UserColumnName="project" msprop:Generator_ColumnVarNameInTable="columnproject" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="pdate" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
+              <xs:element name="pdate" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ItemName" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemName" msprop:Generator_ColumnVarNameInTable="columnItemName" msprop:Generator_ColumnPropNameInTable="ItemNameColumn" msprop:Generator_UserColumnName="ItemName" minOccurs="0">
+              <xs:element name="ItemName" msprop:Generator_ColumnPropNameInTable="ItemNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemName" msprop:Generator_UserColumnName="ItemName" msprop:Generator_ColumnVarNameInTable="columnItemName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="stock" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="stock" msprop:Generator_ColumnVarNameInTable="columnstock" msprop:Generator_ColumnPropNameInTable="stockColumn" msprop:Generator_UserColumnName="stock" type="xs:int" minOccurs="0" />
+              <xs:element name="stock" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="stockColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="stock" msprop:Generator_UserColumnName="stock" msprop:Generator_ColumnVarNameInTable="columnstock" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="jagosummary" msprop:Generator_TableClassName="jagosummaryDataTable" msprop:Generator_TableVarName="tablejagosummary" msprop:Generator_TablePropName="jagosummary" msprop:Generator_RowDeletingName="jagosummaryRowDeleting" msprop:Generator_RowChangingName="jagosummaryRowChanging" msprop:Generator_RowEvHandlerName="jagosummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="jagosummaryRowDeleted" msprop:Generator_UserTableName="jagosummary" msprop:Generator_RowChangedName="jagosummaryRowChanged" msprop:Generator_RowEvArgName="jagosummaryRowChangeEvent" msprop:Generator_RowClassName="jagosummaryRow">
+        <xs:element name="jagosummary" msprop:Generator_RowEvHandlerName="jagosummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="jagosummaryRowDeleted" msprop:Generator_RowDeletingName="jagosummaryRowDeleting" msprop:Generator_RowEvArgName="jagosummaryRowChangeEvent" msprop:Generator_TablePropName="jagosummary" msprop:Generator_RowChangedName="jagosummaryRowChanged" msprop:Generator_UserTableName="jagosummary" msprop:Generator_RowChangingName="jagosummaryRowChanging" msprop:Generator_RowClassName="jagosummaryRow" msprop:Generator_TableClassName="jagosummaryDataTable" msprop:Generator_TableVarName="tablejagosummary">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" minOccurs="0" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" minOccurs="0" />
-              <xs:element name="lastDate" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="lastDate" msprop:Generator_ColumnVarNameInTable="columnlastDate" msprop:Generator_ColumnPropNameInTable="lastDateColumn" msprop:Generator_UserColumnName="lastDate" minOccurs="0">
+              <xs:element name="lastDate" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="lastDateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="lastDate" msprop:Generator_UserColumnName="lastDate" msprop:Generator_ColumnVarNameInTable="columnlastDate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+              <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="sid" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_ColumnVarNameInTable="columnsid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:Generator_UserColumnName="sid" minOccurs="0">
+              <xs:element name="sid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_UserColumnName="sid" msprop:Generator_ColumnVarNameInTable="columnsid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="model" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_ColumnVarNameInTable="columnmodel" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:Generator_UserColumnName="model" minOccurs="0">
+              <xs:element name="model" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_UserColumnName="model" msprop:Generator_ColumnVarNameInTable="columnmodel" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Qty" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_ColumnVarNameInTable="columnQty" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:Generator_UserColumnName="Qty" type="xs:int" minOccurs="0" />
+              <xs:element name="Qty" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_UserColumnName="Qty" msprop:Generator_ColumnVarNameInTable="columnQty" type="xs:int" minOccurs="0" />
-              <xs:element name="Amt" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Amt" msprop:Generator_ColumnVarNameInTable="columnAmt" msprop:Generator_ColumnPropNameInTable="AmtColumn" msprop:Generator_UserColumnName="Amt" type="xs:decimal" minOccurs="0" />
+              <xs:element name="Amt" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="AmtColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Amt" msprop:Generator_UserColumnName="Amt" msprop:Generator_ColumnVarNameInTable="columnAmt" type="xs:decimal" minOccurs="0" />
-              <xs:element name="supply" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="supply" msprop:Generator_ColumnVarNameInTable="columnsupply" msprop:Generator_ColumnPropNameInTable="supplyColumn" msprop:Generator_UserColumnName="supply" minOccurs="0">
+              <xs:element name="supply" msprop:Generator_ColumnPropNameInTable="supplyColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="supply" msprop:Generator_UserColumnName="supply" msprop:Generator_ColumnVarNameInTable="columnsupply" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
@@ -200,54 +203,62 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inve
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="jagosummaryPlace" msprop:Generator_TableClassName="jagosummaryPlaceDataTable" msprop:Generator_TableVarName="tablejagosummaryPlace" msprop:Generator_TablePropName="jagosummaryPlace" msprop:Generator_RowDeletingName="jagosummaryPlaceRowDeleting" msprop:Generator_RowChangingName="jagosummaryPlaceRowChanging" msprop:Generator_RowEvHandlerName="jagosummaryPlaceRowChangeEventHandler" msprop:Generator_RowDeletedName="jagosummaryPlaceRowDeleted" msprop:Generator_UserTableName="jagosummaryPlace" msprop:Generator_RowChangedName="jagosummaryPlaceRowChanged" msprop:Generator_RowEvArgName="jagosummaryPlaceRowChangeEvent" msprop:Generator_RowClassName="jagosummaryPlaceRow">
+        <xs:element name="jagosummaryPlace" msprop:Generator_RowEvHandlerName="jagosummaryPlaceRowChangeEventHandler" msprop:Generator_RowDeletedName="jagosummaryPlaceRowDeleted" msprop:Generator_RowDeletingName="jagosummaryPlaceRowDeleting" msprop:Generator_RowEvArgName="jagosummaryPlaceRowChangeEvent" msprop:Generator_TablePropName="jagosummaryPlace" msprop:Generator_RowChangedName="jagosummaryPlaceRowChanged" msprop:Generator_UserTableName="jagosummaryPlace" msprop:Generator_RowChangingName="jagosummaryPlaceRowChanging" msprop:Generator_RowClassName="jagosummaryPlaceRow" msprop:Generator_TableClassName="jagosummaryPlaceDataTable" msprop:Generator_TableVarName="tablejagosummaryPlace">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="place" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="place" msprop:Generator_ColumnVarNameInTable="columnplace" msprop:Generator_ColumnPropNameInTable="placeColumn" msprop:Generator_UserColumnName="place" minOccurs="0">
+              <xs:element name="place" msprop:Generator_ColumnPropNameInTable="placeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="place" msprop:Generator_UserColumnName="place" msprop:Generator_ColumnVarNameInTable="columnplace" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="lastDate" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="lastDate" msprop:Generator_ColumnVarNameInTable="columnlastDate" msprop:Generator_ColumnPropNameInTable="lastDateColumn" msprop:Generator_UserColumnName="lastDate" minOccurs="0">
+              <xs:element name="lastDate" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="lastDateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="lastDate" msprop:Generator_UserColumnName="lastDate" msprop:Generator_ColumnVarNameInTable="columnlastDate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+              <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="sid" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_ColumnVarNameInTable="columnsid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:Generator_UserColumnName="sid" minOccurs="0">
+              <xs:element name="sid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_UserColumnName="sid" msprop:Generator_ColumnVarNameInTable="columnsid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="model" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_ColumnVarNameInTable="columnmodel" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:Generator_UserColumnName="model" minOccurs="0">
+              <xs:element name="model" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_UserColumnName="model" msprop:Generator_ColumnVarNameInTable="columnmodel" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Qty" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_ColumnVarNameInTable="columnQty" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:Generator_UserColumnName="Qty" type="xs:int" minOccurs="0" />
+              <xs:element name="Qty" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_UserColumnName="Qty" msprop:Generator_ColumnVarNameInTable="columnQty" type="xs:int" minOccurs="0" />
-              <xs:element name="Amt" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Amt" msprop:Generator_ColumnVarNameInTable="columnAmt" msprop:Generator_ColumnPropNameInTable="AmtColumn" msprop:Generator_UserColumnName="Amt" type="xs:decimal" minOccurs="0" />
+              <xs:element name="Amt" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="AmtColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Amt" msprop:Generator_UserColumnName="Amt" msprop:Generator_ColumnVarNameInTable="columnAmt" type="xs:decimal" minOccurs="0" />
-              <xs:element name="supply" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="supply" msprop:Generator_ColumnVarNameInTable="columnsupply" msprop:Generator_ColumnPropNameInTable="supplyColumn" msprop:Generator_UserColumnName="supply" minOccurs="0">
+              <xs:element name="supply" msprop:Generator_ColumnPropNameInTable="supplyColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="supply" msprop:Generator_UserColumnName="supply" msprop:Generator_ColumnVarNameInTable="columnsupply" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="item" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="item" msprop:Generator_ColumnVarNameInTable="columnitem" msprop:Generator_ColumnPropNameInTable="itemColumn" msprop:Generator_UserColumnName="item" type="xs:int" minOccurs="0" />
+              <xs:element name="item" msprop:Generator_ColumnPropNameInTable="itemColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="item" msprop:Generator_UserColumnName="item" msprop:Generator_ColumnVarNameInTable="columnitem" type="xs:int" minOccurs="0" />
+              <xs:element name="box" msprop:Generator_ColumnPropNameInTable="boxColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="box" msprop:Generator_UserColumnName="box" msprop:Generator_ColumnVarNameInTable="columnbox" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="placebox" msdata:ReadOnly="true" msdata:Expression="place + '_' + box" msprop:Generator_ColumnPropNameInRow="placebox" msprop:Generator_ColumnPropNameInTable="placeboxColumn" msprop:Generator_ColumnVarNameInTable="columnplacebox" msprop:Generator_UserColumnName="placebox" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

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 textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            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;
+            numberCellType1.DecimalPlaces = 0;
-            numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType7.MaximumValue = 2147483647D;
+            numberCellType1.MaximumValue = 2147483647D;
-            numberCellType7.MinimumValue = -2147483648D;
+            numberCellType1.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType7;
+            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;
+            numberCellType2.DecimalPlaces = 0;
-            numberCellType8.MaximumValue = 999999999999999D;
+            numberCellType2.MaximumValue = 999999999999999D;
-            numberCellType8.MinimumValue = -999999999999999D;
+            numberCellType2.MinimumValue = -999999999999999D;
-            numberCellType8.NegativeRed = true;
+            numberCellType2.NegativeRed = true;
-            numberCellType8.NullDisplay = "--";
+            numberCellType2.NullDisplay = "--";
-            numberCellType8.Separator = ",";
+            numberCellType2.Separator = ",";
-            numberCellType8.ShowSeparator = true;
+            numberCellType2.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType8;
+            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).CellType = textCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "memo";
+            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;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11;
-            numberCellType9.DecimalPlaces = 0;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "memo";
-            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            numberCellType9.MaximumValue = 2147483647D;
+            this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고";
-            numberCellType9.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(12).Width = 151F;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "idx";
+            numberCellType3.DecimalPlaces = 0;
-            this.fpSpread1_Sheet1.Columns.Get(12).Visible = false;
+            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;
     }
 }

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();
+                if (cmbInvType.SelectedIndex > 0) invtype =  cmbInvType.Text.Trim();
-                this.ta.Fill(this.dSInventory.vInventory, FCOMMON.info.Login.gcode, sd, ed, userNo, invtype, place);
+                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);
+                var cnt = ta.Update(newdr);
-                newdr.AcceptChanges();
                 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);
+                    FCOMMON.Util.MsgE("저장이 완료되지 않았습니다");
-                    dr.AcceptChanges();
                 }
+                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);
+                FCOMMON.Util.MsgE("저장 실패");
-            }
+            }else
-            catch (Exception ex)
             {
-                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)

SubProject/FCM0000/Inventory/fInventory.resx

@@ -124,7 +124,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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 @@
   <data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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 @@
   <data name="btDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -259,15 +259,6 @@
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>371, 17</value>
   </metadata>
-  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>501, 17</value>
-  </metadata>
-  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>189, 17</value>
-  </metadata>
-  <metadata name="dSInventory.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>253, 17</value>
-  </metadata>
   <data name="saveToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh
@@ -288,10 +279,13 @@
         vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
 </value>
   </data>
+  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>501, 17</value>
+  </metadata>
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>189, 17</value>
+  </metadata>
   <metadata name="dSInventory.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>253, 17</value>
   </metadata>
-  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>439, 17</value>
-  </metadata>
 </root>

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();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            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();
             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.초기화ToolStripMenuItem.Name = "초기화ToolStripMenuItem";
-            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+            this.초기화ToolStripMenuItem.Size = new System.Drawing.Size(264, 36);
-            // Formulas and custom names must be loaded with R1C1 reference style
+            this.초기화ToolStripMenuItem.Text = "초기화";
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            this.초기화ToolStripMenuItem.Click += new System.EventHandler(this.초기화ToolStripMenuItem_Click);
-            this.fpSpread1_Sheet1.ColumnCount = 9;
+            // 
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            // arDatagridView1
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            // 
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.arDatagridView1.A_DelCurrentCell = true;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "최종등록일";
+            this.arDatagridView1.A_EnterToTab = true;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "품명";
+            this.arDatagridView1.A_KoreanField = null;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "모델명";
+            this.arDatagridView1.A_UpperField = null;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID";
+            this.arDatagridView1.A_ViewRownumOnHeader = true;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "수량";
+            this.arDatagridView1.AllowUserToAddRows = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "금액";
+            this.arDatagridView1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "보관소";
+            this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 30F;
+            this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
+            this.placeDataGridViewTextBoxColumn,
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "lastDate";
+            this.boxDataGridViewTextBoxColumn,
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.lastDateDataGridViewTextBoxColumn,
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "최종등록일";
+            this.nameDataGridViewTextBoxColumn,
-            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.modelDataGridViewTextBoxColumn,
-            this.fpSpread1_Sheet1.Columns.Get(0).Width = 89F;
+            this.sidDataGridViewTextBoxColumn,
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
+            this.qtyDataGridViewTextBoxColumn,
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "name";
+            this.amtDataGridViewTextBoxColumn,
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.placeboxDataGridViewTextBoxColumn});
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "품명";
+            this.arDatagridView1.ContextMenuStrip = this.cm;
-            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.arDatagridView1.DataSource = this.bs;
-            this.fpSpread1_Sheet1.Columns.Get(1).Width = 146F;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "model";
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "모델명";
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.fpSpread1_Sheet1.Columns.Get(2).Width = 77F;
+            dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3);
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid";
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID";
+            this.arDatagridView1.DefaultCellStyle = dataGridViewCellStyle1;
-            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.fpSpread1_Sheet1.Columns.Get(3).Width = 77F;
+            this.arDatagridView1.Location = new System.Drawing.Point(0, 37);
-            numberCellType1.DecimalPlaces = 0;
+            this.arDatagridView1.Name = "arDatagridView1";
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            this.arDatagridView1.ReadOnly = true;
-            numberCellType1.MaximumValue = 2147483647D;
+            this.arDatagridView1.RowTemplate.Height = 23;
-            numberCellType1.MinimumValue = -2147483648D;
+            this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType1;
+            this.arDatagridView1.Size = new System.Drawing.Size(979, 517);
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "Qty";
+            this.arDatagridView1.TabIndex = 4;
-            this.fpSpread1_Sheet1.Columns.Get(4).ForeColor = System.Drawing.Color.Blue;
+            // 
-            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            // placeDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "수량";
+            // 
-            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.placeDataGridViewTextBoxColumn.DataPropertyName = "place";
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F;
+            this.placeDataGridViewTextBoxColumn.HeaderText = "보관소";
-            numberCellType2.DecimalPlaces = 0;
+            this.placeDataGridViewTextBoxColumn.Name = "placeDataGridViewTextBoxColumn";
-            numberCellType2.MaximumValue = 999999999999999D;
+            this.placeDataGridViewTextBoxColumn.ReadOnly = true;
-            numberCellType2.MinimumValue = -999999999999999D;
+            // 
-            numberCellType2.NegativeRed = true;
+            // boxDataGridViewTextBoxColumn
-            numberCellType2.NullDisplay = "--";
+            // 
-            numberCellType2.Separator = ",";
+            this.boxDataGridViewTextBoxColumn.DataPropertyName = "box";
-            numberCellType2.ShowSeparator = true;
+            this.boxDataGridViewTextBoxColumn.HeaderText = "분류";
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType2;
+            this.boxDataGridViewTextBoxColumn.Name = "boxDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "Amt";
+            this.boxDataGridViewTextBoxColumn.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(5).ForeColor = System.Drawing.Color.Blue;
+            // 
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            // lastDateDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "금액";
+            // 
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.lastDateDataGridViewTextBoxColumn.DataPropertyName = "lastDate";
-            this.fpSpread1_Sheet1.Columns.Get(5).Width = 75F;
+            this.lastDateDataGridViewTextBoxColumn.HeaderText = "최종등록";
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.lastDateDataGridViewTextBoxColumn.Name = "lastDateDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "place";
+            this.lastDateDataGridViewTextBoxColumn.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            // 
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "보관소";
+            // nameDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            // 
-            numberCellType3.DecimalPlaces = 0;
+            this.nameDataGridViewTextBoxColumn.DataPropertyName = "name";
-            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            this.nameDataGridViewTextBoxColumn.HeaderText = "품명";
-            numberCellType3.MaximumValue = 2147483647D;
+            this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
-            numberCellType3.MinimumValue = -2147483648D;
+            this.nameDataGridViewTextBoxColumn.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3;
+            // 
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "idx";
+            // modelDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(7).Visible = false;
+            // 
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
+            this.modelDataGridViewTextBoxColumn.DataPropertyName = "model";
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "item";
+            this.modelDataGridViewTextBoxColumn.HeaderText = "모델";
-            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
+            this.modelDataGridViewTextBoxColumn.Name = "modelDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+            this.modelDataGridViewTextBoxColumn.ReadOnly = true;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
+            // 
-            this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.ReadOnly;
+            // sidDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.PrintInfo.AbortMessage = "취소";
+            // 
-            this.fpSpread1_Sheet1.PrintInfo.BestFitCols = true;
+            this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid";
-            this.fpSpread1_Sheet1.PrintInfo.BestFitRows = true;
+            this.sidDataGridViewTextBoxColumn.HeaderText = "SID";
-            this.fpSpread1_Sheet1.PrintInfo.Centering = FarPoint.Win.Spread.Centering.Horizontal;
+            this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.PrintInfo.EnhancePreview = true;
+            this.sidDataGridViewTextBoxColumn.ReadOnly = true;
-            this.fpSpread1_Sheet1.PrintInfo.JobName = "재고현황";
+            // 
-            this.fpSpread1_Sheet1.PrintInfo.Margin.Bottom = 3;
+            // qtyDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.PrintInfo.Margin.Footer = 3;
+            // 
-            this.fpSpread1_Sheet1.PrintInfo.Margin.Header = 3;
+            this.qtyDataGridViewTextBoxColumn.DataPropertyName = "Qty";
-            this.fpSpread1_Sheet1.PrintInfo.Margin.Left = 3;
+            this.qtyDataGridViewTextBoxColumn.HeaderText = "수량";
-            this.fpSpread1_Sheet1.PrintInfo.Margin.Right = 3;
+            this.qtyDataGridViewTextBoxColumn.Name = "qtyDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.PrintInfo.Margin.Top = 3;
+            this.qtyDataGridViewTextBoxColumn.ReadOnly = true;
-            noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148);
+            // 
-            noPrinterPrintInfo1.HardMarginX = 0F;
+            // amtDataGridViewTextBoxColumn
-            noPrinterPrintInfo1.HardMarginY = 0F;
+            // 
-            noPrinterPrintInfo1.SupportColor = true;
+            this.amtDataGridViewTextBoxColumn.DataPropertyName = "Amt";
-            this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1;
+            this.amtDataGridViewTextBoxColumn.HeaderText = "금액";
-            this.fpSpread1_Sheet1.PrintInfo.Orientation = FarPoint.Win.Spread.PrintOrientation.Portrait;
+            this.amtDataGridViewTextBoxColumn.Name = "amtDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.PrintInfo.PdfFileName = "재고현황";
+            this.amtDataGridViewTextBoxColumn.ReadOnly = true;
-            this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null;
+            // 
-            this.fpSpread1_Sheet1.PrintInfo.Preview = true;
+            // placeboxDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.PrintInfo.UseSmartPrint = true;
+            // 
-            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.placeboxDataGridViewTextBoxColumn.DataPropertyName = "placebox";
-            this.fpSpread1_Sheet1.TitleInfo.Text = "재고현황";
+            this.placeboxDataGridViewTextBoxColumn.HeaderText = "placebox";
-            this.fpSpread1_Sheet1.TitleInfo.Value = "재고현황";
+            this.placeboxDataGridViewTextBoxColumn.Name = "placeboxDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+            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;
     }
 }

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,
+                //fpSpread1.SaveExcel(sd.FileName,
-                    FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
+                //    FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
-                    | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
+                //    | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
-                    | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+                //    | FarPoint.Excel.ExcelSaveFlags.NoFormulas
-                    | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
+                //    | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
-                FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName);
+                //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);
+        }
     }
 }

SubProject/FCM0000/Inventory/fInventoryJagoList.resx

@@ -124,7 +124,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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==
 </value>
   </data>
-  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>486, 17</value>
-  </metadata>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>189, 17</value>
   </metadata>

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;
     }
 }

SubProject/FCM0000/Inventory/finventoryAdd.cs

@@ -50,11 +50,16 @@ namespace FCM0000
             }
 
             //보관소 목록업데이트
-            var PlaceList = FCOMMON.DBM.GetItemStorageList();
+            var ListStorage = FCOMMON.DBM.getCodeList("60");
-            cmbPlace.Items.Clear();
+            cmbStorage.Items.Clear();
-            foreach (var item in PlaceList)
+            foreach (var item in ListStorage)
-                cmbPlace.Items.Add(item);
+                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";

SubProject/FCM0000/Inventory/finventoryAdd.resx

@@ -1,168 +1,183 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
-  <!-- 
+  <!-- 
-    Microsoft ResX Schema 
+    Microsoft ResX Schema 
-    
+    
-    Version 2.0
+    Version 2.0
-    
+    
-    The primary goals of this format is to allow a simple XML format 
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+    various data types are done through the TypeConverter classes 
-    associated with the data types.
+    associated with the data types.
-    
+    
-    Example:
+    Example:
-    
+    
-    ... ado.net/XML headers & schema ...
+    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
+    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
+    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
+        <comment>This is a comment</comment>
-    </data>
+    </data>
-                
+                
-    There are any number of "resheader" rows that contain simple 
+    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
+    name/value pairs.
-    
+    
-    Each data row contains a name, and value. The row also contains a 
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+    Classes that don't support this are serialized and stored with the 
-    mimetype set.
+    mimetype set.
-    
+    
-    The mimetype is used for serialized objects, and tells the 
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
+    extensible. For a given mimetype the value must be set accordingly:
-    
+    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
+    read any of the formats listed below.
-    
+    
-    mimetype: application/x-microsoft.net.object.binary.base64
+    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-    
+    
-    mimetype: application/x-microsoft.net.object.soap.base64
+    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-
+
-    mimetype: application/x-microsoft.net.object.bytearray.base64
+    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
+            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-    -->
+    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
+    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
+      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
+        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
+          <xsd:element name="metadata">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="assembly">
+          <xsd:element name="assembly">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="data">
+          <xsd:element name="data">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="resheader">
+          <xsd:element name="resheader">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-        </xsd:choice>
+        </xsd:choice>
-      </xsd:complexType>
+      </xsd:complexType>
-    </xsd:element>
+    </xsd:element>
-  </xsd:schema>
+  </xsd:schema>
-  <resheader name="resmimetype">
+  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
+    <value>text/microsoft-resx</value>
-  </resheader>
+  </resheader>
-  <resheader name="version">
+  <resheader name="version">
-    <value>2.0</value>
+    <value>2.0</value>
-  </resheader>
+  </resheader>
-  <resheader name="reader">
+  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+  </resheader>
-  <resheader name="writer">
+  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+  </resheader>
-  <metadata name="sidLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="sidLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="pumscaleLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="pumscaleLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="pumqtyLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="pumqtyLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="pumpriceLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="pumpriceLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="pumamtLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="pumamtLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="deptLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="deptLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>131, 17</value>
+    <value>131, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>490, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>490, 17</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
-  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>313, 17</value>
+    <value>490, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>58</value>
+    <value>False</value>
-  </metadata>
+  </metadata>
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>131, 17</value>
+  </metadata>
+  <metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>313, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>58</value>
+  </metadata>
 </root>

SubProject/FCOMMON/DataBaseManager.cs

@@ -40,7 +40,7 @@ namespace FCOMMON
             cn.Open();
 
             List<string> retval = new List<string>();
-            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}'" +
+                " where gcode = '{0}' and isnull(place,'') <> ''" +
-                " order by place";
+                " group by place order by place";
             sql = string.Format(sql, gcode);
             var cmd = new SqlCommand(sql, cn);
             var rdr = cmd.ExecuteReader();