From 16e8f12cb958094923dad4f67507a7fb7eaf0398 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 25 Aug 2020 14:48:39 +0200 Subject: [PATCH] Fixed missing in action da UNLOAD --- AppData/DS_App.Designer.cs | 31 ++++- AppData/DS_App.xsd | 107 +++++++++-------- AppData/DS_App.xss | 97 +++++++-------- NKC_WF/WebUserControls/cmp_partMIA.ascx | 112 ++++++++++++++++-- NKC_WF/WebUserControls/cmp_partMIA.ascx.cs | 36 ++++++ .../cmp_partMIA.ascx.designer.cs | 18 +++ NKC_WF/site/MachineUnload.aspx.cs | 5 +- NKC_WF/site/PartMIA.aspx | 2 +- 8 files changed, 295 insertions(+), 113 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 26776ab..cc4887e 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -35119,7 +35119,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_ISD_searchDtmx"; @@ -35128,10 +35128,16 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemDtmx", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_ISD_getMissingByPLID"; + this._commandCollection[1].CommandText = "dbo.stp_ISD_getMissingByBatch"; 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("@PackListID", 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_ISD_getMissingByPLID"; + 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("@PackListID", 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()] @@ -35174,8 +35180,25 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [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.ItemSearchDetailDataTable getMissingByPLID(global::System.Nullable PackListID) { + public virtual DS_App.ItemSearchDetailDataTable getMissingByBatch(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.ItemSearchDetailDataTable dataTable = new DS_App.ItemSearchDetailDataTable(); + 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.ItemSearchDetailDataTable getMissingByPLID(global::System.Nullable PackListID) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((PackListID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(PackListID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index c3f4bdc..8a49789 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -2596,6 +2596,17 @@ FROM v_PackList + + + + dbo.stp_ISD_getMissingByBatch + + + + + + + @@ -3097,7 +3108,7 @@ FROM v_Pack2Cart - + @@ -3147,7 +3158,7 @@ FROM v_Pack2Cart - + @@ -3172,7 +3183,7 @@ FROM v_Pack2Cart - + @@ -3227,7 +3238,7 @@ FROM v_Pack2Cart - + @@ -3300,7 +3311,7 @@ FROM v_Pack2Cart - + @@ -3308,7 +3319,7 @@ FROM v_Pack2Cart - + @@ -3377,7 +3388,7 @@ FROM v_Pack2Cart - + @@ -3410,7 +3421,7 @@ FROM v_Pack2Cart - + @@ -3451,7 +3462,7 @@ FROM v_Pack2Cart - + @@ -3470,7 +3481,7 @@ FROM v_Pack2Cart - + @@ -3501,7 +3512,7 @@ FROM v_Pack2Cart - + @@ -3509,7 +3520,7 @@ FROM v_Pack2Cart - + @@ -3526,7 +3537,7 @@ FROM v_Pack2Cart - + @@ -3535,7 +3546,7 @@ FROM v_Pack2Cart - + @@ -3566,7 +3577,7 @@ FROM v_Pack2Cart - + @@ -3574,7 +3585,7 @@ FROM v_Pack2Cart - + @@ -3590,7 +3601,7 @@ FROM v_Pack2Cart - + @@ -3598,7 +3609,7 @@ FROM v_Pack2Cart - + @@ -3626,7 +3637,7 @@ FROM v_Pack2Cart - + @@ -3662,7 +3673,7 @@ FROM v_Pack2Cart - + @@ -3678,7 +3689,7 @@ FROM v_Pack2Cart - + @@ -3688,7 +3699,7 @@ FROM v_Pack2Cart - + @@ -3705,7 +3716,7 @@ FROM v_Pack2Cart - + @@ -3718,7 +3729,7 @@ FROM v_Pack2Cart - + @@ -3767,7 +3778,7 @@ FROM v_Pack2Cart - + @@ -3796,7 +3807,7 @@ FROM v_Pack2Cart - + @@ -3838,7 +3849,7 @@ FROM v_Pack2Cart - + @@ -3948,7 +3959,7 @@ FROM v_Pack2Cart - + @@ -4011,7 +4022,7 @@ FROM v_Pack2Cart - + @@ -4056,7 +4067,7 @@ FROM v_Pack2Cart - + @@ -4082,7 +4093,7 @@ FROM v_Pack2Cart - + @@ -4175,7 +4186,7 @@ FROM v_Pack2Cart - + @@ -4238,7 +4249,7 @@ FROM v_Pack2Cart - + @@ -4297,7 +4308,7 @@ FROM v_Pack2Cart - + @@ -4346,7 +4357,7 @@ FROM v_Pack2Cart - + @@ -4378,7 +4389,7 @@ FROM v_Pack2Cart - + @@ -4570,18 +4581,18 @@ FROM v_Pack2Cart - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index a2ffa5d..fa6bf35 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,46 +4,47 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 352 @@ -55,7 +56,7 @@ - + 1197 @@ -67,7 +68,7 @@ - + 1044 @@ -79,7 +80,7 @@ - + 806 @@ -91,7 +92,7 @@ - + 986 @@ -103,7 +104,7 @@ - + 707 @@ -115,7 +116,7 @@ - + 550 @@ -127,7 +128,7 @@ - + 1129 @@ -139,7 +140,7 @@ - + 1380 @@ -151,7 +152,7 @@ - + 1161 @@ -163,7 +164,7 @@ - + 131 @@ -175,7 +176,7 @@ - + 352 diff --git a/NKC_WF/WebUserControls/cmp_partMIA.ascx b/NKC_WF/WebUserControls/cmp_partMIA.ascx index 55f3414..a7a03e6 100644 --- a/NKC_WF/WebUserControls/cmp_partMIA.ascx +++ b/NKC_WF/WebUserControls/cmp_partMIA.ascx @@ -3,23 +3,113 @@ + + + +
+ +
+ +
+
+ + + + + +
+ +
+
+
+ + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ + + + + +
+
+ +
+ +
+
+
+ + + + + +
+
+ +
+
+
+
+ + + + + +
+
+ +
+ +
+
+
+ + + + + +
+ +
+ +
+ +
+
+
+ + + + + +
<%: traduci("NoRecord") %> - - - - - - - - - -
- + + + diff --git a/NKC_WF/WebUserControls/cmp_partMIA.ascx.cs b/NKC_WF/WebUserControls/cmp_partMIA.ascx.cs index 03b30f7..0e07633 100644 --- a/NKC_WF/WebUserControls/cmp_partMIA.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_partMIA.ascx.cs @@ -76,5 +76,41 @@ namespace NKC_WF.WebUserControls grView.PageSize = value; } } + public bool showFull + { + get + { + bool answ = false; + bool.TryParse(hfShowFull.Value, out answ); + return answ; + } + set + { + hfShowFull.Value = value.ToString(); + grView.DataBind(); + } + } + public bool enableScrap + { + get + { + bool answ = false; + bool.TryParse(hfEnableScrap.Value, out answ); + return answ; + } + set + { + hfEnableScrap.Value = value.ToString(); + grView.DataBind(); + } + } + public bool checkVisible(object _statusID) + { + bool answ = false; + int StatusID = 0; + int.TryParse(_statusID.ToString(), out StatusID); + answ = StatusID < 900; + return answ; + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_partMIA.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_partMIA.ascx.designer.cs index 2ecbff4..28b1604 100644 --- a/NKC_WF/WebUserControls/cmp_partMIA.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_partMIA.ascx.designer.cs @@ -40,5 +40,23 @@ namespace NKC_WF.WebUserControls /// 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 hfShowFull. + /// + /// + /// 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 hfShowFull; + + /// + /// Controllo hfEnableScrap. + /// + /// + /// 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 hfEnableScrap; } } diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index cb8ce72..0399aa5 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -222,7 +222,10 @@ namespace NKC_WF get { bool answ = false; - + try { + answ = DLMan.taIL.getByBatch(BatchId).Count > 0; } + catch + { } return answ; } } diff --git a/NKC_WF/site/PartMIA.aspx b/NKC_WF/site/PartMIA.aspx index 1895bba..09eecb9 100644 --- a/NKC_WF/site/PartMIA.aspx +++ b/NKC_WF/site/PartMIA.aspx @@ -20,7 +20,7 @@
- +