From 2308e379ec4724ee4e20816df71a9020e6dd4fde Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 1 Jun 2017 09:52:14 +0200 Subject: [PATCH] fix calcolo UDC SX x associazione... --- GMW/WebUserControls/mod_PostFin_DT.ascx.cs | 4 +- GMW_data/DS_magazzino.xsd | 68 +++++++++++++--------- GMW_data/DS_magazzino.xss | 42 ++++++------- GMW_data/DS_magazzino1.Designer.cs | 32 +++++++++- 4 files changed, 94 insertions(+), 52 deletions(-) diff --git a/GMW/WebUserControls/mod_PostFin_DT.ascx.cs b/GMW/WebUserControls/mod_PostFin_DT.ascx.cs index 68a5b976..486c0aba 100644 --- a/GMW/WebUserControls/mod_PostFin_DT.ascx.cs +++ b/GMW/WebUserControls/mod_PostFin_DT.ascx.cs @@ -268,7 +268,7 @@ namespace GMW.WebUserControls DS_magazzino.v_UdcDetailDataTable tabUdcIn = new DS_magazzino.v_UdcDetailDataTable(); try { - tabUdcIn = MagClass.magazzino.taDettUDC.getUdcDetailByIdxCella(idxCella); + tabUdcIn = MagClass.magazzino.taDettUDC.getUdcDetailByIdxCellaIdxPosizione(idxCella, IdxPosizioneIn); numUdcCella = tabUdcIn.Rows.Count; } catch @@ -589,7 +589,7 @@ namespace GMW.WebUserControls } else { - udcDest = verificaAssociaUdcParentChild(parentUdc, false, false); + verificaAssociaUdcParentChild(parentUdc, false, false); } procDtx(udcDest); checkUpdateTablet(udcDest); diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd index 4bf7ff18..9a6233be 100644 --- a/GMW_data/DS_magazzino.xsd +++ b/GMW_data/DS_magazzino.xsd @@ -1752,7 +1752,7 @@ SELECT IdxTipoCella, CodMag, CodCS, Quantita, Capienza, Max_X, Max_Y, Max_Z, Max - + dbo.stp_UdcDetailGetByIdxCella @@ -1763,6 +1763,18 @@ SELECT IdxTipoCella, CodMag, CodCS, Quantita, Capienza, Max_X, Max_Y, Max_Z, Max + + + + dbo.stp_UdcDetailGetByIdxCellaIdxPosizione + + + + + + + + @@ -5684,7 +5696,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5741,7 +5753,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5773,7 +5785,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5795,7 +5807,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5829,7 +5841,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5904,14 +5916,14 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + - + @@ -5947,7 +5959,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -6004,7 +6016,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -6032,7 +6044,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -6079,7 +6091,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -6108,7 +6120,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -6286,21 +6298,21 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GMW_data/DS_magazzino.xss b/GMW_data/DS_magazzino.xss index 42140a39..85aa107e 100644 --- a/GMW_data/DS_magazzino.xss +++ b/GMW_data/DS_magazzino.xss @@ -6,19 +6,19 @@ --> - + - + - + - + - + @@ -29,20 +29,20 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -169,7 +169,7 @@ - + 480 @@ -217,7 +217,7 @@ - + 163 @@ -253,7 +253,7 @@ - + 163 diff --git a/GMW_data/DS_magazzino1.Designer.cs b/GMW_data/DS_magazzino1.Designer.cs index 51aaf97f..aa3f0e1f 100644 --- a/GMW_data/DS_magazzino1.Designer.cs +++ b/GMW_data/DS_magazzino1.Designer.cs @@ -30724,7 +30724,7 @@ SELECT IdxTipoCella, CodMag, CodCS, Quantita, Capienza, Max_X, Max_Y, Max_Z, Max [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[15]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[16]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM dbo.v_UdcDetail"; @@ -30827,6 +30827,13 @@ SELECT IdxTipoCella, CodMag, CodCS, Quantita, Capienza, Max_X, Max_Y, Max_Z, Max this._commandCollection[14].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[14].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[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[15] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[15].Connection = this.Connection; + this._commandCollection[15].CommandText = "dbo.stp_UdcDetailGetByIdxCellaIdxPosizione"; + this._commandCollection[15].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[15].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[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", 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()] @@ -31106,6 +31113,29 @@ SELECT IdxTipoCella, CodMag, CodCS, Quantita, Capienza, Max_X, Max_Y, Max_Z, Max return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_magazzino.v_UdcDetailDataTable getUdcDetailByIdxCellaIdxPosizione(global::System.Nullable IdxCella, global::System.Nullable IdxPosizione) { + this.Adapter.SelectCommand = this.CommandCollection[15]; + if ((IdxCella.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxCella.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((IdxPosizione.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(IdxPosizione.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + DS_magazzino.v_UdcDetailDataTable dataTable = new DS_magazzino.v_UdcDetailDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]