diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 1067eb7..5306f2d 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -4307,6 +4307,14 @@ namespace AppData { private global::System.Data.DataColumn columnTotItemLoad; + private global::System.Data.DataColumn columnPaintDate; + + private global::System.Data.DataColumn columnFillup; + + private global::System.Data.DataColumn columnComplete; + + private global::System.Data.DataColumn columnPainted; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public BinsDataTable() { @@ -4404,6 +4412,38 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn PaintDateColumn { + get { + return this.columnPaintDate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn FillupColumn { + get { + return this.columnFillup; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn CompleteColumn { + get { + return this.columnComplete; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn PaintedColumn { + get { + return this.columnPainted; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4441,7 +4481,7 @@ 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, int BatchID, int TotItem, int TotItemLoad) { + public BinsRow AddBinsRow(int BinIndex, string BinDtmx, string BinDtmxProc, System.DateTime CreationDate, int BatchID, int TotItem, int TotItemLoad, System.DateTime PaintDate, int Fillup, int Complete, int Painted) { BinsRow rowBinsRow = ((BinsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -4451,7 +4491,11 @@ namespace AppData { CreationDate, BatchID, TotItem, - TotItemLoad}; + TotItemLoad, + PaintDate, + Fillup, + Complete, + Painted}; rowBinsRow.ItemArray = columnValuesArray; this.Rows.Add(rowBinsRow); return rowBinsRow; @@ -4489,6 +4533,10 @@ namespace AppData { this.columnBatchID = base.Columns["BatchID"]; this.columnTotItem = base.Columns["TotItem"]; this.columnTotItemLoad = base.Columns["TotItemLoad"]; + this.columnPaintDate = base.Columns["PaintDate"]; + this.columnFillup = base.Columns["Fillup"]; + this.columnComplete = base.Columns["Complete"]; + this.columnPainted = base.Columns["Painted"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4510,6 +4558,14 @@ namespace AppData { 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.columnPaintDate = new global::System.Data.DataColumn("PaintDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnPaintDate); + this.columnFillup = new global::System.Data.DataColumn("Fillup", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnFillup); + this.columnComplete = new global::System.Data.DataColumn("Complete", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnComplete); + this.columnPainted = new global::System.Data.DataColumn("Painted", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnPainted); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnBinID}, true)); this.columnBinID.AutoIncrement = true; @@ -4523,9 +4579,15 @@ namespace AppData { this.columnBinDtmx.MaxLength = 10; this.columnBinDtmxProc.ReadOnly = true; this.columnBinDtmxProc.MaxLength = 10; + this.columnBatchID.AllowDBNull = false; this.columnBatchID.ReadOnly = true; + this.columnTotItem.AllowDBNull = false; this.columnTotItem.ReadOnly = true; + this.columnTotItemLoad.AllowDBNull = false; this.columnTotItemLoad.ReadOnly = true; + this.columnFillup.ReadOnly = true; + this.columnComplete.ReadOnly = true; + this.columnPainted.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11243,12 +11305,7 @@ namespace AppData { [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); - } + return ((int)(this[this.tableBins.BatchIDColumn])); } set { this[this.tableBins.BatchIDColumn] = value; @@ -11259,12 +11316,7 @@ namespace AppData { [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); - } + return ((int)(this[this.tableBins.TotItemColumn])); } set { this[this.tableBins.TotItemColumn] = value; @@ -11275,18 +11327,77 @@ namespace AppData { [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); - } + return ((int)(this[this.tableBins.TotItemLoadColumn])); } set { this[this.tableBins.TotItemLoadColumn] = value; } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public System.DateTime PaintDate { + get { + try { + return ((global::System.DateTime)(this[this.tableBins.PaintDateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'PaintDate\' nella tabella \'Bins\' è DBNull.", e); + } + } + set { + this[this.tableBins.PaintDateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int Fillup { + get { + try { + return ((int)(this[this.tableBins.FillupColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'Fillup\' nella tabella \'Bins\' è DBNull.", e); + } + } + set { + this[this.tableBins.FillupColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int Complete { + get { + try { + return ((int)(this[this.tableBins.CompleteColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'Complete\' nella tabella \'Bins\' è DBNull.", e); + } + } + set { + this[this.tableBins.CompleteColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int Painted { + get { + try { + return ((int)(this[this.tableBins.PaintedColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'Painted\' nella tabella \'Bins\' è DBNull.", e); + } + } + set { + this[this.tableBins.PaintedColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsBinDtmxNull() { @@ -11325,38 +11436,50 @@ namespace AppData { [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); + public bool IsPaintDateNull() { + return this.IsNull(this.tableBins.PaintDateColumn); } [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; + public void SetPaintDateNull() { + this[this.tableBins.PaintDateColumn] = 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); + public bool IsFillupNull() { + return this.IsNull(this.tableBins.FillupColumn); } [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; + public void SetFillupNull() { + this[this.tableBins.FillupColumn] = 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); + public bool IsCompleteNull() { + return this.IsNull(this.tableBins.CompleteColumn); } [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; + public void SetCompleteNull() { + this[this.tableBins.CompleteColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsPaintedNull() { + return this.IsNull(this.tableBins.PaintedColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetPaintedNull() { + this[this.tableBins.PaintedColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17882,6 +18005,10 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat tableMapping.ColumnMappings.Add("BatchID", "BatchID"); tableMapping.ColumnMappings.Add("TotItem", "TotItem"); tableMapping.ColumnMappings.Add("TotItemLoad", "TotItemLoad"); + tableMapping.ColumnMappings.Add("PaintDate", "PaintDate"); + tableMapping.ColumnMappings.Add("Fillup", "Fillup"); + tableMapping.ColumnMappings.Add("Complete", "Complete"); + tableMapping.ColumnMappings.Add("Painted", "Painted"); this._adapter.TableMappings.Add(tableMapping); } @@ -17895,10 +18022,10 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat [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[5]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_binDetail"; + 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; @@ -17920,10 +18047,26 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat 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].CommandText = "dbo.stp_BIN_getByStatus"; 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, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fillup", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Complete", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Painted", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[5].Connection = this.Connection; + this._commandCollection[5].CommandText = "dbo.stp_BIN_insert"; + this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[5].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[5].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[6] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[6].Connection = this.Connection; + this._commandCollection[6].CommandText = "dbo.stp_BIN_update"; + this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BinID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FillDate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PrintDate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18005,8 +18148,37 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat [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 insertAndReturn(global::System.Nullable BinIndex) { + public virtual DS_App.BinsDataTable getByStatus(global::System.Nullable Fillup, global::System.Nullable Complete, global::System.Nullable Painted) { this.Adapter.SelectCommand = this.CommandCollection[4]; + if ((Fillup.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((bool)(Fillup.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((Complete.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(Complete.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((Painted.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((bool)(Painted.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].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 insertAndReturn(global::System.Nullable BinIndex) { + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((BinIndex.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BinIndex.Value)); } @@ -18017,6 +18189,35 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat 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 updateQuery(global::System.Nullable Original_BinID, global::System.Nullable FillDate, global::System.Nullable PrintDate) { + this.Adapter.SelectCommand = this.CommandCollection[6]; + if ((Original_BinID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Original_BinID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((FillDate.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(FillDate.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((PrintDate.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(PrintDate.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + DS_App.BinsDataTable dataTable = new DS_App.BinsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } } /// diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 1ab9e4c..91d6e0b 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -1041,11 +1041,11 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat - + SELECT * -FROM v_binDetail +FROM v_BinDetail @@ -1060,6 +1060,10 @@ FROM v_binDetail + + + + @@ -1095,6 +1099,19 @@ FROM v_binDetail + + + + dbo.stp_BIN_getByStatus + + + + + + + + + @@ -1106,6 +1123,19 @@ FROM v_binDetail + + + + dbo.stp_BIN_update + + + + + + + + + @@ -2144,7 +2174,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2192,7 +2222,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2214,7 +2244,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2269,7 +2299,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2342,7 +2372,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2350,7 +2380,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2419,7 +2449,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2452,7 +2482,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2472,13 +2502,17 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - - - + + + + + + + - + @@ -2497,7 +2531,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2521,7 +2555,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2529,7 +2563,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2546,7 +2580,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2555,7 +2589,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2586,7 +2620,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2594,7 +2628,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2610,7 +2644,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2618,7 +2652,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2646,7 +2680,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2682,7 +2716,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2698,7 +2732,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2708,7 +2742,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2725,7 +2759,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2830,18 +2864,18 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 3788078..4bc35f2 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,31 +4,31 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - + + + + - + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -58,16 +58,16 @@ - 1140 - 913 + 1054 + 907 - 1140 + 1054 794 - + 788 @@ -79,7 +79,7 @@ - + 986 @@ -91,7 +91,7 @@ - + 699 @@ -103,7 +103,7 @@ - + 550 @@ -115,7 +115,7 @@ - + 1129 @@ -127,19 +127,19 @@ - + - 1359 - 551 + 1380 + 529 - 1359 + 1380 457 - + 1161 @@ -151,7 +151,7 @@ - + 131 @@ -163,7 +163,7 @@ - + 352 diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 588d482..4efc123 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -401,6 +401,7 @@ + @@ -955,6 +956,13 @@ cmp_painting.ascx + + cmp_paint_bins.ascx + ASPXCodeBehind + + + cmp_paint_bins.ascx + cmp_scrapList.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_paint_bins.ascx b/NKC_WF/WebUserControls/cmp_paint_bins.ascx new file mode 100644 index 0000000..d2ee434 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_paint_bins.ascx @@ -0,0 +1,55 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_paint_bins.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_paint_bins" %> + + + + +
+
+
+
+
+ + + + + + + No Record + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs new file mode 100644 index 0000000..8b5f225 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs @@ -0,0 +1,181 @@ +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 +{ + public partial class cmp_paint_bins : System.Web.UI.UserControl + { + /// + /// Testo titolo... + /// + public string titleText + { + set + { + lblTitle.Text = value; + } + get + { + return lblTitle.Text; + } + } + /// + /// Classe css titolo... + /// + public string titleClass + { + set + { + lblTitle.CssClass = value; + } + get + { + return lblTitle.CssClass; + } + } + /// + /// Batch corrente... + /// + public int BatchId + { + set + { + hfBatchID.Value = value.ToString(); + doUpdate(); + } + get + { + int answ = 0; + int.TryParse(hfBatchID.Value, out answ); + return answ; + } + } + /// + /// Indica se mostrare o meno QRCode + /// + public bool ShowQr + { + set + { + hfShowQr.Value = value.ToString(); + } + get + { + bool answ = false; + bool.TryParse(hfShowQr.Value, out answ); + return answ; + } + } + /// + /// Indica se mostrare o meno COMPLETED + /// + public bool ShowComplete + { + set + { + hfShowComplete.Value = value.ToString(); + } + get + { + bool answ = false; + bool.TryParse(hfShowComplete.Value, out answ); + return answ; + } + } + /// + /// Indica se mostrare o meno PAINTED + /// + public bool ShowPainted + { + set + { + hfShowPainted.Value = value.ToString(); + } + get + { + bool answ = false; + bool.TryParse(hfShowPainted.Value, out answ); + return answ; + } + } + /// + /// restituisce URL immagine QRCode + /// + /// + /// + public string getImgUrl(object currId) + { + string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val="; + string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}"; + string answ = $"{baseUrl}{payload}"; + return answ; + } + protected void Page_Load(object sender, EventArgs e) + { + + } + public void doUpdate() + { + grView.DataBind(); + } + /// + /// Calcola il rapporto tra 2 valori + /// + /// + /// + /// + public double getRatio(object _dividendo, object _divisore) + { + double ratio = 0; + double dividendo = 0; + double divisore = 1; + double.TryParse(_dividendo.ToString(), out dividendo); + double.TryParse(_divisore.ToString(), out divisore); + ratio = dividendo / divisore; + return ratio; + } + /// + /// determina CSS x colore testo da perc svuotamento... + /// + /// + /// + public string getCssByRatio(double ratio) + { + string answ = "text-dark"; + if (ratio == 0) + { + answ = "text-danger"; + } + else if (ratio == 1) + { + answ = "text-success"; + } + else + { + answ = "text-warning"; + } + return answ; + } + /// + /// Dimensione QRCode + /// + public int qrSize + { + get + { + int answ = 32; + int.TryParse(hfQrSize.Value, out answ); + return answ; + } + set + { + hfQrSize.Value = value.ToString(); + doUpdate(); + } + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_paint_bins.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_paint_bins.ascx.designer.cs new file mode 100644 index 0000000..68f003a --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_paint_bins.ascx.designer.cs @@ -0,0 +1,107 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_paint_bins + { + + /// + /// Controllo hfTitleClass. + /// + /// + /// 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.HiddenField hfTitleClass; + + /// + /// Controllo lblTitle. + /// + /// + /// 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.Label lblTitle; + + /// + /// 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 hfBatchID. + /// + /// + /// 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.HiddenField hfBatchID; + + /// + /// Controllo hfShowQr. + /// + /// + /// 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.HiddenField hfShowQr; + + /// + /// Controllo hfQrSize. + /// + /// + /// 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.HiddenField hfQrSize; + + /// + /// Controllo hwShowFillup. + /// + /// + /// 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.HiddenField hwShowFillup; + + /// + /// Controllo hfShowComplete. + /// + /// + /// 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.HiddenField hfShowComplete; + + /// + /// Controllo hfShowPainted. + /// + /// + /// 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.HiddenField hfShowPainted; + } +} diff --git a/NKC_WF/WebUserControls/cmp_painting.ascx b/NKC_WF/WebUserControls/cmp_painting.ascx index 26ed51c..a8d2f89 100644 --- a/NKC_WF/WebUserControls/cmp_painting.ascx +++ b/NKC_WF/WebUserControls/cmp_painting.ascx @@ -1,3 +1,18 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_painting.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_painting" %> +<%@ Register Src="~/WebUserControls/cmp_paint_bins.ascx" TagPrefix="uc1" TagName="cmp_paint_bins" %> +<%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %> -gestione painting \ No newline at end of file + + +
+
+ +
+
+ READER
+ +
+
+ +
+
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_painting.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_painting.ascx.designer.cs index be638f6..87b430a 100644 --- a/NKC_WF/WebUserControls/cmp_painting.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_painting.ascx.designer.cs @@ -13,5 +13,32 @@ namespace NKC_WF.WebUserControls public partial class cmp_painting { + + /// + /// Controllo cmp_paint_binsIN. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_paint_bins cmp_paint_binsIN; + + /// + /// Controllo cmp_barcode. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_barcode cmp_barcode; + + /// + /// Controllo cmp_paint_binsOUT. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_paint_bins cmp_paint_binsOUT; } } diff --git a/NKC_WF/site/Painting.aspx b/NKC_WF/site/Painting.aspx index 07d782c..5cad826 100644 --- a/NKC_WF/site/Painting.aspx +++ b/NKC_WF/site/Painting.aspx @@ -4,5 +4,14 @@ - +
+

<%: traduci("Painting") %>

+
+
+
+ +
+
+
+
diff --git a/NKC_WF/site/Painting.aspx.cs b/NKC_WF/site/Painting.aspx.cs index 0494f0a..9a5a1b5 100644 --- a/NKC_WF/site/Painting.aspx.cs +++ b/NKC_WF/site/Painting.aspx.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; namespace NKC_WF { - public partial class Painting : System.Web.UI.Page + public partial class Painting : BasePage { protected void Page_Load(object sender, EventArgs e) {