diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 80ad5b0..35bf8b1 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -918,7 +918,6 @@ namespace AppData { case "AssemblyCell": case "PaintFlag": - case "RoundEdge": // se contiene YES aggiungo... if (currOpt.Value.ToLower() == "yes") { diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 3ad13a0..1f704aa 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -4231,6 +4231,12 @@ namespace AppData { private global::System.Data.DataColumn columnCreationDate; + private global::System.Data.DataColumn columnBatchID; + + 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 BinsDataTable() { @@ -4304,6 +4310,30 @@ 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 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)] @@ -4341,14 +4371,17 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public BinsRow AddBinsRow(int BinIndex, string BinDtmx, string BinDtmxProc, System.DateTime CreationDate) { + public BinsRow AddBinsRow(int BinIndex, string BinDtmx, string BinDtmxProc, System.DateTime CreationDate, int BatchID, int TotItem, int TotItemLoad) { BinsRow rowBinsRow = ((BinsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, BinIndex, BinDtmx, BinDtmxProc, - CreationDate}; + CreationDate, + BatchID, + TotItem, + TotItemLoad}; rowBinsRow.ItemArray = columnValuesArray; this.Rows.Add(rowBinsRow); return rowBinsRow; @@ -4383,6 +4416,9 @@ namespace AppData { this.columnBinDtmx = base.Columns["BinDtmx"]; this.columnBinDtmxProc = base.Columns["BinDtmxProc"]; this.columnCreationDate = base.Columns["CreationDate"]; + this.columnBatchID = base.Columns["BatchID"]; + this.columnTotItem = base.Columns["TotItem"]; + this.columnTotItemLoad = base.Columns["TotItemLoad"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4398,6 +4434,12 @@ namespace AppData { base.Columns.Add(this.columnBinDtmxProc); this.columnCreationDate = new global::System.Data.DataColumn("CreationDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCreationDate); + this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchID); + 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.columnBinID}, true)); this.columnBinID.AutoIncrement = true; @@ -4411,6 +4453,9 @@ namespace AppData { this.columnBinDtmx.MaxLength = 10; this.columnBinDtmxProc.ReadOnly = true; this.columnBinDtmxProc.MaxLength = 10; + this.columnBatchID.ReadOnly = true; + this.columnTotItem.ReadOnly = true; + this.columnTotItemLoad.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10463,6 +10508,54 @@ 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.tableBins.BatchIDColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'BatchID\' nella tabella \'Bins\' è DBNull.", e); + } + } + set { + this[this.tableBins.BatchIDColumn] = value; + } + } + + [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.tableBins.TotItemColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'TotItem\' nella tabella \'Bins\' è DBNull.", e); + } + } + set { + this[this.tableBins.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.tableBins.TotItemLoadColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'TotItemLoad\' nella tabella \'Bins\' è DBNull.", e); + } + } + set { + this[this.tableBins.TotItemLoadColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsBinDtmxNull() { @@ -10499,6 +10592,42 @@ namespace AppData { this[this.tableBins.CreationDateColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsBatchIDNull() { + return this.IsNull(this.tableBins.BatchIDColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetBatchIDNull() { + this[this.tableBins.BatchIDColumn] = 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.tableBins.TotItemColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetTotItemNull() { + this[this.tableBins.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.tableBins.TotItemLoadColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetTotItemLoadNull() { + this[this.tableBins.TotItemLoadColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public BinListRow[] GetBinListRows() { @@ -16585,43 +16714,10 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat tableMapping.ColumnMappings.Add("BinDtmx", "BinDtmx"); tableMapping.ColumnMappings.Add("BinDtmxProc", "BinDtmxProc"); tableMapping.ColumnMappings.Add("CreationDate", "CreationDate"); + tableMapping.ColumnMappings.Add("BatchID", "BatchID"); + 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 [Bins] WHERE (([BinID] = @Original_BinID) AND ([BinIndex] = @Original_BinIndex) AND ((@IsNull_BinDtmx = 1 AND [BinDtmx] IS NULL) OR ([BinDtmx] = @Original_BinDtmx)) AND ((@IsNull_BinDtmxProc = 1 AND [BinDtmxProc] IS NULL) OR ([BinDtmxProc] = @Original_BinDtmxProc)) AND ((@IsNull_CreationDate = 1 AND [CreationDate] IS NULL) OR ([CreationDate] = @Original_CreationDate)))"; - this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BinID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BinIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinIndex", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_BinDtmx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinDtmx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BinDtmx", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinDtmx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_BinDtmxProc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinDtmxProc", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BinDtmxProc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinDtmxProc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CreationDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CreationDate", global::System.Data.DataRowVersion.Original, true, 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 [Bins] ([BinIndex], [CreationDate]) VALUES (@BinIndex, @CreationDate)" + - ";\r\nSELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (B" + - "inID = SCOPE_IDENTITY())"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BinIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinIndex", 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 [Bins] SET [BinIndex] = @BinIndex, [CreationDate] = @CreationDate WHERE (([BinID] = @Original_BinID) AND ([BinIndex] = @Original_BinIndex) AND ((@IsNull_BinDtmx = 1 AND [BinDtmx] IS NULL) OR ([BinDtmx] = @Original_BinDtmx)) AND ((@IsNull_BinDtmxProc = 1 AND [BinDtmxProc] IS NULL) OR ([BinDtmxProc] = @Original_BinDtmxProc)) AND ((@IsNull_CreationDate = 1 AND [CreationDate] IS NULL) OR ([CreationDate] = @Original_CreationDate))); -SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinID = @BinID)"; - this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BinIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinIndex", 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_BinID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BinIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinIndex", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_BinDtmx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinDtmx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BinDtmx", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinDtmx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_BinDtmxProc", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinDtmxProc", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BinDtmxProc", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BinDtmxProc", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CreationDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CreationDate", global::System.Data.DataRowVersion.Original, true, 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("@BinID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "BinID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16634,29 +16730,35 @@ SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinI [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 Bins"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_binDetail"; 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_BIN_getByItemID"; + this._commandCollection[1].CommandText = "dbo.stp_BIN_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_BIN_getByKey"; + this._commandCollection[2].CommandText = "dbo.stp_BIN_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("@BinID", 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_BIN_insert"; + this._commandCollection[3].CommandText = "dbo.stp_BIN_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("@BinIndex", 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("@BinID", 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_BIN_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("@BinIndex", 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()] @@ -16687,8 +16789,25 @@ SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinI [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.BinsDataTable getByItemID(global::System.Nullable ItemID) { + public virtual DS_App.BinsDataTable 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.BinsDataTable dataTable = new DS_App.BinsDataTable(); + 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.BinsDataTable getByItemID(global::System.Nullable ItemID) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((ItemID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(ItemID.Value)); } @@ -16705,7 +16824,7 @@ SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinI [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.BinsDataTable getByKey(global::System.Nullable BinID) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((BinID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BinID.Value)); } @@ -16722,7 +16841,7 @@ SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinI [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.BinsDataTable insertAndReturn(global::System.Nullable BinIndex) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((BinIndex.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BinIndex.Value)); } @@ -16733,173 +16852,6 @@ SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinI 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.BinsDataTable 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, "Bins"); - } - - [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_BinID, int Original_BinIndex, string Original_BinDtmx, string Original_BinDtmxProc, global::System.Nullable Original_CreationDate) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_BinID)); - this.Adapter.DeleteCommand.Parameters[1].Value = ((int)(Original_BinIndex)); - if ((Original_BinDtmx == 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_BinDtmx)); - } - if ((Original_BinDtmxProc == null)) { - this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_BinDtmxProc)); - } - if ((Original_CreationDate.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[7].Value = ((System.DateTime)(Original_CreationDate.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[7].Value = global::System.DBNull.Value; - } - global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; - if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - 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 BinIndex, global::System.Nullable CreationDate) { - this.Adapter.InsertCommand.Parameters[0].Value = ((int)(BinIndex)); - if ((CreationDate.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[1].Value = ((System.DateTime)(CreationDate.Value)); - } - else { - this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; - } - global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; - if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - 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 BinIndex, global::System.Nullable CreationDate, int Original_BinID, int Original_BinIndex, string Original_BinDtmx, string Original_BinDtmxProc, global::System.Nullable Original_CreationDate, int BinID) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(BinIndex)); - if ((CreationDate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[1].Value = ((System.DateTime)(CreationDate.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; - } - this.Adapter.UpdateCommand.Parameters[2].Value = ((int)(Original_BinID)); - this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Original_BinIndex)); - if ((Original_BinDtmx == 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_BinDtmx)); - } - if ((Original_BinDtmxProc == null)) { - this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_BinDtmxProc)); - } - if ((Original_CreationDate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[9].Value = ((System.DateTime)(Original_CreationDate.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; - } - this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(BinID)); - 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 BinIndex, global::System.Nullable CreationDate, int Original_BinID, int Original_BinIndex, string Original_BinDtmx, string Original_BinDtmxProc, global::System.Nullable Original_CreationDate) { - return this.Update(BinIndex, CreationDate, Original_BinID, Original_BinIndex, Original_BinDtmx, Original_BinDtmxProc, Original_CreationDate, Original_BinID); - } } /// @@ -20863,8 +20815,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt private MaterialsTableAdapter _materialsTableAdapter; - private BinsTableAdapter _binsTableAdapter; - private OffOrd2ItemTableAdapter _offOrd2ItemTableAdapter; private KitListTableAdapter _kitListTableAdapter; @@ -20954,20 +20904,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 BinsTableAdapter BinsTableAdapter { - get { - return this._binsTableAdapter; - } - set { - this._binsTableAdapter = 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" + @@ -21129,10 +21065,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt && (this._materialsTableAdapter.Connection != null))) { return this._materialsTableAdapter.Connection; } - if (((this._binsTableAdapter != null) - && (this._binsTableAdapter.Connection != null))) { - return this._binsTableAdapter.Connection; - } if (((this._offOrd2ItemTableAdapter != null) && (this._offOrd2ItemTableAdapter.Connection != null))) { return this._offOrd2ItemTableAdapter.Connection; @@ -21194,9 +21126,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt if ((this._materialsTableAdapter != null)) { count = (count + 1); } - if ((this._binsTableAdapter != null)) { - count = (count + 1); - } if ((this._offOrd2ItemTableAdapter != null)) { count = (count + 1); } @@ -21271,15 +21200,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt allChangedRows.AddRange(updatedRows); } } - if ((this._binsTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Bins.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._binsTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._finalKitTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.FinalKit.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -21403,14 +21323,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt allAddedRows.AddRange(addedRows); } } - if ((this._binsTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Bins.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._binsTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._finalKitTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.FinalKit.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -21565,14 +21477,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt allChangedRows.AddRange(deletedRows); } } - if ((this._binsTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Bins.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._binsTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._itemListTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -21664,11 +21568,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._binsTableAdapter != null) - && (this.MatchTableAdapterConnection(this._binsTableAdapter.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" + @@ -21783,15 +21682,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt adaptersWithAcceptChangesDuringUpdate.Add(this._materialsTableAdapter.Adapter); } } - if ((this._binsTableAdapter != null)) { - revertConnections.Add(this._binsTableAdapter, this._binsTableAdapter.Connection); - this._binsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._binsTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._binsTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._binsTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._binsTableAdapter.Adapter); - } - } if ((this._offOrd2ItemTableAdapter != null)) { revertConnections.Add(this._offOrd2ItemTableAdapter, this._offOrd2ItemTableAdapter.Connection); this._offOrd2ItemTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); @@ -21947,10 +21837,6 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt this._materialsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._materialsTableAdapter])); this._materialsTableAdapter.Transaction = null; } - if ((this._binsTableAdapter != null)) { - this._binsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._binsTableAdapter])); - this._binsTableAdapter.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 084da89..561e1b2 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -987,58 +987,14 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat - - - - DELETE FROM [Bins] WHERE (([BinID] = @Original_BinID) AND ([BinIndex] = @Original_BinIndex) AND ((@IsNull_BinDtmx = 1 AND [BinDtmx] IS NULL) OR ([BinDtmx] = @Original_BinDtmx)) AND ((@IsNull_BinDtmxProc = 1 AND [BinDtmxProc] IS NULL) OR ([BinDtmxProc] = @Original_BinDtmxProc)) AND ((@IsNull_CreationDate = 1 AND [CreationDate] IS NULL) OR ([CreationDate] = @Original_CreationDate))) - - - - - - - - - - - - - - - INSERT INTO [Bins] ([BinIndex], [CreationDate]) VALUES (@BinIndex, @CreationDate); -SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinID = SCOPE_IDENTITY()) - - - - - - + SELECT * -FROM Bins +FROM v_binDetail - - - UPDATE [Bins] SET [BinIndex] = @BinIndex, [CreationDate] = @CreationDate WHERE (([BinID] = @Original_BinID) AND ([BinIndex] = @Original_BinIndex) AND ((@IsNull_BinDtmx = 1 AND [BinDtmx] IS NULL) OR ([BinDtmx] = @Original_BinDtmx)) AND ((@IsNull_BinDtmxProc = 1 AND [BinDtmxProc] IS NULL) OR ([BinDtmxProc] = @Original_BinDtmxProc)) AND ((@IsNull_CreationDate = 1 AND [CreationDate] IS NULL) OR ([CreationDate] = @Original_CreationDate))); -SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinID = @BinID) - - - - - - - - - - - - - - - @@ -1047,8 +1003,22 @@ SELECT BinID, BinIndex, BinDtmx, BinDtmxProc, CreationDate FROM Bins WHERE (BinI + + + + + + + dbo.stp_BIN_getByBatch + + + + + + + @@ -2324,6 +2294,9 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index ebf93c0..5d7953c 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. --> - + @@ -13,8 +13,8 @@ - - + + diff --git a/Jenkinsfile b/Jenkinsfile index eafc8a2..2eca4fb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=200']) { + withEnv(['NEXT_BUILD_NUMBER=203']) { // 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_bins.ascx b/NKC_WF/WebUserControls/cmp_MU_bins.ascx index 4c5c821..9c83e3b 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx @@ -5,7 +5,7 @@
- + @@ -14,112 +14,29 @@ No Record - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CodD/T%
BIN0000850/50100%
BIN0000950/50100%
BIN0001050/50100%
BIN0001150/50100%
BIN0001212/5024%
BIN0001310/5020%
BIN000141/502%
BIN000150/500%
BIN000160/500%
BIN000170/500%
BIN000180/500%
BIN000190/500%
BIN000200/500%
BIN000210/500%
diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs index 347ca0c..3bf967d 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs @@ -53,12 +53,10 @@ namespace NKC_WF.WebUserControls /// /// determina CSS x colore testo da perc svuotamento... /// - /// - /// + /// /// - public string getCssCart(object _dividendo, object _divisore) + public string getCssByRatio(double ratio) { - double ratio = getRatio(_dividendo, _divisore); string answ = "text-dark"; if (ratio == 0) { diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx b/NKC_WF/WebUserControls/cmp_MU_carts.ascx index b43a043..a5f05c2 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx @@ -16,17 +16,17 @@ - + - + - + - + diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs index 3ae371e..bb1bd87 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs @@ -53,12 +53,10 @@ namespace NKC_WF.WebUserControls /// /// determina CSS x colore testo da perc svuotamento... /// - /// - /// + /// /// - public string getCssCart(object _dividendo, object _divisore) + public string getCssByRatio(double ratio) { - double ratio = getRatio(_dividendo, _divisore); string answ = "text-dark"; if (ratio == 0) { diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index be55c32..29e1013 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -28,11 +28,13 @@ namespace NKC_WF.WebUserControls var nestAnsw = ComLib.man.getNestAnsw(value); StringBuilder sb = new StringBuilder(); sb.AppendLine("DEBUG INFO:"); + // elenchi x ricerca duplicati + List partListEstim = new List(); + List partListEstimDupl = new List(); + List partListNest = new List(); + List partListNestDupl = new List(); if (estimAnsw != null) { - // elenchi x ricerca duplicati - List partListEstim = new List(); - List partListEstimDupl = new List(); try { foreach (var part in estimAnsw.PartList) @@ -69,9 +71,6 @@ namespace NKC_WF.WebUserControls } if (nestAnsw != null) { - // elenchi x ricerca duplicati - List partListNest = new List(); - List partListNestDupl = new List(); try { foreach (var bunk in nestAnsw.BunkList) @@ -117,6 +116,34 @@ namespace NKC_WF.WebUserControls } sb.AppendLine("---------------------"); } + // s enon corrispondono + if (partListEstim.Count != partListNest.Count) + { + sb.AppendLine("---------------------"); + if (partListEstim.Count > partListNest.Count) + { + sb.AppendLine($"EST OK | NEST missing:"); + foreach (var partId in partListEstim) + { + if (!partListNest.Contains(partId)) + { + sb.AppendLine($"{partId}"); + } + } + } + else + { + sb.AppendLine($"EST missing | NEST OK:"); + foreach (var partId in partListNest) + { + if (!partListEstim.Contains(partId)) + { + sb.AppendLine($"{partId}"); + } + } + } + sb.AppendLine("---------------------"); + } } catch { }