diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 4d0a00e..5f2b67e 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -40334,7 +40334,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", "17.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT OrdID, CartID, CartIndex, CartDtmx, CreationDate, KittingStart, KittingEnd" + @@ -40344,10 +40344,16 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W 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_CKD_getByKey"; + this._commandCollection[1].CommandText = "dbo.stp_CKD_getByDtmx"; 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("@CartID", 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("@CartDtmx", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_CKD_getByKey"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -40378,8 +40384,25 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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.CartOnKitDataTable getByKey(global::System.Nullable CartID) { + public virtual DS_App.CartOnKitDataTable getByDtmx(string CartDtmx) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((CartDtmx == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CartDtmx)); + } + DS_App.CartOnKitDataTable dataTable = new DS_App.CartOnKitDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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.CartOnKitDataTable getByKey(global::System.Nullable CartID) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((CartID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index b164393..2f5b3d4 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -1233,7 +1233,7 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat - + dbo.stp_Material_delete @@ -1244,7 +1244,7 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat - + dbo.stp_Material_insert @@ -1259,7 +1259,7 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat - + dbo.stp_Material_update @@ -2526,6 +2526,17 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W + + + + dbo.stp_CKD_getByDtmx + + + + + + + @@ -4162,58 +4173,58 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - + - - + + - - - - - - - - + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - + + @@ -4223,252 +4234,252 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - + - - + + - - - + + + - + - - + + - + - + - + - + - + - + - - - + + + - + - + - + - - - - + + + + - + - + - + - - - - + + + + - + - + - + - + - + - - - + + + - - + + - - - - + + + + @@ -4478,119 +4489,119 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - - - - + + + + + - + - - - - - - - + + + + + + + - + - - + + - + - + - - - - - - + + + + + + - + - - - - + + + + - - - + + + - + - - - - + + + + - - + + - + @@ -4600,22 +4611,22 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - + + - + - - - - - + + + + + @@ -4625,37 +4636,37 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - - + + + - + - - - - + + + + - + - - + + @@ -4665,57 +4676,57 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - + + - + - - + + - - + + - + - - + + - + - + - + - - + + @@ -4725,33 +4736,33 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - - + + + - + - + - + @@ -4761,131 +4772,131 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - + - - - + + + - + - - - - + + + + - + - + - - - - + + + + - + - - - - - - - + + + + + + + - + - - - - + + + + - - - - - - - - - + + + + + + + + + - + - + - - - - + + + + - + - - + + - - - - - - - - - + + + + + + + + + @@ -4895,39 +4906,39 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - + + - + - + - + - + @@ -4937,216 +4948,216 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - - - + + + + - + - + - + - - - - + + + + - + - + - + - - - + + + - + - - + + - - + + - - - + + + - - + + - + - - - + + + - - + + - - - + + + - + - - + + - + - + - - + + - + - - - - + + + + - + - + - - + + - + @@ -5156,379 +5167,379 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - + + - - + + - - - - + + + + - + - - + + - + - + - - - + + + - + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - + - - - + + + - + - - - - + + + + - + - - - - - - + + + + + + - + - - - + + + - - - + + + - - - + + + - + - - + + - + - + - - + + - + - - - - - - - + + + + + + + - - - + + + - + - - - + + + - + - + - - + + - - - + + + - - - + + + - + - - - + + + - - + + - + - + - - + + - + - + - + - - - + + + - + - + - - - - + + + + @@ -5538,148 +5549,148 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - + - - - - + + + + - + - - - - - - - + + + + + + + - + - - - + + + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + @@ -5689,39 +5700,39 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - + - + - - + + - + - + @@ -5731,71 +5742,71 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - - - - - - - + + + + + + + - + - - + + - - - - - - - - + + + + + + + + - + - + - - - - - - + + + + + + - + - + - + @@ -5805,31 +5816,31 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - + - + - + - + - + @@ -6031,18 +6042,18 @@ SELECT SpecPartCod, ModelCod, SpecPartDescr, CartCode FROM SpecialParts WHERE (S - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index bbe0dd7..3f5a691 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,19 +4,19 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - + + + + - - + + - + @@ -28,31 +28,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -191,7 +191,7 @@ - + 1042 diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index e9b773f..e203bf3 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -270,9 +270,9 @@ namespace NKC_WF.WebUserControls DLMan.taCR.setKitStart(codeInt); lgInfo($"Eseguito registrazione KIT Start da lettura CART | KittingStart = GETDATE() | RawData: {rawData}| CodeInt: {codeInt}"); // verifico se sia completo --> reset... altrimenti lascio così... - var tabCOK = DLMan.taCOK.GetData(); + var tabCOK = DLMan.taCOK.getByDtmx(rawData); // cerco se sia "green" numWait + numReady + numOtherWait = 0 - var tabGreen = tabCOK.Where(x => (x.NumPzWaiting + x.NumPzBinAvail + x.OtherQtyWait == 0) && x.CartDtmx == rawData).ToList(); + var tabGreen = tabCOK.Where(x => (x.NumPzWaiting + x.NumPzBinAvail + x.OtherQtyWait == 0)).ToList(); if (tabGreen.Count > 0) { // verifico se sia SECONDA lettura