diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 2c4e31b..222bfa9 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -4314,6 +4314,10 @@ namespace AppData { private global::System.Data.DataColumn columnOrdStatus; + private global::System.Data.DataColumn columnStatusDesc; + + private global::System.Data.DataColumn columnNumItems; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public OfflineOrderListDataTable() { @@ -4371,6 +4375,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn StatusDescColumn { + get { + return this.columnStatusDesc; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumItemsColumn { + get { + return this.columnNumItems; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4408,12 +4428,14 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OfflineOrderListRow AddOfflineOrderListRow(System.DateTime CreationDate, int OrdStatus) { + public OfflineOrderListRow AddOfflineOrderListRow(System.DateTime CreationDate, int OrdStatus, string StatusDesc, int NumItems) { OfflineOrderListRow rowOfflineOrderListRow = ((OfflineOrderListRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, CreationDate, - OrdStatus}; + OrdStatus, + StatusDesc, + NumItems}; rowOfflineOrderListRow.ItemArray = columnValuesArray; this.Rows.Add(rowOfflineOrderListRow); return rowOfflineOrderListRow; @@ -4446,6 +4468,8 @@ namespace AppData { this.columnOrdID = base.Columns["OrdID"]; this.columnCreationDate = base.Columns["CreationDate"]; this.columnOrdStatus = base.Columns["OrdStatus"]; + this.columnStatusDesc = base.Columns["StatusDesc"]; + this.columnNumItems = base.Columns["NumItems"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4457,6 +4481,10 @@ namespace AppData { base.Columns.Add(this.columnCreationDate); this.columnOrdStatus = new global::System.Data.DataColumn("OrdStatus", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOrdStatus); + this.columnStatusDesc = new global::System.Data.DataColumn("StatusDesc", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnStatusDesc); + this.columnNumItems = new global::System.Data.DataColumn("NumItems", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumItems); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnOrdID}, true)); this.columnOrdID.AutoIncrement = true; @@ -4467,6 +4495,8 @@ namespace AppData { this.columnOrdID.Unique = true; this.columnCreationDate.AllowDBNull = false; this.columnOrdStatus.AllowDBNull = false; + this.columnStatusDesc.ReadOnly = true; + this.columnStatusDesc.MaxLength = 9; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6668,6 +6698,62 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string StatusDesc { + get { + try { + return ((string)(this[this.tableOfflineOrderList.StatusDescColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'StatusDesc\' nella tabella \'OfflineOrderList\' è DBNull.", e); + } + } + set { + this[this.tableOfflineOrderList.StatusDescColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumItems { + get { + try { + return ((int)(this[this.tableOfflineOrderList.NumItemsColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'NumItems\' nella tabella \'OfflineOrderList\' è DBNull.", e); + } + } + set { + this[this.tableOfflineOrderList.NumItemsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsStatusDescNull() { + return this.IsNull(this.tableOfflineOrderList.StatusDescColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetStatusDescNull() { + this[this.tableOfflineOrderList.StatusDescColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsNumItemsNull() { + return this.IsNull(this.tableOfflineOrderList.NumItemsColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetNumItemsNull() { + this[this.tableOfflineOrderList.NumItemsColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public OffOrd2ItemRow[] GetOffOrd2ItemRows() { @@ -11317,6 +11403,8 @@ SELECT CartID, CreationCarts, CartNum, CartDtmx FROM Carts WHERE (CartID = @Cart tableMapping.ColumnMappings.Add("OrdID", "OrdID"); tableMapping.ColumnMappings.Add("CreationDate", "CreationDate"); tableMapping.ColumnMappings.Add("OrdStatus", "OrdStatus"); + tableMapping.ColumnMappings.Add("StatusDesc", "StatusDesc"); + tableMapping.ColumnMappings.Add("NumItems", "NumItems"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -11328,23 +11416,24 @@ SELECT CartID, CreationCarts, CartNum, CartDtmx FROM Carts WHERE (CartID = @Cart this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdStatus", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdStatus", 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 [dbo].[OfflineOrderList] ([CreationDate], [OrdStatus]) VALUES (@Creat" + - "ionDate, @OrdStatus);\r\nSELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderLi" + - "st WHERE (OrdID = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[OfflineOrderList] ([OrdID], [CreationDate], [OrdStatus]) VALUE" + + "S (@OrdID, @CreationDate, @OrdStatus)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CreationDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CreationDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdStatus", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdStatus", 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 [dbo].[OfflineOrderList] SET [CreationDate] = @CreationDate, [OrdStatus] = @OrdStatus WHERE (([OrdID] = @Original_OrdID) AND ([CreationDate] = @Original_CreationDate) AND ([OrdStatus] = @Original_OrdStatus)); -SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = @OrdID)"; + this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[OfflineOrderList] SET [OrdID] = @OrdID, [CreationDate] = @CreationD" + + "ate, [OrdStatus] = @OrdStatus WHERE (([OrdID] = @Original_OrdID) AND ([CreationD" + + "ate] = @Original_CreationDate) AND ([OrdStatus] = @Original_OrdStatus))"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CreationDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CreationDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdStatus", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdStatus", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CreationDate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CreationDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdStatus", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdStatus", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "OrdID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11357,16 +11446,23 @@ SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = @OrdI [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT OrdID, CreationDate, OrdStatus FROM dbo.OfflineOrderList"; + this._commandCollection[0].CommandText = "SELECT OrdID, CreationDate, OrdStatus, StatusDesc, NumItems\r\nFROM " + + " v_OOL"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_OffOrd_insert"; + this._commandCollection[1].CommandText = "dbo.stp_OOL_search"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MaxOrdStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_OOL_insert"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11397,8 +11493,25 @@ SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = @OrdI [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_App.OfflineOrderListDataTable insertNew() { + public virtual DS_App.OfflineOrderListDataTable getBySearch(global::System.Nullable MaxOrdStatus) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((MaxOrdStatus.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(MaxOrdStatus.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_App.OfflineOrderListDataTable dataTable = new DS_App.OfflineOrderListDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_App.OfflineOrderListDataTable insertNew() { + this.Adapter.SelectCommand = this.CommandCollection[2]; DS_App.OfflineOrderListDataTable dataTable = new DS_App.OfflineOrderListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -11461,9 +11574,10 @@ SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = @OrdI [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(System.DateTime CreationDate, int OrdStatus) { - this.Adapter.InsertCommand.Parameters[0].Value = ((System.DateTime)(CreationDate)); - this.Adapter.InsertCommand.Parameters[1].Value = ((int)(OrdStatus)); + public virtual int Insert(int OrdID, System.DateTime CreationDate, int OrdStatus) { + this.Adapter.InsertCommand.Parameters[0].Value = ((int)(OrdID)); + this.Adapter.InsertCommand.Parameters[1].Value = ((System.DateTime)(CreationDate)); + this.Adapter.InsertCommand.Parameters[2].Value = ((int)(OrdStatus)); 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)) { @@ -11484,13 +11598,13 @@ SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = @OrdI [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(System.DateTime CreationDate, int OrdStatus, int Original_OrdID, System.DateTime Original_CreationDate, int Original_OrdStatus, int OrdID) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((System.DateTime)(CreationDate)); - this.Adapter.UpdateCommand.Parameters[1].Value = ((int)(OrdStatus)); - this.Adapter.UpdateCommand.Parameters[2].Value = ((int)(Original_OrdID)); - this.Adapter.UpdateCommand.Parameters[3].Value = ((System.DateTime)(Original_CreationDate)); - this.Adapter.UpdateCommand.Parameters[4].Value = ((int)(Original_OrdStatus)); - this.Adapter.UpdateCommand.Parameters[5].Value = ((int)(OrdID)); + public virtual int Update(int OrdID, System.DateTime CreationDate, int OrdStatus, int Original_OrdID, System.DateTime Original_CreationDate, int Original_OrdStatus) { + this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(OrdID)); + this.Adapter.UpdateCommand.Parameters[1].Value = ((System.DateTime)(CreationDate)); + this.Adapter.UpdateCommand.Parameters[2].Value = ((int)(OrdStatus)); + this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Original_OrdID)); + this.Adapter.UpdateCommand.Parameters[4].Value = ((System.DateTime)(Original_CreationDate)); + this.Adapter.UpdateCommand.Parameters[5].Value = ((int)(Original_OrdStatus)); 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)) { @@ -11512,7 +11626,7 @@ SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = @OrdI [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] public virtual int Update(System.DateTime CreationDate, int OrdStatus, int Original_OrdID, System.DateTime Original_CreationDate, int Original_OrdStatus) { - return this.Update(CreationDate, OrdStatus, Original_OrdID, Original_CreationDate, Original_OrdStatus, Original_OrdID); + return this.Update(Original_OrdID, CreationDate, OrdStatus, Original_OrdID, Original_CreationDate, Original_OrdStatus); } } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 7776bab..a50ad8a 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -909,7 +909,7 @@ SELECT CartID, CreationCarts, CartNum, CartDtmx FROM Carts WHERE (CartID = @Cart - + DELETE FROM [dbo].[OfflineOrderList] WHERE (([OrdID] = @Original_OrdID) AND ([CreationDate] = @Original_CreationDate) AND ([OrdStatus] = @Original_OrdStatus)) @@ -922,9 +922,9 @@ SELECT CartID, CreationCarts, CartNum, CartDtmx FROM Carts WHERE (CartID = @Cart - INSERT INTO [dbo].[OfflineOrderList] ([CreationDate], [OrdStatus]) VALUES (@CreationDate, @OrdStatus); -SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = SCOPE_IDENTITY()) + INSERT INTO [dbo].[OfflineOrderList] ([OrdID], [CreationDate], [OrdStatus]) VALUES (@OrdID, @CreationDate, @OrdStatus) + @@ -932,21 +932,21 @@ SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = SCOPE - SELECT OrdID, CreationDate, OrdStatus FROM dbo.OfflineOrderList + SELECT OrdID, CreationDate, OrdStatus, StatusDesc, NumItems +FROM v_OOL - UPDATE [dbo].[OfflineOrderList] SET [CreationDate] = @CreationDate, [OrdStatus] = @OrdStatus WHERE (([OrdID] = @Original_OrdID) AND ([CreationDate] = @Original_CreationDate) AND ([OrdStatus] = @Original_OrdStatus)); -SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = @OrdID) + UPDATE [dbo].[OfflineOrderList] SET [OrdID] = @OrdID, [CreationDate] = @CreationDate, [OrdStatus] = @OrdStatus WHERE (([OrdID] = @Original_OrdID) AND ([CreationDate] = @Original_CreationDate) AND ([OrdStatus] = @Original_OrdStatus)) + - @@ -956,12 +956,25 @@ SELECT OrdID, CreationDate, OrdStatus FROM OfflineOrderList WHERE (OrdID = @OrdI + + - + - dbo.stp_OffOrd_insert + dbo.stp_OOL_search + + + + + + + + + + + dbo.stp_OOL_insert @@ -1360,6 +1373,14 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord + + + + + + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 27ff11c..c393fef 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -15,8 +15,8 @@ - - + + @@ -55,15 +55,15 @@ - + - 976 - 1121 + 967 + 1088 1089 - 1121 + 1088 diff --git a/NKC_WF/MachineOffline.aspx.cs b/NKC_WF/MachineOffline.aspx.cs index 8b24882..39b7faf 100644 --- a/NKC_WF/MachineOffline.aspx.cs +++ b/NKC_WF/MachineOffline.aspx.cs @@ -11,7 +11,12 @@ namespace NKC_WF { protected void Page_Load(object sender, EventArgs e) { + cmp_scrapList.eh_doRefresh += Cmp_scrapList_eh_doRefresh; + } + private void Cmp_scrapList_eh_doRefresh(object sender, EventArgs e) + { + cmp_offlineOrders.doUpdate(); } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx index ede2460..eedda0a 100644 --- a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx +++ b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx @@ -1,9 +1,40 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_offlineOrders.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_offlineOrders" %> +<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagPrefix="uc1" TagName="mod_righePag" %> +

Offline Orders

-
Content
- -
\ No newline at end of file +
+ + + + No Data Available + + + + + + + + + + + + + <%----%> + + + + + + + + + +
+ + diff --git a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs index ef901b5..14ec9ad 100644 --- a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; using System.Web.UI; -using System.Web.UI.WebControls; namespace NKC_WF.WebUserControls { @@ -11,7 +7,25 @@ namespace NKC_WF.WebUserControls { protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + mod_righePag.numRowPag = 10; + } + mod_righePag.eh_newNum += Mod_righePag_eh_newNum; + } + private void Mod_righePag_eh_newNum(object sender, EventArgs e) + { + grView.PageSize = mod_righePag.numRowPag; + } + public void doUpdate() + { + grView.DataBind(); + } + + protected void lbtReset_Click(object sender, EventArgs e) + { + grView.SelectedIndex = -1; } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.designer.cs index 72f3191..4f60d97 100644 --- a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.designer.cs @@ -11,5 +11,32 @@ namespace NKC_WF.WebUserControls { public partial class cmp_offlineOrders { + + /// + /// Controllo grView. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// Controllo mod_righePag. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.mod_righePag mod_righePag; } } diff --git a/NKC_WF/WebUserControls/cmp_scrapList.ascx b/NKC_WF/WebUserControls/cmp_scrapList.ascx index bcffa37..e4dfff5 100644 --- a/NKC_WF/WebUserControls/cmp_scrapList.ascx +++ b/NKC_WF/WebUserControls/cmp_scrapList.ascx @@ -7,7 +7,7 @@

Scrap List (Items to process)

- + <%-- @@ -22,7 +22,7 @@ - + @@ -53,7 +53,7 @@ <%----%> <%----%> - Create Order + Create Order