diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index c6239cf..3ad13a0 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -4546,12 +4546,18 @@ namespace AppData { private global::System.Data.DataColumn columnCartID; + private global::System.Data.DataColumn columnBatchID; + private global::System.Data.DataColumn columnCartIndex; private global::System.Data.DataColumn columnCartDtmx; private global::System.Data.DataColumn columnCreationDate; + private global::System.Data.DataColumn columnTotItem; + + private global::System.Data.DataColumn columnTotItemLoad; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public CartsDataTable() { @@ -4593,6 +4599,14 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn BatchIDColumn { + get { + return this.columnBatchID; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn CartIndexColumn { @@ -4617,6 +4631,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 TotItemColumn { + get { + return this.columnTotItem; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TotItemLoadColumn { + get { + return this.columnTotItemLoad; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4654,13 +4684,16 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public CartsRow AddCartsRow(int CartIndex, string CartDtmx, System.DateTime CreationDate) { + public CartsRow AddCartsRow(int BatchID, int CartIndex, string CartDtmx, System.DateTime CreationDate, int TotItem, int TotItemLoad) { CartsRow rowCartsRow = ((CartsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, + BatchID, CartIndex, CartDtmx, - CreationDate}; + CreationDate, + TotItem, + TotItemLoad}; rowCartsRow.ItemArray = columnValuesArray; this.Rows.Add(rowCartsRow); return rowCartsRow; @@ -4691,9 +4724,12 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal void InitVars() { this.columnCartID = base.Columns["CartID"]; + this.columnBatchID = base.Columns["BatchID"]; this.columnCartIndex = base.Columns["CartIndex"]; this.columnCartDtmx = base.Columns["CartDtmx"]; this.columnCreationDate = base.Columns["CreationDate"]; + this.columnTotItem = base.Columns["TotItem"]; + this.columnTotItemLoad = base.Columns["TotItemLoad"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4701,12 +4737,18 @@ namespace AppData { private void InitClass() { this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartID); + this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchID); this.columnCartIndex = new global::System.Data.DataColumn("CartIndex", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartIndex); this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartDtmx); this.columnCreationDate = new global::System.Data.DataColumn("CreationDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCreationDate); + this.columnTotItem = new global::System.Data.DataColumn("TotItem", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotItem); + this.columnTotItemLoad = new global::System.Data.DataColumn("TotItemLoad", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotItemLoad); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCartID}, true)); this.columnCartID.AutoIncrement = true; @@ -10494,6 +10536,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int BatchID { + get { + try { + return ((int)(this[this.tableCarts.BatchIDColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'BatchID\' nella tabella \'Carts\' è DBNull.", e); + } + } + set { + this[this.tableCarts.BatchIDColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int CartIndex { @@ -10532,6 +10590,50 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int TotItem { + get { + try { + return ((int)(this[this.tableCarts.TotItemColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'TotItem\' nella tabella \'Carts\' è DBNull.", e); + } + } + set { + this[this.tableCarts.TotItemColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int TotItemLoad { + get { + try { + return ((int)(this[this.tableCarts.TotItemLoadColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'TotItemLoad\' nella tabella \'Carts\' è DBNull.", e); + } + } + set { + this[this.tableCarts.TotItemLoadColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsBatchIDNull() { + return this.IsNull(this.tableCarts.BatchIDColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetBatchIDNull() { + this[this.tableCarts.BatchIDColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsCartDtmxNull() { @@ -10544,6 +10646,30 @@ namespace AppData { this[this.tableCarts.CartDtmxColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsTotItemNull() { + return this.IsNull(this.tableCarts.TotItemColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetTotItemNull() { + this[this.tableCarts.TotItemColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsTotItemLoadNull() { + return this.IsNull(this.tableCarts.TotItemLoadColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetTotItemLoadNull() { + this[this.tableCarts.TotItemLoadColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public KitListRow[] GetKitListRows() { @@ -16898,42 +17024,13 @@ SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinI tableMapping.SourceTable = "Table"; tableMapping.DataSetTable = "Carts"; tableMapping.ColumnMappings.Add("CartID", "CartID"); + tableMapping.ColumnMappings.Add("BatchID", "BatchID"); tableMapping.ColumnMappings.Add("CartIndex", "CartIndex"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); tableMapping.ColumnMappings.Add("CreationDate", "CreationDate"); + tableMapping.ColumnMappings.Add("TotItem", "TotItem"); + tableMapping.ColumnMappings.Add("TotItemLoad", "TotItemLoad"); 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 [Carts] WHERE (([CartID] = @Original_CartID) AND ([CartIndex] = @Orig" + - "inal_CartIndex) AND ((@IsNull_CartDtmx = 1 AND [CartDtmx] IS NULL) OR ([CartDtmx" + - "] = @Original_CartDtmx)) AND ([CreationDate] = @Original_CreationDate))"; - this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CartID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CartIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartIndex", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CartDtmx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartDtmx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CartDtmx", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartDtmx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.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.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [Carts] ([CartIndex], [CreationDate]) VALUES (@CartIndex, @CreationDa" + - "te);\r\nSELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID " + - "= SCOPE_IDENTITY())"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartIndex", 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.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [Carts] SET [CartIndex] = @CartIndex, [CreationDate] = @CreationDate WHERE (([CartID] = @Original_CartID) AND ([CartIndex] = @Original_CartIndex) AND ((@IsNull_CartDtmx = 1 AND [CartDtmx] IS NULL) OR ([CartDtmx] = @Original_CartDtmx)) AND ([CreationDate] = @Original_CreationDate)); -SELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID = @CartID)"; - this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartIndex", 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("@Original_CartID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CartIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartIndex", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CartDtmx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartDtmx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CartDtmx", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CartDtmx", 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("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "CartID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16946,29 +17043,35 @@ SELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID = @Car [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[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\nFROM Carts"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_CartDetail"; 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_CART_getByItemID"; + this._commandCollection[1].CommandText = "dbo.stp_CART_getByBatch"; 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("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", 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_CART_getByKey"; + this._commandCollection[2].CommandText = "dbo.stp_CART_getByItemID"; 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, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_CART_insert"; + this._commandCollection[3].CommandText = "dbo.stp_CART_getByKey"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_CART_insert"; + this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16999,8 +17102,25 @@ SELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID = @Car [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.CartsDataTable getByItemID(global::System.Nullable ItemID) { + public virtual DS_App.CartsDataTable getByBatch(global::System.Nullable BatchID) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((BatchID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_App.CartsDataTable dataTable = new DS_App.CartsDataTable(); + 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.CartsDataTable getByItemID(global::System.Nullable ItemID) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((ItemID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(ItemID.Value)); } @@ -17017,7 +17137,7 @@ SELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID = @Car [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.CartsDataTable getByKey(global::System.Nullable CartID) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((CartID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartID.Value)); } @@ -17034,7 +17154,7 @@ SELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID = @Car [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.CartsDataTable insertAndReturn(global::System.Nullable CartIndex) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((CartIndex.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartIndex.Value)); } @@ -17045,133 +17165,6 @@ SELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID = @Car 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")] - public virtual int Update(DS_App.CartsDataTable dataTable) { - return this.Adapter.Update(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")] - public virtual int Update(DS_App dataSet) { - return this.Adapter.Update(dataSet, "Carts"); - } - - [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")] - public virtual int Update(global::System.Data.DataRow dataRow) { - return this.Adapter.Update(new global::System.Data.DataRow[] { - dataRow}); - } - - [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")] - public virtual int Update(global::System.Data.DataRow[] dataRows) { - return this.Adapter.Update(dataRows); - } - - [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.Delete, true)] - public virtual int Delete(int Original_CartID, int Original_CartIndex, string Original_CartDtmx, System.DateTime Original_CreationDate) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_CartID)); - this.Adapter.DeleteCommand.Parameters[1].Value = ((int)(Original_CartIndex)); - if ((Original_CartDtmx == null)) { - this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_CartDtmx)); - } - this.Adapter.DeleteCommand.Parameters[4].Value = ((System.DateTime)(Original_CreationDate)); - 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)) { - this.Adapter.DeleteCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.DeleteCommand.Connection.Close(); - } - } - } - - [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.Insert, true)] - public virtual int Insert(int CartIndex, System.DateTime CreationDate) { - this.Adapter.InsertCommand.Parameters[0].Value = ((int)(CartIndex)); - this.Adapter.InsertCommand.Parameters[1].Value = ((System.DateTime)(CreationDate)); - 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)) { - this.Adapter.InsertCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } - } - } - - [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.Update, true)] - public virtual int Update(int CartIndex, System.DateTime CreationDate, int Original_CartID, int Original_CartIndex, string Original_CartDtmx, System.DateTime Original_CreationDate, int CartID) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(CartIndex)); - this.Adapter.UpdateCommand.Parameters[1].Value = ((System.DateTime)(CreationDate)); - this.Adapter.UpdateCommand.Parameters[2].Value = ((int)(Original_CartID)); - this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Original_CartIndex)); - if ((Original_CartDtmx == null)) { - this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_CartDtmx)); - } - this.Adapter.UpdateCommand.Parameters[6].Value = ((System.DateTime)(Original_CreationDate)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(CartID)); - 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)) { - this.Adapter.UpdateCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); - } - } - } - - [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.Update, true)] - public virtual int Update(int CartIndex, System.DateTime CreationDate, int Original_CartID, int Original_CartIndex, string Original_CartDtmx, System.DateTime Original_CreationDate) { - return this.Update(CartIndex, CreationDate, Original_CartID, Original_CartIndex, Original_CartDtmx, Original_CreationDate, Original_CartID); - } } /// @@ -20872,8 +20865,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt private BinsTableAdapter _binsTableAdapter; - private CartsTableAdapter _cartsTableAdapter; - private OffOrd2ItemTableAdapter _offOrd2ItemTableAdapter; private KitListTableAdapter _kitListTableAdapter; @@ -20977,20 +20968,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + - "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + - "a", "System.Drawing.Design.UITypeEditor")] - public CartsTableAdapter CartsTableAdapter { - get { - return this._cartsTableAdapter; - } - set { - this._cartsTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + @@ -21156,10 +21133,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt && (this._binsTableAdapter.Connection != null))) { return this._binsTableAdapter.Connection; } - if (((this._cartsTableAdapter != null) - && (this._cartsTableAdapter.Connection != null))) { - return this._cartsTableAdapter.Connection; - } if (((this._offOrd2ItemTableAdapter != null) && (this._offOrd2ItemTableAdapter.Connection != null))) { return this._offOrd2ItemTableAdapter.Connection; @@ -21224,9 +21197,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt if ((this._binsTableAdapter != null)) { count = (count + 1); } - if ((this._cartsTableAdapter != null)) { - count = (count + 1); - } if ((this._offOrd2ItemTableAdapter != null)) { count = (count + 1); } @@ -21274,15 +21244,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt allChangedRows.AddRange(updatedRows); } } - if ((this._cartsTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Carts.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._cartsTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._materialsTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.Materials.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -21418,14 +21379,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt allAddedRows.AddRange(addedRows); } } - if ((this._cartsTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Carts.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._cartsTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._materialsTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.Materials.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -21644,14 +21597,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt allChangedRows.AddRange(deletedRows); } } - if ((this._cartsTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Carts.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._cartsTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._orderListTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.OrderList.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -21724,11 +21669,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + "a stessa stringa di connessione."); } - if (((this._cartsTableAdapter != null) - && (this.MatchTableAdapterConnection(this._cartsTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); - } if (((this._offOrd2ItemTableAdapter != null) && (this.MatchTableAdapterConnection(this._offOrd2ItemTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + @@ -21852,15 +21792,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt adaptersWithAcceptChangesDuringUpdate.Add(this._binsTableAdapter.Adapter); } } - if ((this._cartsTableAdapter != null)) { - revertConnections.Add(this._cartsTableAdapter, this._cartsTableAdapter.Connection); - this._cartsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._cartsTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._cartsTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._cartsTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._cartsTableAdapter.Adapter); - } - } if ((this._offOrd2ItemTableAdapter != null)) { revertConnections.Add(this._offOrd2ItemTableAdapter, this._offOrd2ItemTableAdapter.Connection); this._offOrd2ItemTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); @@ -22020,10 +21951,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt this._binsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._binsTableAdapter])); this._binsTableAdapter.Transaction = null; } - if ((this._cartsTableAdapter != null)) { - this._cartsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._cartsTableAdapter])); - this._cartsTableAdapter.Transaction = null; - } if ((this._offOrd2ItemTableAdapter != null)) { this._offOrd2ItemTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._offOrd2ItemTableAdapter])); this._offOrd2ItemTableAdapter.Transaction = null; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 86dae85..084da89 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -336,7 +336,7 @@ FROM v_SheetList - + dbo.stp_Sheets_AdvanceInStack @@ -410,7 +410,7 @@ FROM v_SheetList - + dbo.stp_Sheets_resetPrepared @@ -421,7 +421,7 @@ FROM v_SheetList - + dbo.stp_Sheets_setPrepared @@ -432,7 +432,7 @@ FROM v_SheetList - + dbo.stp_Sheets_updDate @@ -1086,61 +1086,37 @@ SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinI - - - - DELETE FROM [Carts] WHERE (([CartID] = @Original_CartID) AND ([CartIndex] = @Original_CartIndex) AND ((@IsNull_CartDtmx = 1 AND [CartDtmx] IS NULL) OR ([CartDtmx] = @Original_CartDtmx)) AND ([CreationDate] = @Original_CreationDate)) - - - - - - - - - - - - INSERT INTO [Carts] ([CartIndex], [CreationDate]) VALUES (@CartIndex, @CreationDate); -SELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID = SCOPE_IDENTITY()) - - - - - - + SELECT * -FROM Carts +FROM v_CartDetail - - - UPDATE [Carts] SET [CartIndex] = @CartIndex, [CreationDate] = @CreationDate WHERE (([CartID] = @Original_CartID) AND ([CartIndex] = @Original_CartIndex) AND ((@IsNull_CartDtmx = 1 AND [CartDtmx] IS NULL) OR ([CartDtmx] = @Original_CartDtmx)) AND ([CreationDate] = @Original_CreationDate)); -SELECT CartID, CartIndex, CartDtmx, CreationDate FROM Carts WHERE (CartID = @CartID) - - - - - - - - - - - - + + + + + + + dbo.stp_CART_getByBatch + + + + + + + @@ -2020,7 +1996,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2068,7 +2044,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2090,7 +2066,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2145,7 +2121,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2218,7 +2194,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2226,7 +2202,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2295,7 +2271,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2328,7 +2304,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2351,10 +2327,11 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + + @@ -2364,10 +2341,12 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt + + - + @@ -2391,7 +2370,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2399,7 +2378,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2416,7 +2395,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2425,7 +2404,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2456,7 +2435,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2464,7 +2443,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2480,7 +2459,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2488,7 +2467,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2516,7 +2495,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2552,7 +2531,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2568,7 +2547,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2666,18 +2645,18 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 70e51e0..ebf93c0 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -6,27 +6,27 @@ --> - - - + + + - + - + - - + + - - - - - - + + + + + + @@ -92,11 +92,11 @@ - 694 - 369 + 699 + 340 - 694 + 699 313 @@ -113,7 +113,7 @@ - + 1129 @@ -149,7 +149,7 @@ - + 131 @@ -161,7 +161,7 @@ - + 352 diff --git a/Jenkinsfile b/Jenkinsfile index 7233ce2..3cc3eff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=197']) { + withEnv(['NEXT_BUILD_NUMBER=198']) { // env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx b/NKC_WF/WebUserControls/cmp_MU_carts.ascx index c5a955d..664866b 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx @@ -5,6 +5,9 @@
+ + + diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs index 904580f..b5795db 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs @@ -13,5 +13,23 @@ namespace NKC_WF.WebUserControls public partial class cmp_MU_carts { + + /// + /// 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; } }